new: make random more random in parallel use

hiddify · Jul 17, 2024 · 4f3122e · 4f3122e
1 parent 6c534fd
commit 4f3122e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/iputils/iputils.go b/iputils/iputils.go
@@ -11,6 +11,12 @@ import (
 	"time"
 )
 
+func RandomSeed() int64 {
+	var seed = rand.Int63()
+	seed ^= time.Now().UnixNano()
+	return seed
+}
+
 // RandomIPFromPrefix returns a random IP from the provided CIDR prefix.
 // Supports IPv4 and IPv6. Does not support mapped inputs.
 func RandomIPFromPrefix(cidr netip.Prefix) (netip.Addr, error) {
@@ -25,7 +31,7 @@ func RandomIPFromPrefix(cidr netip.Prefix) (netip.Addr, error) {
 	}
 
 	// Initialise rand number generator
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
+	rng := rand.New(rand.NewSource(RandomSeed()))
 
 	// Find the bit length of the Host portion of the provided CIDR
 	// prefix

diff --git a/warp/endpoint.go b/warp/endpoint.go
@@ -28,7 +28,7 @@ func RandomWarpPrefix(v4, v6 bool) netip.Prefix {
 	}
 
 	cidrs := WarpPrefixes()
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
+	rng := rand.New(rand.NewSource(iputils.RandomSeed()))
 	for {
 		cidr := cidrs[rng.Intn(len(cidrs))]