Skip to content

Commit 0ae4b31

Browse files
sorenisanerdzx2c4
authored andcommitted
tun/netstack: make http examples communicate with each other
This seems like a much better demonstration as it removes the need for external components. Signed-off-by: Søren L. Hansen <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 077ce8e commit 0ae4b31

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tun/netstack/examples/http_client.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ import (
2121

2222
func main() {
2323
tun, tnet, err := netstack.CreateNetTUN(
24-
[]netip.Addr{netip.MustParseAddr("192.168.4.29")},
24+
[]netip.Addr{netip.MustParseAddr("192.168.4.28")},
2525
[]netip.Addr{netip.MustParseAddr("8.8.8.8")},
2626
1420)
2727
if err != nil {
2828
log.Panic(err)
2929
}
3030
dev := device.NewDevice(tun, conn.NewDefaultBind(), device.NewLogger(device.LogLevelVerbose, ""))
31-
dev.IpcSet(`private_key=a8dac1d8a70a751f0f699fb14ba1cff7b79cf4fbd8f09f44c6e6a90d0369604f
32-
public_key=25123c5dcd3328ff645e4f2a3fce0d754400d3887a0cb7c56f0267e20fbf3c5b
33-
endpoint=163.172.161.0:12912
31+
err = dev.IpcSet(`private_key=087ec6e14bbed210e7215cdc73468dfa23f080a1bfb8665b2fd809bd99d28379
32+
public_key=c4c8e984c5322c8184c72265b92b250fdb63688705f504ba003c88f03393cf28
3433
allowed_ip=0.0.0.0/0
34+
endpoint=127.0.0.1:58120
3535
`)
3636
err = dev.Up()
3737
if err != nil {
@@ -43,7 +43,7 @@ allowed_ip=0.0.0.0/0
4343
DialContext: tnet.DialContext,
4444
},
4545
}
46-
resp, err := client.Get("https://www.zx2c4.com/ip")
46+
resp, err := client.Get("http://192.168.4.29/")
4747
if err != nil {
4848
log.Panic(err)
4949
}

tun/netstack/examples/http_server.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ func main() {
3030
log.Panic(err)
3131
}
3232
dev := device.NewDevice(tun, conn.NewDefaultBind(), device.NewLogger(device.LogLevelVerbose, ""))
33-
dev.IpcSet(`private_key=a8dac1d8a70a751f0f699fb14ba1cff7b79cf4fbd8f09f44c6e6a90d0369604f
34-
public_key=25123c5dcd3328ff645e4f2a3fce0d754400d3887a0cb7c56f0267e20fbf3c5b
35-
endpoint=163.172.161.0:12912
36-
allowed_ip=0.0.0.0/0
33+
dev.IpcSet(`private_key=003ed5d73b55806c30de3f8a7bdab38af13539220533055e635690b8b87ad641
34+
listen_port=58120
35+
public_key=f928d4f6c1b86c12f2562c10b07c555c5c57fd00f59e90c8d8d88767271cbf7c
36+
allowed_ip=192.168.4.28/32
3737
persistent_keepalive_interval=25
3838
`)
3939
dev.Up()

0 commit comments

Comments
 (0)