diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-07-22 13:35:55 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-10 17:35:00 +0100 |
| commit | 91a212f28213f501785b56f644d3982a4ea800d7 (patch) | |
| tree | 6bf14bc3df331bbd747d3d2642c86b98f3d5611d | |
| parent | wintun: move to RCDATA resource (diff) | |
| download | wireguard-windows-91a212f28213f501785b56f644d3982a4ea800d7.tar.xz wireguard-windows-91a212f28213f501785b56f644d3982a4ea800d7.zip | |
manager: adopt new Wintun API
Signed-off-by: Simon Rozman <simon@rozman.si>
| -rw-r--r-- | manager/interfacecleanup.go | 6 | ||||
| -rw-r--r-- | tunnel/service.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/manager/interfacecleanup.go b/manager/interfacecleanup.go index f5d9ef48..72f70aaa 100644 --- a/manager/interfacecleanup.go +++ b/manager/interfacecleanup.go @@ -26,10 +26,10 @@ func cleanupStaleWintunInterfaces() { } defer m.Disconnect() - tun.WintunPool.DeleteMatchingInterfaces(func(wintun *wintun.Interface) bool { + tun.WintunPool.DeleteMatchingAdapters(func(wintun *wintun.Adapter) bool { interfaceName, err := wintun.Name() if err != nil { - log.Printf("Removing Wintun interface %s because determining interface name failed: %v", wintun.GUID().String(), err) + log.Printf("Removing Wintun interface because determining interface name failed: %v", err) return true } serviceName, err := services.ServiceNameOfTunnel(interfaceName) @@ -54,5 +54,5 @@ func cleanupStaleWintunInterfaces() { return true } return false - }) + }, false) } diff --git a/tunnel/service.go b/tunnel/service.go index e535894b..8b81f56d 100644 --- a/tunnel/service.go +++ b/tunnel/service.go @@ -164,11 +164,11 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest, return } nativeTun = wintun.(*tun.NativeTun) - wintunVersion, ndisVersion, err := nativeTun.Version() + wintunVersion, err := nativeTun.RunningVersion() if err != nil { log.Printf("Warning: unable to determine Wintun version: %v", err) } else { - log.Printf("Using Wintun/%s (NDIS %s)", wintunVersion, ndisVersion) + log.Printf("Using Wintun/%d.%d", (wintunVersion>>16)&0xffff, wintunVersion&0xffff) } log.Println("Enabling firewall rules") |