From 6f4079d0aa29d70f65e004e4401399722e32bc79 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Wed, 3 Apr 2019 12:29:18 +0200
Subject: [PATCH] Use the correct egress table (c&p--!)

---
 doc/plan.org        | 14 ++++++++++++++
 p4app/controller.py |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/plan.org b/doc/plan.org
index aafb199..0952f50 100644
--- a/doc/plan.org
+++ b/doc/plan.org
@@ -719,6 +719,20 @@ INFO:main:unhandled reassambled=<Ether  dst=33:33:ff:00:00:42 src=00:00:0a:00:00
 INFO:main:unhandled reassambled=<Ether  dst=33:33:ff:00:00:42 src=00:00:0a:00:00:01 type=0x86dd |<IPv6  version=6 tc=0 fl=0 plen=32 nh=ICMPv6 hlim=255 src=fe80::200:aff:fe00:1 dst=ff02::1:ff00:42 |<ICMPv6ND_NS  type=Neighbor Solicitation code=0 cksum=0x37df res=0 tgt=2001:db8::42 |<ICMPv6NDOptSrcLLAddr  type=1 len=1 lladdr=00:00:0a:00:00:01 |>>>> from table TABLE_V6_NETWORKS
 INFO:main:unhandled reassambled=<Ether  dst=33:33:ff:00:00:42 src=00:00:0a:00:00:01 type=0x86dd |<IPv6  version=6 tc=0 fl=0 plen=32 nh=ICMPv6 hlim=255 src=2001:db8::1 dst=ff02::1:ff00:42 |<ICMPv6ND_NS  type=Neighbor Solicitation code=0 cksum=0x13a7 res=0 tgt=2001:db8::42 |<ICMPv6NDOptSrcLLAddr  type=1 len=1 lladdr=00:00:0a:00:00:01 |>>>> from table TABLE_V6_NETWORKS
 INFO:main:unhandled reassambled=<Ether  dst=00:00:0a:00:00:42 src=00:00:0a:00:00:03 type=0x800 |<IP  version=4 ihl=5 tos=0x0 len=84 id=60628 flags= frag=0 ttl=64 proto=icmp chksum=0x78d2 src=10.0.0.1 dst=10.1.1.1 options=[] |<ICMP  type=echo-reply code=0 chksum=0x9138 id=0x26e9 seq=0x1 |<Raw  load='\x8b\x83\xa4\\\x00\x00\x00\x00S*\x06\x00\x00\x00\x00\x00\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./01234567' |>>>> from table TABLE_V6_NETWORKS
+******* DONE Is 10.1.1.1/x in the nat64 table? yes
+Adding entry to lpm match table nat46
+match key:           LPM-0a:01:01:00/24
+action:              nat46_static
+runtime data:        20:01:0d:b8:00:00:00:00:00:00:00:00:00:00:00:00    0a:01:01:00     20:01:0d:b8:00:01:00:00:00:00:00:00:00:00:00:00
+Entry has been added with handle 0
+******* DONE if nat46_static is called, why is the ethernet type still ipv4? -> log!
+******** DONE nat46 table is applied
+******* TODO Check why there is a miss in the table
+[09:57:31.415] [bmv2] [T] [thread 9332] [105.0] [cxt 0] Applying table 'MyIngress.v6_networks'
+[09:57:31.415] [bmv2] [D] [thread 9332] [105.0] [cxt 0] Looking up key:
+ * hdr.ipv6.dst_addr   : 20010db8000000000000000000000001
+
+[09:57:31.415] [bmv2] [D] [thread 9332] [105.0] [cxt 0] Table 'MyIngress.v6_networks': miss
 
 
 ***** TODO transform protocol specific: icmp -> icmp6
diff --git a/p4app/controller.py b/p4app/controller.py
index 4ffd3d9..d10839d 100755
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -260,7 +260,7 @@ class L2Controller(object):
         self.controller.table_clear("v6_networks")
         for v6route in self.v6_routes[self.mode]:
             #self.controller.table_add("v6_networks", "set_egress_port", [str(v6route['net'])], [str(v6route['port'])])
-            self.controller.table_add("v4_networks", "set_egress_port_and_mac",
+            self.controller.table_add("v6_networks", "set_egress_port_and_mac",
                                       [str(v6route['net'])],
                                       [str(v6route['port']),
                                        str(v6route['mac']),