sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 08:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close UAPI in Windows tun

Browse Source
This commit is contained in:
braginini
2023-04-10 11:13:40 +02:00
parent 2a04175238
commit 2bf846b183
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
iface/tun_windows.go
View File

@@ -16,6 +16,7 @@ type tunDevice struct {
name string name string
address WGAddress address WGAddress
netInterface NetInterface netInterface NetInterface
uapi net.Listener
iceBind *bind.ICEBind iceBind *bind.ICEBind
mtu int mtu int
} }
@@ -42,7 +43,7 @@ func (c *tunDevice) createWithUserspace() (NetInterface, error) {
return nil, err return nil, err
} }
// We need to create a wireguard-go device and listen to configuration requests // We need to create a wireguard-go device and listen to configuration requests
tunDevice := device.NewDevice(tunIface, c.iceBind, device.NewLogger(device.LogLevelSilent, "[wiretrustee] ")) tunDevice := device.NewDevice(tunIface, c.iceBind, device.NewLogger(device.LogLevelSilent, "[netbird] "))
err = tunDevice.Up() err = tunDevice.Up()
if err != nil { if err != nil {
return tunIface, err return tunIface, err
@@ -52,12 +53,13 @@ func (c *tunDevice) createWithUserspace() (NetInterface, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
c.uapi = uapi
go func() { go func() {
for { for {
uapiConn, uapiErr := uapi.Accept() uapiConn, uapiErr := uapi.Accept()
if uapiErr != nil { if uapiErr != nil {
log.Traceln("uapi Accept failed with error: ", uapiErr) log.Traceln("uapi accept failed with error: ", uapiErr)
continue continue
} }
go tunDevice.IpcHandle(uapiConn) go tunDevice.IpcHandle(uapiConn)
@@ -82,11 +84,20 @@ func (c *tunDevice) DeviceName() string {
} }
func (c *tunDevice) Close() error { func (c *tunDevice) Close() error {
var err1, err2 error
if c.netInterface == nil { if c.netInterface == nil {
return nil err1 = c.netInterface.Close()
} }
return c.netInterface.Close() if c.uapi != nil {
err2 = c.uapi.Close()
}
if err1 != nil {
return err1
}
return err2
} }
func (c *tunDevice) getInterfaceGUIDString() (string, error) { func (c *tunDevice) getInterfaceGUIDString() (string, error) {