From 09a15b6c25225341b0bc472e35eb0a4a8b3ce869 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Mon, 6 May 2019 11:52:33 +0200
Subject: [PATCH] Cleanup nat64 references

---
 p4app/{static-mapping.json => nat64.json} |  2 +-
 p4app/static-mapping.sh                   | 38 -----------------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 rename p4app/{static-mapping.json => nat64.json} (96%)
 delete mode 100644 p4app/static-mapping.sh

diff --git a/p4app/static-mapping.json b/p4app/nat64.json
similarity index 96%
rename from p4app/static-mapping.json
rename to p4app/nat64.json
index 1d4d6e5..965f764 100644
--- a/p4app/static-mapping.json
+++ b/p4app/nat64.json
@@ -1,5 +1,5 @@
 {
-  "program": "../p4src/static-mapping.p4",
+  "program": "../p4src/nat64.p4",
   "switch": "simple_switch",
   "compiler": "p4c",
   "options": "--target bmv2 --arch v1model --std p4-16",
diff --git a/p4app/static-mapping.sh b/p4app/static-mapping.sh
deleted file mode 100644
index 12fc862..0000000
--- a/p4app/static-mapping.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -x
-
-# cleanup
-for i in 1 2 3 4; do
-    mx h$i "ip addr flush dev $dev"
-done
-
-# host 1/2+42 need NDP for reaching themselves
-for i in 1 2; do
-    dev="h$i-eth0"
-    # add and enable ipv6
-    mx h$i "sysctl net.ipv6.conf.{lo,h$i-eth0}.disable_ipv6=0"
-    mx h$i "ip addr add 2001:db8:6::$i/64 dev $dev"
-    mx h$i "ip -6 route add default via 2001:db8:6::42"
-
-    # add neighbors
-    for j in 1 2 42; do
-        mx h$i "ip -6 neigh add 2001:db8:61::${j} dev $dev lladdr 00:00:0a:00:00:0${j}"
-        mx h$i "ip -6 neigh add 2001:db8:62::${j} dev $dev lladdr 00:00:0a:00:00:0${j}"
-    done
-done
-
-# host 3/4 need ARP, also need access to .42 (virtual IP)
-for i in 3 4; do
-    dev="h$i-eth0"
-    mx h$i "ip addr add 10.0.0.$i/24 dev $dev"
-
-    # add arp
-    for j in 1 2 42; do
-        mx h$i "ip neigh add 10.0.0.${j} dev $dev lladdr 00:00:0a:00:00:${j}"
-    done
-done
-
-for i in 1 2 3 4; do
-    mx h$i "ip neigh show"
-done