Fix setup on mobile implementations

netbirdio · Dec 29, 2023 · 547e0fa · 547e0fa
1 parent 43e0b10
commit 547e0fa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/iface/iface_android.go b/iface/iface_android.go
@@ -15,7 +15,7 @@ func NewWGIFace(iFaceName string, address string, wgPort int, wgPrivKey string,
 
 	wgIFace := &WGIface{
 		tun:           newTunDevice(wgAddress, wgPort, wgPrivKey, mtu, transportNet, args.TunAdapter),
-		userspaceBind: false,
+		userspaceBind: true,
 	}
 	return wgIFace, nil
 }

diff --git a/iface/iface_darwin.go b/iface/iface_darwin.go
@@ -18,16 +18,16 @@ func NewWGIFace(iFaceName string, address string, wgPort int, wgPrivKey string,
 		return nil, err
 	}
 
-	wgIFace := &WGIface{}
+	wgIFace := &WGIface{
+		userspaceBind: true,
+	}
 
 	if netstack.IsEnabled() {
 		wgIFace.tun = newTunNetstackDevice(iFaceName, wgAddress, wgPort, wgPrivKey, mtu, transportNet, netstack.ListenAddr())
-		wgIFace.userspaceBind = true
 		return wgIFace, nil
 	}
 
 	wgIFace.tun = newTunDevice(iFaceName, wgAddress, wgPort, wgPrivKey, mtu, transportNet)
-	wgIFace.userspaceBind = true
 
 	return wgIFace, nil
 }

diff --git a/iface/iface_ios.go b/iface/iface_ios.go
@@ -16,9 +16,8 @@ func NewWGIFace(iFaceName string, address string, wgPort int, wgPrivKey string,
 		return nil, err
 	}
 	wgIFace := &WGIface{
-
 		tun:           newTunDevice(iFaceName, wgAddress, wgPort, wgPrivKey, transportNet, args.TunFd),
-		userspaceBind: false,
+		userspaceBind: true,
 	}
 	return wgIFace, nil
 }

diff --git a/iface/iface_windows.go b/iface/iface_windows.go
@@ -15,17 +15,16 @@ func NewWGIFace(iFaceName string, address string, wgPort int, wgPrivKey string,
 		return nil, err
 	}
 
-	wgIFace := &WGIface{}
+	wgIFace := &WGIface{
+		userspaceBind: true,
+	}
 
 	if netstack.IsEnabled() {
 		wgIFace.tun = newTunNetstackDevice(iFaceName, wgAddress, wgPort, wgPrivKey, mtu, transportNet, netstack.ListenAddr())
-		wgIFace.userspaceBind = true
 		return wgIFace, nil
 	}
 
 	wgIFace.tun = newTunDevice(iFaceName, wgAddress, wgPort, wgPrivKey, mtu, transportNet)
-	wgIFace.userspaceBind = true
-
 	return wgIFace, nil
 }
 

diff --git a/iface/wg_configurer_usp.go b/iface/wg_configurer_usp.go
@@ -181,7 +181,7 @@ func (t *wgUSPConfigurer) startUAPI() {
 		for {
 			uapiConn, uapiErr := uapi.Accept()
 			if uapiErr != nil {
-				log.Traceln("uapi Accept failed with error: ", uapiErr)
+				log.Tracef("%s", uapiErr)
 				return
 			}
 			go func() {