diff --git a/network/net.go b/network/net.go
index a1497d9a..5996f85c 100644
--- a/network/net.go
+++ b/network/net.go
@@ -196,17 +196,16 @@ func buildEndpointFromInterface(iface net.Interface) (*Endpoint, error) {
 
 	for _, a := range addrs {
 		address := a.String()
-		if IPv4Validator.MatchString(address) {
-			if !strings.ContainsRune(address, '/') {
-				// plain ip
-				e.SetIP(address)
-			} else {
-				// ip/bits
-				e.SetNetwork(address)
-			}
-		} else {
-			// ipv6/xxx
+		switch true {
+		case IPv4Validator.MatchString(address):
+			e.SetIP(address)
+			break
+		case IPv4BlockValidator.MatchString(address):
+			e.SetNetwork(address)
+			break
+		default:
 			e.SetIPv6(address)
+			break
 		}
 	}