TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgenginer/router: fix build

Browse Source 
Rebasing github.com/tailscale/wireguard-go to upstream
wireguard-go changed the API.

This commit is analogous to
https://git.zx2c4.com/wireguard-windows/commit/?id=6823cc10ffe193c0cb1d61a5d1828d563d3d0e5f
This commit is contained in:
Josh Bleecher Snyder 2020-08-06 17:37:05 -07:00
parent b62b07bc2d
commit 2622e8e082
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wgengine/router/ifconfig_windows.go
View File

@ -18,6 +18,7 @@ import (
ole "github.com/go-ole/go-ole" ole "github.com/go-ole/go-ole"
winipcfg "github.com/tailscale/winipcfg-go" winipcfg "github.com/tailscale/winipcfg-go"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
@ -58,11 +59,15 @@ func bindSocketRoute(family winipcfg.AddressFamily, device *device.Device, ourLu
} }
*lastLuid = luid *lastLuid = luid
if false { if false {
bind, ok := device.Bind().(conn.BindSocketToInterface)
if !ok {
return fmt.Errorf("unexpected device.Bind type %T", device.Bind())
}
// TODO(apenwarr): doesn't work with magic socket yet. // TODO(apenwarr): doesn't work with magic socket yet.
if family == winipcfg.AF_INET { if family == winipcfg.AF_INET {
return device.BindSocketToInterface4(index, false) return bind.BindSocketToInterface4(index, false)
} else if family == winipcfg.AF_INET6 { } else if family == winipcfg.AF_INET6 {
return device.BindSocketToInterface6(index, false) return bind.BindSocketToInterface6(index, false)
} }
} else { } else {
log.Printf("WARNING: skipping windows socket binding.\n") log.Printf("WARNING: skipping windows socket binding.\n")