From da601a6e8b51259c246914d1455d0eb58120023a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 16 Aug 2019 12:35:51 +0200 Subject: [PATCH 1/3] Cleanup jool --- bin/benchmark-prepare-software-nat64-jool.sh | 4 +++- doc/plan.org | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bin/benchmark-prepare-software-nat64-jool.sh b/bin/benchmark-prepare-software-nat64-jool.sh index 912ab71..ed4a72c 100755 --- a/bin/benchmark-prepare-software-nat64-jool.sh +++ b/bin/benchmark-prepare-software-nat64-jool.sh @@ -8,12 +8,14 @@ make sudo make install sudo /etc/init.d/tayga stop +modprobe -r jool_siit sudo sysctl -w net.ipv4.conf.all.forwarding=1 sudo sysctl -w net.ipv6.conf.all.forwarding=1 sudo modprobe jool_siit -sudo jool_siit instance add "example" --iptables +sudo jool_siit instance add example --iptables sudo jool_siit -i example eamt add 2001:db8:42::/120 10.0.1.0/24 +sudo jool_siit -i example eamt add 2001:db8:23::/120 10.0.0.0/24 sudo ip6tables -t mangle -A PREROUTING -s 2001:db8:42::/120 -d 2001:db8:23::/120 -j JOOL_SIIT --instance example sudo iptables -t mangle -A PREROUTING -s 10.0.0.0/24 -d 10.0.1.0/24 -j JOOL_SIIT --instance example diff --git a/doc/plan.org b/doc/plan.org index 9e89330..afdf1f0 100644 --- a/doc/plan.org +++ b/doc/plan.org @@ -3356,6 +3356,19 @@ https://en.wikipedia.org/wiki/IPv4_header_checksum *** DONE Setup / Benchmark tayga CLOSED: [2019-08-13 Tue 10:36] *** Redo Jool +#+BEGIN_CENTER + + +nico@ESPRIMO-P956:~/master-thesis/iperf/run5-netfpga$ ~/master-thesis/bin/benchmark-prepare-software-loadgenerator.sh ++ sudo ip route add 10.0.1.0/24 via 10.0.0.77 ++ sudo ip route add 2001:db8:23::/96 via 2001:db8:42::77 +RTNETLINK answers: File exists +nico@ESPRIMO-P956:~/master-thesis/iperf/run5-netfpga$ +#+END_CENTER + +nico@ESPRIMO-P956:~/master-thesis/iperf/run7-jool$ +../../bin/run-benchmark.sh netfpga 10.0.1.42 2345 + * TODO Thesis documentation ** Introduction *** Related work From 095a7ba7d8e26add9da439152f990becb1112dfb Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 16 Aug 2019 12:39:17 +0200 Subject: [PATCH 2/3] +skip code --- bin/benchmark-prepare-software-nat64-jool.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/bin/benchmark-prepare-software-nat64-jool.sh b/bin/benchmark-prepare-software-nat64-jool.sh index ed4a72c..40a29ee 100755 --- a/bin/benchmark-prepare-software-nat64-jool.sh +++ b/bin/benchmark-prepare-software-nat64-jool.sh @@ -3,23 +3,33 @@ set -x set -e -cd ~/jool-4.0.1 -make -sudo make install +# skipping hack +if [ $# -lt 1 ]; then + + cd ~/jool-4.0.1 + make + sudo make install +fi sudo /etc/init.d/tayga stop modprobe -r jool_siit +iptables -t mangle -F +ip6tables -t mangle -F + sudo sysctl -w net.ipv4.conf.all.forwarding=1 sudo sysctl -w net.ipv6.conf.all.forwarding=1 sudo modprobe jool_siit sudo jool_siit instance add example --iptables + sudo jool_siit -i example eamt add 2001:db8:42::/120 10.0.1.0/24 sudo jool_siit -i example eamt add 2001:db8:23::/120 10.0.0.0/24 + sudo ip6tables -t mangle -A PREROUTING -s 2001:db8:42::/120 -d 2001:db8:23::/120 -j JOOL_SIIT --instance example sudo iptables -t mangle -A PREROUTING -s 10.0.0.0/24 -d 10.0.1.0/24 -j JOOL_SIIT --instance example sudo ip addr add 2001:db8:42::77/64 dev eth2 sudo ip link set eth2 up + sudo ip addr add 10.0.0.77/24 dev eth1 sudo ip l s eth1 up From 4a022adbc2ae52fa6af719e92aabf307b7692f69 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 16 Aug 2019 12:39:55 +0200 Subject: [PATCH 3/3] +sudo --- bin/benchmark-prepare-software-nat64-jool.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/benchmark-prepare-software-nat64-jool.sh b/bin/benchmark-prepare-software-nat64-jool.sh index 40a29ee..cdc3279 100755 --- a/bin/benchmark-prepare-software-nat64-jool.sh +++ b/bin/benchmark-prepare-software-nat64-jool.sh @@ -12,9 +12,9 @@ if [ $# -lt 1 ]; then fi sudo /etc/init.d/tayga stop -modprobe -r jool_siit -iptables -t mangle -F -ip6tables -t mangle -F +sudo modprobe -r jool_siit +sudo iptables -t mangle -F +sudo ip6tables -t mangle -F sudo sysctl -w net.ipv4.conf.all.forwarding=1