hotfix(routing): unmap ipv4-in-ipv6 when converting

qdm12 · May 22, 2023 · 3100cc1 · 3100cc1
1 parent eed62fd
commit 3100cc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/internal/routing/conversion.go b/internal/routing/conversion.go
@@ -39,5 +39,5 @@ func netIPToNetipAddress(ip net.IP) (address netip.Addr) {
 	if !ok {
 		panic(fmt.Sprintf("converting %#v to netip.Addr failed", ip))
 	}
-	return address
+	return address.Unmap()
 }
diff --git a/internal/routing/ip.go b/internal/routing/ip.go
@@ -46,10 +46,7 @@ func (r *Routing) assignedIP(interfaceName string, family int) (ip netip.Addr, e
 			continue
 		}
 
-		// Ensure we don't return an IPv6-wrapped IPv4 address
-		// since netip.Address String method works differently than
-		// net.IP String method for this kind of addresses.
-		return ip.Unmap(), nil
+		return ip, nil
 	}
 	return ip, fmt.Errorf("%w: interface %s in %d addresses",
 		errInterfaceIPNotFound, interfaceName, len(addresses))