Rename networks to have them in the correct order again

Otherwise the NAT setup doesn't work
libp2p · Sep 19, 2023 · 1b8461e · 1b8461e
1 parent d6faacb
commit 1b8461e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/hole-punch-interop/Makefile b/hole-punch-interop/Makefile
@@ -7,12 +7,13 @@ router:
 	$(MAKE) -C router
 $(RUST_SUBDIRS):
 	$(MAKE) -C $@
+results.csv: $(wildcard src/*.ts)
+	npm run test
+test: results.csv
 clean:
 	$(MAKE) -C rust-relay clean
 	$(MAKE) -C router clean
 	$(MAKE) -C $(RUST_SUBDIRS) clean
 	rm results.csv
-test: results.csv $(wildcard src/*.ts)
-	npm run test
 
 .PHONY: rust-relay router all $(RUST_SUBDIRS) test
diff --git a/hole-punch-interop/router/run.sh b/hole-punch-interop/router/run.sh
@@ -11,13 +11,13 @@ fi
 while ! ip addr show eth0 >&2; do sleep 1; done
 while ! ip addr show eth1 >&2; do sleep 1; done
 
-ADDR_EXTERNAL=$(ip -json addr show eth1 | jq '.[0].addr_info[0].local' -r)
-SUBNET_INTERNAL=$(ip -json addr show eth0 | jq '.[0].addr_info[0].local + "/" + (.[0].addr_info[0].prefixlen | tostring)' -r)
+ADDR_EXTERNAL=$(ip -json addr show eth0 | jq '.[0].addr_info[0].local' -r)
+SUBNET_INTERNAL=$(ip -json addr show eth1 | jq '.[0].addr_info[0].local + "/" + (.[0].addr_info[0].prefixlen | tostring)' -r)
 
 # Set up NAT
 nft add table ip nat
 nft add chain ip nat postrouting { type nat hook postrouting priority 100 \; }
-nft add rule ip nat postrouting ip saddr $SUBNET_INTERNAL oifname "eth1" snat $ADDR_EXTERNAL
+nft add rule ip nat postrouting ip saddr $SUBNET_INTERNAL oifname "eth0" snat $ADDR_EXTERNAL
 
 # tc can only apply delays on egress traffic. By setting a delay for both eth0 and eth1, we achieve the active delay passed in as a parameter.
 half_of_delay=$(expr "$DELAY_MS" / 2 )

diff --git a/hole-punch-interop/src/generator.ts b/hole-punch-interop/src/generator.ts
@@ -140,7 +140,7 @@ function buildSpec(containerImages: { [key: string]: () => string }, {
                   DELAY_MS: routerDelay
                 },
                 networks: {
-                    dialer_lan: {},
+                    lan_dialer: {},
                     internet: {},
                 },
                 cap_add: ["NET_ADMIN"]
@@ -156,7 +156,7 @@ function buildSpec(containerImages: { [key: string]: () => string }, {
                     RUST_LOG: rustLog,
                 },
                 networks: {
-                    dialer_lan: {},
+                    lan_dialer: {},
                 },
                 cap_add: ["NET_ADMIN"],
                 volumes: [dockerSocketVolume]
@@ -169,7 +169,7 @@ function buildSpec(containerImages: { [key: string]: () => string }, {
                     DELAY_MS: routerDelay
                 },
                 networks: {
-                    listener_lan: {},
+                    lan_listener: {},
                     internet: {},
                 },
                 cap_add: ["NET_ADMIN"]
@@ -185,7 +185,7 @@ function buildSpec(containerImages: { [key: string]: () => string }, {
                     RUST_LOG: rustLog,
                 },
                 networks: {
-                    listener_lan: {},
+                    lan_listener: {},
                 },
                 cap_add: ["NET_ADMIN"],
                 volumes: [dockerSocketVolume]
@@ -199,18 +199,18 @@ function buildSpec(containerImages: { [key: string]: () => string }, {
                     internet: {
                         aliases: ["redis"]
                     },
-                    dialer_lan: {
+                    lan_dialer: {
                         aliases: ["redis"]
                     },
-                    listener_lan: {
+                    lan_listener: {
                         aliases: ["redis"]
                     },
                 }
             }
         },
         networks: {
-            dialer_lan: { },
-            listener_lan: { },
+            lan_dialer: { },
+            lan_listener: { },
             internet: { },
         }
     }