TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-11-30 13:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from Arceliar/netnsfix

Browse Source 
netns fix
This commit is contained in:
Arceliar 2018-04-28 17:04:25 -05:00 committed by GitHub
commit d34e0f92c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/run-schannel-netns
View File

@ -44,6 +44,13 @@ ip netns exec node5 tc qdisc add dev veth54 root tbf rate 100mbit burst 8192 lat
ip netns exec node4 tc qdisc add dev veth46 root tbf rate 10mbit burst 8192 latency 1ms ip netns exec node4 tc qdisc add dev veth46 root tbf rate 10mbit burst 8192 latency 1ms
ip netns exec node6 tc qdisc add dev veth64 root tbf rate 10mbit burst 8192 latency 1ms ip netns exec node6 tc qdisc add dev veth64 root tbf rate 10mbit burst 8192 latency 1ms
ip netns exec node1 ip link set lo up
ip netns exec node2 ip link set lo up
ip netns exec node3 ip link set lo up
ip netns exec node4 ip link set lo up
ip netns exec node5 ip link set lo up
ip netns exec node6 ip link set lo up
ip netns exec node1 ./run --autoconf --pprof &> /dev/null & ip netns exec node1 ./run --autoconf --pprof &> /dev/null &
ip netns exec node2 ./run --autoconf --pprof &> /dev/null & ip netns exec node2 ./run --autoconf --pprof &> /dev/null &
ip netns exec node3 ./run --autoconf --pprof &> /dev/null & ip netns exec node3 ./run --autoconf --pprof &> /dev/null &

1
src/yggdrasil/debug.go
View File

@ -236,6 +236,7 @@ func (c *Core) DEBUG_startTunWithMTU(ifname string, iftapmode bool, mtu int) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
c.log.Println("Setup TUN/TAP:", c.tun.iface.Name(), straddr)
go func() { panic(c.tun.read()) }() go func() { panic(c.tun.read()) }()
} }
go func() { panic(c.tun.write()) }() go func() { panic(c.tun.write()) }()

3
src/yggdrasil/tun_linux.go
View File

@ -48,7 +48,8 @@ func (tun *tunDevice) setupAddress(addr string) error {
} }
for _, ifce := range ifces { for _, ifce := range ifces {
if ifce.Name == tun.iface.Name() { if ifce.Name == tun.iface.Name() {
netIF = &ifce var newIF = ifce
netIF = &newIF // Don't point inside ifces, it's apparently unsafe?...
} }
} }
if netIF == nil { if netIF == nil {