diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-25 00:25:04 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-25 00:25:04 +0200 |
| commit | 0f4fbc18851b4375d09b97800d8f3360702f61b8 (patch) | |
| tree | 7755004b762e05c7b58a9b20890c254f5544ab5d /tunnel/ifaceconfig.go | |
| parent | winipcfg: switch to windows.GetAdaptersAddresses (diff) | |
| download | wireguard-windows-0f4fbc18851b4375d09b97800d8f3360702f61b8.tar.xz wireguard-windows-0f4fbc18851b4375d09b97800d8f3360702f61b8.zip | |
winipcfg: SocketAddressToIP was upstreamed
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'tunnel/ifaceconfig.go')
| -rw-r--r-- | tunnel/ifaceconfig.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tunnel/ifaceconfig.go b/tunnel/ifaceconfig.go index 917d0aab..fcf9dce3 100644 --- a/tunnel/ifaceconfig.go +++ b/tunnel/ifaceconfig.go @@ -47,11 +47,11 @@ func cleanupAddressesOnDisconnectedInterfaces(addresses []net.IPNet) { continue } for address := iface.FirstUnicastAddress; address != nil; address = address.Next { - ip := winipcfg.SocketAddressToIP(&address.Address) + ip := address.Address.IP() ipnet := net.IPNet{IP: ip, Mask: net.CIDRMask(int(address.OnLinkPrefixLength), 8*len(ip))} if includedInAddresses(ipnet) { - log.Printf("Cleaning up stale address %s from interface '%s'", ip.String(), iface.FriendlyName()) - iface.LUID.DeleteIPAddress(ip) + log.Printf("Cleaning up stale address %s from interface '%s'", ipnet.String(), iface.FriendlyName()) + iface.LUID.DeleteIPAddress(ipnet.IP) //TODO: BUG(rozmansi): DeleteIPAddress needs to take the full IPNet, not just the IP } } } |