diff options
Diffstat (limited to '')
-rw-r--r-- | manager/interfacecleanup.go (renamed from manager/adaptercleanup.go) | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/manager/adaptercleanup.go b/manager/interfacecleanup.go index 779e4b80..7b13b10c 100644 --- a/manager/adaptercleanup.go +++ b/manager/interfacecleanup.go @@ -7,18 +7,16 @@ package manager import ( "log" - "strings" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/mgr" - "golang.zx2c4.com/wireguard/tun/wintun" + + "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/services" ) -const unnamedWintunInterface = "Local Area Connection" - func cleanupStaleAdapters() { defer printPanic() @@ -28,15 +26,12 @@ func cleanupStaleAdapters() { } defer m.Disconnect() - wintun.DeleteMatchingInterfaces(func(wintun *wintun.Wintun) bool { - interfaceName, err := wintun.InterfaceName() + tun.WintunPool.DeleteMatchingInterfaces(func(wintun *wintun.Interface) bool { + interfaceName, err := wintun.Name() if err != nil { log.Printf("Removing Wintun interface %s because determining interface name failed: %v", wintun.GUID().String(), err) return true } - if strings.HasPrefix(interfaceName, unnamedWintunInterface) { - return false - } serviceName, err := services.ServiceNameOfTunnel(interfaceName) if err != nil { log.Printf("Removing Wintun interface ā%sā because determining tunnel service name failed: %v", interfaceName, err) |