all: use core.ChooseOne where applicable

Author: ignoramous

intra/dnscrypt/multiserver.go

@@ -20,7 +20,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"math/rand"
 	"net"
 	"net/netip"
 	"strings"
@@ -85,10 +84,7 @@ var (
 )
 
 func chooseAny[T any](s []T) (zz T) {
-	if len(s) <= 0 {
-		return // zz
-	}
-	return s[rand.Intn(len(s))]
+	return core.ChooseOne(s)
 }
 
 func udpExchange(pid string, serverInfo *serverinfo, relayAddrs []*net.UDPAddr, sharedKey *[32]byte, encryptedQuery []byte, clientNonce []byte) (res []byte, relay net.Addr, err error) {

intra/ipn/exit64.go

@@ -8,7 +8,6 @@ package ipn
 
 import (
 	"context"
-	"math/rand"
 	"net"
 	"net/netip"
 	"time"
@@ -283,7 +282,7 @@ func addr4to6(addr string) string {
 		return ""
 	}
 	// embed IPv4 in IPv6
-	ippre := warp.Net6to4[rand.Intn(len(warp.Net6to4))]
+	ippre := core.ChooseOne(warp.Net6to4)
 	ip6 := ip4to6(ippre, ip4)
 	if !ip6.IsValid() {
 		log.W("proxy: auto: exit64: addr64: failed to embed(%s) in v6(%s)", ip4, ippre)

intra/ipn/proxies.go

@@ -483,7 +483,7 @@ func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (_ P
 	}
 
 	var lopinned string
-	var someproxy Proxy
+	var someproxy []Proxy
 
 	pinnedpid, pinok := px.getpin(uid, ipp)
 	chosen := has(pids, pinnedpid)
@@ -559,8 +559,8 @@ func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (_ P
 				return p, nil
 			} // else: proxy not ok
 			notokproxies = append(notokproxies, pid)
-			if someproxy == nil {
-				someproxy = p
+			if p != nil {
+				someproxy = append(someproxy, p)
 			}
 		} else { // else: proxy cannot route; split-tunnel
 			norouteproxies = append(norouteproxies, pid)
@@ -571,9 +571,7 @@ func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (_ P
 	if len(notokproxies) > 0 {
 		// stall to allow a non-healthy proxy to recover
 		stalledSec = px.stall(uid + ippstr)
-		if someproxy != nil {
-			return someproxy, nil
-		}
+		return core.ChooseOne(someproxy), nil
 	}
 
 	// lopinned is always the first element, if any.

intra/ipn/warp/cfg.go

@@ -129,7 +129,7 @@ var warpDefaultHeaders = map[string]string{
 }
 
 func randomWarpCidrs() (v4 netip.Prefix, v6 netip.Prefix) {
-	return warpCidrs4[rand.Intn(len(warpCidrs4))], warpCidrs6[rand.Intn(len(warpCidrs6))]
+	return core.ChooseOne(warpCidrs4), core.ChooseOne(warpCidrs6)
 }
 
 func randomWarpPort() uint16 {