From 33117f0ca855bb23af81e9b383488a90ec61ba4a Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Sat, 30 Mar 2019 17:12:34 +0100
Subject: [PATCH] Remove unused tables

---
 doc/plan.org            | 39 +++++++++++++++++--
 p4src/static-mapping.p4 | 83 +++++++++++++----------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/doc/plan.org b/doc/plan.org
index b7cc1cb..718bc29 100644
--- a/doc/plan.org
+++ b/doc/plan.org
@@ -446,7 +446,7 @@ sudo: unable to resolve host ubuntu
 fe80::/64 dev h1-eth0  proto kernel  metric 256  pref medium
 default via 2001:db8::42 dev h1-eth0  metric 1024  pref medium
 p4@ubuntu:~/master-thesis$
-**** TODO ping6ing an emulated ipv6 host / Translate icmp <-> icmp6: test v6_static_mapping
+**** TODO TEST ping6ing an emulated ipv6 host / Translate icmp <-> icmp6: test v6_static_mapping
 ***** DONE try1: only packets on h1 + controller -> wrong checksum 2019-03-25
 + filename=static_nat64-2019-03-25-1121-h1.pcap
 + intf=h1-eth0
@@ -470,7 +470,7 @@ that the checksum code DOES NOT work on the task field!
 Problem: task field might be overriden for controller use in different
 table -> need different task field!
 
-***** TODO try2: checksum ok, but no packets on h3
+***** DONE try2: checksum ok, but no packets on h3
 ****** DONE Setup a default rule for the IPv4 world to debug on controller
 Still not seeing the converted packet, however seeing icmp6_ns packets
 which should not be there:
@@ -489,6 +489,39 @@ DEBUG:main:v6 reassambled=<Ether  dst=00:00:0a:00:00:42 src=00:00:0a:00:00:01 ty
 
 debugging MIGHT come from nat64 table!
 
+***** TODO try3: re-rewrite: no packets on h3 again (2019-03-30)
+p4@ubuntu:~$ ~/master-thesis/p4app/sniff-host.sh h1 static_nat64
++ cd /home/p4/master-thesis/pcap
++ host=h1
++ name=static_nat64
++ date +%F-%H%M
++ now=2019-03-30-1608
++ filename=static_nat64-2019-03-30-1608-h1.pcap
++ intf=h1-eth0
++ mx h1 tcpdump -ni h1-eth0 -w static_nat64-2019-03-30-1608-h1.pcap
+tcpdump: listening on h1-eth0, link-type EN10MB (Ethernet), capture size 262144 bytes
+^C10 packets captured
+10 packets received by filter
+0 packets dropped by kernel
+
+p4@ubuntu:~$
+p4@ubuntu:~/master-thesis/pcap$ ../p4app/sniff-host.sh h3 static_nat64
++ cd /home/p4/master-thesis/pcap
++ host=h3
++ name=static_nat64
++ date +%F-%H%M
++ now=2019-03-30-1608
++ filename=static_nat64-2019-03-30-1608-h3.pcap
++ intf=h3-eth0
++ mx h3 tcpdump -ni h3-eth0 -w static_nat64-2019-03-30-1608-h3.pcap
+tcpdump: listening on h3-eth0, link-type EN10MB (Ethernet), capture size 262144 bytes
+^C0 packets captured
+0 packets received by filter
+0 packets dropped by kernel
+
+p4@ubuntu:~/master-thesis/pcap$
+
+
 **** DONE Add table name support in debug messages
 **** DONE Why getting IPv6 packets in
 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
@@ -564,7 +597,7 @@ p4@ubuntu:~/p4-tools/p4c/build$
 [16:37] line:p4c% git describe --always
 900557c5
 ****** TODO Build on VM with 900557c5 after removing build/
-**** TODO Solve logic problem: Valid headers
+**** DONE Solve logic problem: Valid headers
 - If ipv6 header is valid && nat64 will be made and afterwards v4 egress needs to be applied
 - If ipv4 header is valid && nat46 will be made and afterwards v6 egress needs to be applied
 **** TODO Check translated fields
diff --git a/p4src/static-mapping.p4 b/p4src/static-mapping.p4
index 6e2de63..a28e47c 100644
--- a/p4src/static-mapping.p4
+++ b/p4src/static-mapping.p4
@@ -312,68 +312,35 @@ Echo or Echo Reply Message
 
     /********************** debugging / general support ***********************************/
 
-    table port2mcast {
-        key = {
-            standard_metadata.ingress_port : exact;
-        }
-        actions = {
-			multicast_pkg;
-            controller_debug;
-            NoAction;
-        }
-        size = NDP_TABLE_SIZE;
-        default_action = NoAction;
-    }
-
-    /* Handle multicast registration of NDP */
-    table addr2mcast {
-        key = {
-            hdr.ipv6.dst_addr: exact;
-        }
-        actions = {
-			multicast_pkg;
-            controller_debug;
-            NoAction;
-        }
-        size = NDP_TABLE_SIZE;
-        default_action = NoAction;
-    }
-
-    /********************** NDP support for OTHERS (unused ATM) ***********************************/
-
-    table ndp {
-        key = {
-            hdr.ipv6.dst_addr: lpm;
-            standard_metadata.ingress_port : exact;
-        }
-        actions = {
-			multicast_pkg;
-            controller_debug;
-            NoAction;
-        }
-        size = NDP_TABLE_SIZE;
-        default_action = NoAction;
-    }
-
+    // table port2mcast {
+    //     key = {
+    //         standard_metadata.ingress_port : exact;
+    //     }
+    //     actions = {
+	// 		multicast_pkg;
+    //         controller_debug;
+    //         NoAction;
+    //     }
+    //     size = NDP_TABLE_SIZE;
+    //     default_action = NoAction;
+    // }
 
+    // /* Handle multicast registration of NDP */
+    // table addr2mcast {
+    //     key = {
+    //         hdr.ipv6.dst_addr: exact;
+    //     }
+    //     actions = {
+	// 		multicast_pkg;
+    //         controller_debug;
+    //         NoAction;
+    //     }
+    //     size = NDP_TABLE_SIZE;
+    //     default_action = NoAction;
+    // }
 
 	/********************** ROUTING (egress definiton) TABLES ***********************************/
 
-    table v6_addresses {
-        key = {
-            hdr.ipv6.dst_addr: exact;
-        }
-        actions = {
-            controller_debug;
-            controller_reply;
-            icmp6_echo_reply;
-            NoAction;
-        }
-        size = ADDRESS_TABLE_SIZE;
-        default_action = NoAction;
-
-    }
-
     table v6_networks {
         key = {
             hdr.ipv6.dst_addr: lpm;