mirrors/yggdrasil-go
2
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go synced 2024-11-09 23:20:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove waitForTUNUp from TUN

Browse Source 
Causes issues such as #1156.
This commit is contained in:
Neil Alexander 2024-08-07 19:52:19 +01:00
parent 5e5de3a343
commit 63cd757525
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
5 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tun/tun.go
View File

@ -11,7 +11,6 @@ import (
"io" "io"
"net" "net"
"sync" "sync"
"time"
"github.com/Arceliar/phony" "github.com/Arceliar/phony"
wgtun "golang.zx2c4.com/wireguard/tun" wgtun "golang.zx2c4.com/wireguard/tun"
@ -65,20 +64,6 @@ func getSupportedMTU(mtu uint64) uint64 {
return mtu return mtu
} }
func waitForTUNUp(ch <-chan wgtun.Event) bool {
t := time.After(time.Second * 5)
for {
select {
case ev := <-ch:
if ev == wgtun.EventUp {
return true
}
case <-t:
return false
}
}
}
// Name returns the name of the adapter, e.g. "tun0". On Windows, this may // Name returns the name of the adapter, e.g. "tun0". On Windows, this may
// return a canonical adapter name instead. // return a canonical adapter name instead.
func (tun *TunAdapter) Name() string { func (tun *TunAdapter) Name() string {

3
src/tun/tun_bsd.go
View File

@ -80,9 +80,6 @@ func (tun *TunAdapter) setup(ifname string, addr string, mtu uint64) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create TUN: %w", err) return fmt.Errorf("failed to create TUN: %w", err)
} }
if !waitForTUNUp(iface.Events()) {
return fmt.Errorf("TUN did not come up in time")
}
tun.iface = iface tun.iface = iface
if mtu, err := iface.MTU(); err == nil { if mtu, err := iface.MTU(); err == nil {
tun.mtu = getSupportedMTU(uint64(mtu)) tun.mtu = getSupportedMTU(uint64(mtu))

3
src/tun/tun_darwin.go
View File

@ -27,9 +27,6 @@ func (tun *TunAdapter) setup(ifname string, addr string, mtu uint64) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create TUN: %w", err) return fmt.Errorf("failed to create TUN: %w", err)
} }
if !waitForTUNUp(iface.Events()) {
return fmt.Errorf("TUN did not come up in time")
}
tun.iface = iface tun.iface = iface
if m, err := iface.MTU(); err == nil { if m, err := iface.MTU(); err == nil {
tun.mtu = getSupportedMTU(uint64(m)) tun.mtu = getSupportedMTU(uint64(m))

3
src/tun/tun_linux.go
View File

@ -21,9 +21,6 @@ func (tun *TunAdapter) setup(ifname string, addr string, mtu uint64) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create TUN: %w", err) return fmt.Errorf("failed to create TUN: %w", err)
} }
if !waitForTUNUp(iface.Events()) {
return fmt.Errorf("TUN did not come up in time")
}
tun.iface = iface tun.iface = iface
if mtu, err := iface.MTU(); err == nil { if mtu, err := iface.MTU(); err == nil {
tun.mtu = getSupportedMTU(uint64(mtu)) tun.mtu = getSupportedMTU(uint64(mtu))

3
src/tun/tun_other.go
View File

@ -18,9 +18,6 @@ func (tun *TunAdapter) setup(ifname string, addr string, mtu uint64) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create TUN: %w", err) return fmt.Errorf("failed to create TUN: %w", err)
} }
if !waitForTUNUp(iface.Events()) {
return fmt.Errorf("TUN did not come up in time")
}
tun.iface = iface tun.iface = iface
if mtu, err := iface.MTU(); err == nil { if mtu, err := iface.MTU(); err == nil {
tun.mtu = getSupportedMTU(uint64(mtu)) tun.mtu = getSupportedMTU(uint64(mtu))