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

Fix tun address assignment on windows

Browse Source
This commit is contained in:
braginini
2023-04-07 15:11:21 +02:00
parent 61146a51d0
commit 965ba8837f
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iface/tun_windows.go
View File

@@ -10,6 +10,7 @@ import (
"golang.zx2c4.com/wireguard/ipc" "golang.zx2c4.com/wireguard/ipc"
"golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/tun"
"golang.zx2c4.com/wireguard/windows/driver" "golang.zx2c4.com/wireguard/windows/driver"
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
"net" "net"
) )
@@ -38,9 +39,7 @@ func (c *tunDevice) Create() error {
// createWithUserspace Creates a new WireGuard interface, using wireguard-go userspace implementation // createWithUserspace Creates a new WireGuard interface, using wireguard-go userspace implementation
func (c *tunDevice) createWithUserspace() (NetInterface, error) { func (c *tunDevice) createWithUserspace() (NetInterface, error) {
dll := newLazyDLL("wintun.dll", func(d *lazyDLL) { dll := newLazyDLL("wintun.dll", func(d *lazyDLL) {})
})
err := dll.Load() err := dll.Load()
if err != nil { if err != nil {
@@ -131,15 +130,10 @@ func (c *tunDevice) createAdapter() (NetInterface, error) {
// assignAddr Adds IP address to the tunnel interface and network route based on the range provided // assignAddr Adds IP address to the tunnel interface and network route based on the range provided
func (c *tunDevice) assignAddr() error { func (c *tunDevice) assignAddr() error {
luid := c.netInterface.(*driver.Adapter).LUID() tunDev := c.netInterface.(*tun.NativeTun)
luid := winipcfg.LUID(tunDev.LUID())
log.Debugf("adding address %s to interface: %s", c.address.IP, c.name) log.Debugf("adding address %s to interface: %s", c.address.IP, c.name)
err := luid.SetIPAddresses([]net.IPNet{{c.address.IP, c.address.Network.Mask}}) return luid.SetIPAddresses([]net.IPNet{{c.address.IP, c.address.Network.Mask}})
if err != nil {
return err
}
return nil
} }
// getUAPI returns a Listener // getUAPI returns a Listener