aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tunnel
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2021-11-11 15:19:29 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2021-11-11 15:19:29 +0100
commita803e1746cac02cc76e2c5bac478ceece75d3498 (patch)
tree41f058044aaadb37ec86471078ccb6463a2b4255 /tunnel
parentversion: bump (diff)
downloadwireguard-windows-a803e1746cac02cc76e2c5bac478ceece75d3498.tar.xz
wireguard-windows-a803e1746cac02cc76e2c5bac478ceece75d3498.zip
global: backout AddrFromSlice signature change
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'tunnel')
-rw-r--r--tunnel/addressconfig.go2
-rw-r--r--tunnel/winipcfg/luid.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/tunnel/addressconfig.go b/tunnel/addressconfig.go
index 5248ef8e..8be13fb9 100644
--- a/tunnel/addressconfig.go
+++ b/tunnel/addressconfig.go
@@ -36,7 +36,7 @@ func cleanupAddressesOnDisconnectedInterfaces(family winipcfg.AddressFamily, add
continue
}
for address := iface.FirstUnicastAddress; address != nil; address = address.Next {
- if ip := netip.AddrFromSlice(address.Address.IP()); addrHash[ip] {
+ if ip, _ := netip.AddrFromSlice(address.Address.IP()); addrHash[ip] {
prefix := netip.PrefixFrom(ip, int(address.OnLinkPrefixLength))
log.Printf("Cleaning up stale address %s from interface ā€˜%sā€™", prefix.String(), iface.FriendlyName())
iface.LUID.DeleteIPAddress(prefix)
diff --git a/tunnel/winipcfg/luid.go b/tunnel/winipcfg/luid.go
index 20b5a38b..744fee62 100644
--- a/tunnel/winipcfg/luid.go
+++ b/tunnel/winipcfg/luid.go
@@ -319,7 +319,7 @@ func (luid LUID) DNS() ([]netip.Addr, error) {
if addr.LUID == luid {
for dns := addr.FirstDNSServerAddress; dns != nil; dns = dns.Next {
if ip := dns.Address.IP(); ip != nil {
- if a := netip.AddrFromSlice(ip); a.IsValid() {
+ if a, ok := netip.AddrFromSlice(ip); ok {
r = append(r, a)
}
} else {