add v4 over v6 routing (#133)

Author: rcgoodfellow

p4/sidecar-lite.p4

@@ -378,7 +378,7 @@ control router_v4_route(
 ) {
     table rtr {
         key = { ingress.path_idx: exact; }
-        actions = { forward; forward_vlan; }
+        actions = { forward; forward_v6; forward_vlan; forward_vlan_v6; }
         // should never happen, but the compiler requires a default
         default_action = drop;
     }
@@ -394,12 +394,26 @@ control router_v4_route(
         egress.drop = false;
     }
 
+    action forward_v6(bit<16> port, bit<128> nexthop) {
+        egress.port = port;
+        egress.vlan_id = 12w0;
+        egress.nexthop_v6 = nexthop;
+        egress.drop = false;
+    }
+
     action forward_vlan(bit<16> port, bit<32> nexthop, bit<12> vlan_id) {
         egress.port = port;
         egress.vlan_id = vlan_id;
         egress.nexthop_v4 = nexthop;
         egress.drop = false;
     }
+
+    action forward_vlan_v6(bit<16> port, bit<128> nexthop, bit<12> vlan_id) {
+        egress.port = port;
+        egress.vlan_id = vlan_id;
+        egress.nexthop_v6 = nexthop;
+        egress.drop = false;
+    }
 }
 
 control router_v4_idx(

scadm/src/main.rs

@@ -924,13 +924,15 @@ fn dump_tables(table: &BTreeMap<String, Vec<TableEntry>>) {
             Some(idx) => format!("{idx}"),
             None => "?".into(),
         };
-        if e.action_id == "forward" {
+        if e.action_id == "forward" || e.action_id == "forward_v6" {
             let gw = match get_port_addr(&e.parameter_data, false) {
                 Some((a, p)) => format!("{a} ({p})"),
                 None => "?".into(),
             };
             println!("{idx} -> {gw}");
-        } else if e.action_id == "forward_vlan" {
+        } else if e.action_id == "forward_vlan"
+            || e.action_id == "forward_vlan_v6"
+        {
             let gw = match get_port_addr_vlan(&e.parameter_data, false) {
                 Some((a, p, v)) => format!("{a} ({p}) vid: {v}"),
                 None => "?".into(),