From 74657385b2b4747608010115ebfa0ba44a8957a7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Sat, 30 Mar 2019 17:14:48 +0100
Subject: [PATCH] Remove unused controller code

---
 doc/plan.org        |  2 ++
 p4app/controller.py | 56 ---------------------------------------------
 2 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/doc/plan.org b/doc/plan.org
index 718bc29..a672266 100644
--- a/doc/plan.org
+++ b/doc/plan.org
@@ -521,6 +521,8 @@ tcpdump: listening on h3-eth0, link-type EN10MB (Ethernet), capture size 262144
 
 p4@ubuntu:~/master-thesis/pcap$
 
+-> NDP is going to the controller instead of being handled by the switch
+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
 
 **** DONE Add table name support in debug messages
 **** DONE Why getting IPv6 packets in
diff --git a/p4app/controller.py b/p4app/controller.py
index bb4c4ad..66a0fed 100755
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -256,22 +256,6 @@ class L2Controller(object):
         for nat64map in self.nat64_map[self.mode]:
             self.static_nat64_mapping(**nat64map)
 
-
-        # Disable icmp handling in the controller
-        # for v6addr in self.v6_addresses[self.mode]:
-        #     log.debug("Adding v6 address: {}".format(v6addr))
-
-        #     icmp6_addr = self.gen_ndp_multicast_addr(v6addr)
-
-        #     another_addr = v6addr +1
-        #     another_addr_ns = self.gen_ndp_multicast_addr(another_addr)
-
-        #     self.controller.table_add("v6_addresses", "controller_reply", [str(v6addr)], [str(self.task['ICMP6_GENERAL'])])
-        #     self.controller.table_add("v6_addresses", "controller_reply", [str(icmp6_addr)], [str(self.task['ICMP6_NS'])])
-
-        #     # Experimental: controller does NDP, switch does ICMP6 echo reply
-        #     self.controller.table_add("v6_addresses", "controller_reply", [str(another_addr_ns)], [str(self.task['ICMP6_NS'])])
-
     def static_nat64_mapping(self, v6_src, v6_dst, v4_src, v4_dst):
         """
         Currently using destination only matching due to non priority
@@ -299,46 +283,6 @@ class L2Controller(object):
                                    str(v6_dst.network_address)]
         )
 
-        # self.controller.table_add("nat64_icmp6",
-        #                           "nat64_icmp6_echo_request",
-        #                            [str(v6_dst),
-        #                             str(table_proto['ICMP6_ECHO_REQUEST'])
-        #                            ],
-        #                           [str(v6_src.network_address),
-        #                            str(v4_dst.network_address),
-        #                            str(v6_dst.network_address)]
-        # )
-
-        # self.controller.table_add("nat64_icmp6",
-        #                           "nat64_icmp6_echo_reply",
-        #                            [str(v6_dst),
-        #                             str(table_proto['ICMP6_ECHO_REPLY'])
-        #                            ],
-        #                           [str(v6_src.network_address),
-        #                            str(v4_dst.network_address),
-        #                            str(v6_dst.network_address)]
-        # )
-
-        # self.controller.table_add("nat46_icmp",
-        #                           "nat46_icmp_echo_reply",
-        #                           [str(v4_dst),
-        #                            str(table_proto['ICMP_ECHO_REPLY'])
-        #                           ],
-        #                           [str(v6_src.network_address),
-        #                            str(v4_dst.network_address),
-        #                            str(v6_dst.network_address)]
-        # )
-
-        # self.controller.table_add("nat46_icmp",
-        #                           "nat46_icmp_echo_request",
-        #                           [str(v4_dst),
-        #                            str(table_proto['ICMP_ECHO_REQUEST'])
-        #                           ],
-        #                           [str(v6_src.network_address),
-        #                            str(v4_dst.network_address),
-        #                            str(v6_dst.network_address)]
-        # )
-
 
     def config_hosts(self):
         """ Assumptions: