Add IP scoping data to entity.Entity and network.Connection

netenv/addresses.go

@@ -38,12 +38,12 @@ func GetAssignedGlobalAddresses() (ipv4 []net.IP, ipv6 []net.IP, err error) {
 		return nil, nil, err
 	}
 	for _, ip4 := range allv4 {
-		if netutils.IPIsGlobal(ip4) {
+		if netutils.GetIPScope(ip4).IsGlobal() {
 			ipv4 = append(ipv4, ip4)
 		}
 	}
 	for _, ip6 := range allv6 {
-		if netutils.IPIsGlobal(ip6) {
+		if netutils.GetIPScope(ip6).IsGlobal() {
 			ipv6 = append(ipv6, ip6)
 		}
 	}
@@ -59,7 +59,7 @@ var (
 // Broadcast or multicast addresses will never match, even if valid in in use.
 func IsMyIP(ip net.IP) (yes bool, err error) {
 	// Check for IPs that don't need extra checks.
-	switch netutils.ClassifyIP(ip) {
+	switch netutils.GetIPScope(ip) {
 	case netutils.HostLocal:
 		return true, nil
 	case netutils.LocalMulticast, netutils.GlobalMulticast:

netenv/location.go

@@ -130,7 +130,7 @@ next:
 				}
 
 				// If we received something from a global IP address, we have succeeded and can return immediately.
-				if netutils.IPIsGlobal(addr.IP) {
+				if netutils.GetIPScope(addr.IP).IsGlobal() {
 					return addr.IP, nil
 				}
 

netenv/online-status.go

@@ -356,7 +356,7 @@ func checkOnlineStatus(ctx context.Context) {
 	} else {
 		var lan bool
 		for _, ip := range ipv4 {
-			switch netutils.ClassifyIP(ip) {
+			switch netutils.GetIPScope(ip) {
 			case netutils.SiteLocal:
 				lan = true
 			case netutils.Global:
@@ -366,7 +366,7 @@ func checkOnlineStatus(ctx context.Context) {
 			}
 		}
 		for _, ip := range ipv6 {
-			switch netutils.ClassifyIP(ip) {
+			switch netutils.GetIPScope(ip) {
 			case netutils.SiteLocal, netutils.Global:
 				// IPv6 global addresses are also used in local networks
 				lan = true