ipn/warp: m impl & use ipok fn

celzero · Nov 28, 2024 · 370269d · 370269d
1 parent 3863b61
commit 370269d
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/intra/ipn/warp/cfg.go b/intra/ipn/warp/cfg.go
@@ -132,7 +132,7 @@ func WarpEndpoints() (v4 netip.AddrPort, v6 netip.AddrPort, err error) {
 		err = core.JoinErr(err4, err6)
 		return
 	}
-	v4ok, v6ok := ip4.IsValid(), ip6.IsValid()
+	v4ok, v6ok := ipok(ip4), ipok(ip6)
 	if !v4ok && !v6ok {
 		err = errZeroRandomEp
 		return
@@ -149,13 +149,14 @@ func WarpEndpoints() (v4 netip.AddrPort, v6 netip.AddrPort, err error) {
 func AmzEndpoints() (v4 []netip.AddrPort, v6 []netip.AddrPort, err error) {
 	var v4ok, v6ok bool
 	for _, ip := range dialers.For(agwProdUrl) {
-		if ip.IsValid() && ip.Is4() && !ip.IsUnspecified() {
-			v4 = append(v4, netip.AddrPortFrom(ip, uint16(80)))
-			v4ok = true
-		}
-		if ip.IsValid() && ip.Is6() && !ip.IsUnspecified() {
-			v6 = append(v6, netip.AddrPortFrom(ip, uint16(80)))
-			v6ok = true
+		if ipok(ip) {
+			if ip.Is4() {
+				v4 = append(v4, netip.AddrPortFrom(ip, uint16(80)))
+				v4ok = true
+			} else if ip.Is6() {
+				v6 = append(v6, netip.AddrPortFrom(ip, uint16(80)))
+				v6ok = true
+			}
 		}
 	}
 	if !v4ok && !v6ok {
@@ -167,7 +168,7 @@ func AmzEndpoints() (v4 []netip.AddrPort, v6 []netip.AddrPort, err error) {
 func Exit64Endpoints() (v6 []netip.Addr, errs error) {
 	for _, cidr6 := range Net6to4 {
 		if ip6, err := core.RandomIPFromPrefix(cidr6); err == nil {
-			if ip6.IsValid() && !ip6.IsUnspecified() {
+			if ipok(ip6) {
 				v6 = append(v6, ip6)
 			} // else: discard
 		} else {
@@ -179,3 +180,7 @@ func Exit64Endpoints() (v6 []netip.Addr, errs error) {
 	}
 	return v6, nil
 }
+
+func ipok(ip netip.Addr) bool {
+	return ip.IsValid() && !ip.IsUnspecified()
+}