Multihop release

.github/workflows/golangci-lint.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.20"
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

demo.tape

@@ -102,7 +102,8 @@ Sleep 2s
 # show curl doesn't work, then configure wiretap
 Type "curl http://10.2.0.4 --connect-timeout 3" Sleep 1s Enter Sleep 6s
 Type "./wiretap configure --endpoint 10.1.0.2:51820 --routes 10.2.0.0/16,fd:2::/64 -c" Sleep 1s Enter Sleep 4s
-Type "wg-quick up ./wiretap.conf" Sleep 1s Enter Sleep 2s
+Type "wg-quick up ./wiretap_relay.conf" Sleep 1s Enter Sleep 2s
+Type "wg-quick up ./wiretap_e2ee.conf" Sleep 1s Enter Sleep 2s
 
 Ctrl+b
 Left

docker-compose.yml

@@ -20,6 +20,15 @@
 # │ fd:2::4  │
 # │          │
 # │ target   │
+# │          │
+# │ 10.3.0.4 │
+# │ fd:3::4  ├┬───────────────────────┐
+# ├──────────┼│ target2 network       │
+# ├──────────┼│ 10.3.0.0/16,fd:3::/64 │
+# │ 10.3.0.5 ├┴───────────────────────┘
+# │ fd:3::5  │
+# │          │
+# │ target2  │
 # └──────────┘
 
 services:
@@ -53,6 +62,11 @@ services:
       target:
         ipv4_address: 10.2.0.3
         ipv6_address: fd:2::3
+    cap_add:
+      - NET_ADMIN
+      - SYS_MODULE
+    sysctls:
+      - net.ipv6.conf.all.disable_ipv6=0
     environment:
     - DISPLAY=host.docker.internal:0
   target:
@@ -63,6 +77,28 @@ services:
       target:
         ipv4_address: 10.2.0.4
         ipv6_address: fd:2::4
+      target2:
+        ipv4_address: 10.3.0.4
+        ipv6_address: fd:3::4
+    cap_add:
+      - NET_ADMIN
+      - SYS_MODULE
+    sysctls:
+      - net.ipv6.conf.all.disable_ipv6=0
+  target2:
+    depends_on: 
+      - client 
+    image: wiretap:latest
+    networks:
+      target2:
+        ipv4_address: 10.3.0.5
+        ipv6_address: fd:3::5
+    cap_add:
+      - NET_ADMIN
+      - SYS_MODULE
+    sysctls:
+      - net.ipv6.conf.all.disable_ipv6=0
+
 
 networks:
   exposed:
@@ -84,4 +120,14 @@ networks:
         - subnet: 10.2.0.0/16
           gateway: 10.2.0.1
         - subnet: fd:2::/64
-          gateway: fd:2::1
+          gateway: fd:2::1
+  target2:
+    enable_ipv6: true
+    driver: bridge
+    name: target2
+    ipam:
+      config:
+        - subnet: 10.3.0.0/16
+          gateway: 10.3.0.1
+        - subnet: fd:3::/64
+          gateway: fd:3::1

media/Wiretap_Add_Client.drawio

@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2023-03-31T04:06:12.775Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.8.16 Chrome/106.0.5249.199 Electron/21.4.0 Safari/537.36" version="20.8.16" etag="7pia9dyBCsLT2B4-PqfU" type="device"><diagram id="e3q73qmI6FWCRJhKJi0n" name="Page-1">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</diagram></mxfile>

media/Wiretap_Add_Server.drawio

@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2023-03-31T04:07:07.410Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.8.16 Chrome/106.0.5249.199 Electron/21.4.0 Safari/537.36" etag="iM4J5VqwMHoygtqTiBy-" version="20.8.16" type="device"><diagram id="e3q73qmI6FWCRJhKJi0n" name="Page-1">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</diagram></mxfile>