Merge pull request #205 from Arceliar/tunfix

fix crash when starting in tun mode
This commit is contained in:
Arceliar 2018-11-10 22:44:02 -06:00 committed by GitHub
commit 3b8cd0a8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -51,21 +51,23 @@ func (tun *tunDevice) start(ifname string, iftapmode bool, addr string, mtu int)
} }
go func() { panic(tun.read()) }() go func() { panic(tun.read()) }()
go func() { panic(tun.write()) }() go func() { panic(tun.write()) }()
go func() { if iftapmode {
for { go func() {
if _, ok := tun.icmpv6.peermacs[tun.core.router.addr]; ok { for {
break if _, ok := tun.icmpv6.peermacs[tun.core.router.addr]; ok {
break
}
request, err := tun.icmpv6.create_ndp_tap(tun.core.router.addr)
if err != nil {
panic(err)
}
if _, err := tun.iface.Write(request); err != nil {
panic(err)
}
time.Sleep(time.Second)
} }
request, err := tun.icmpv6.create_ndp_tap(tun.core.router.addr) }()
if err != nil { }
panic(err)
}
if _, err := tun.iface.Write(request); err != nil {
panic(err)
}
time.Sleep(time.Second)
}
}()
return nil return nil
} }