void/amneziawg-go
2
0
Fork 0
mirror of https://github.com/amnezia-vpn/amneziawg-go.git synced 2025-08-01 17:32:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: use rand.NewSource instead of rand.Seed

Browse source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Tom Holford 2025-05-04 18:49:49 +02:00 • committed by Jason A. Donenfeld
parent 77b6c824a8
commit 0e4482a086
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
device/allowedips_rand_test.go
View file

@ -83,7 +83,7 @@ func TestTrieRandom(t *testing.T) {
var peers []*Peer var peers []*Peer
var allowedIPs AllowedIPs var allowedIPs AllowedIPs
rand.Seed(1) rng := rand.New(rand.NewSource(1))
for n := 0; n < NumberOfPeers; n++ { for n := 0; n < NumberOfPeers; n++ {
peers = append(peers, &Peer{}) peers = append(peers, &Peer{})
@ -91,14 +91,14 @@ func TestTrieRandom(t *testing.T) {
for n := 0; n < NumberOfAddresses; n++ { for n := 0; n < NumberOfAddresses; n++ {
var addr4 [4]byte var addr4 [4]byte
rand.Read(addr4[:]) rng.Read(addr4[:])
cidr := uint8(rand.Intn(32) + 1) cidr := uint8(rand.Intn(32) + 1)
index := rand.Intn(NumberOfPeers) index := rand.Intn(NumberOfPeers)
allowedIPs.Insert(netip.PrefixFrom(netip.AddrFrom4(addr4), int(cidr)), peers[index]) allowedIPs.Insert(netip.PrefixFrom(netip.AddrFrom4(addr4), int(cidr)), peers[index])
slow4 = slow4.Insert(addr4[:], cidr, peers[index]) slow4 = slow4.Insert(addr4[:], cidr, peers[index])
var addr6 [16]byte var addr6 [16]byte
rand.Read(addr6[:]) rng.Read(addr6[:])
cidr = uint8(rand.Intn(128) + 1) cidr = uint8(rand.Intn(128) + 1)
index = rand.Intn(NumberOfPeers) index = rand.Intn(NumberOfPeers)
allowedIPs.Insert(netip.PrefixFrom(netip.AddrFrom16(addr6), int(cidr)), peers[index]) allowedIPs.Insert(netip.PrefixFrom(netip.AddrFrom16(addr6), int(cidr)), peers[index])
@ -109,7 +109,7 @@ func TestTrieRandom(t *testing.T) {
for p = 0; ; p++ { for p = 0; ; p++ {
for n := 0; n < NumberOfTests; n++ { for n := 0; n < NumberOfTests; n++ {
var addr4 [4]byte var addr4 [4]byte
rand.Read(addr4[:]) rng.Read(addr4[:])
peer1 := slow4.Lookup(addr4[:]) peer1 := slow4.Lookup(addr4[:])
peer2 := allowedIPs.Lookup(addr4[:]) peer2 := allowedIPs.Lookup(addr4[:])
if peer1 != peer2 { if peer1 != peer2 {
@ -117,7 +117,7 @@ func TestTrieRandom(t *testing.T) {
} }
var addr6 [16]byte var addr6 [16]byte
rand.Read(addr6[:]) rng.Read(addr6[:])
peer1 = slow6.Lookup(addr6[:]) peer1 = slow6.Lookup(addr6[:])
peer2 = allowedIPs.Lookup(addr6[:]) peer2 = allowedIPs.Lookup(addr6[:])
if peer1 != peer2 { if peer1 != peer2 {

10
device/allowedips_test.go
View file

@ -44,7 +44,7 @@ func benchmarkTrie(peerNumber, addressNumber, _ int, b *testing.B) {
var peers []*Peer var peers []*Peer
root := parentIndirection{&trie, 2} root := parentIndirection{&trie, 2}
rand.Seed(1) rng := rand.New(rand.NewSource(1))
const AddressLength = 4 const AddressLength = 4
@ -54,15 +54,15 @@ func benchmarkTrie(peerNumber, addressNumber, _ int, b *testing.B) {
for n := 0; n < addressNumber; n++ { for n := 0; n < addressNumber; n++ {
var addr [AddressLength]byte var addr [AddressLength]byte
rand.Read(addr[:]) rng.Read(addr[:])
cidr := uint8(rand.Uint32() % (AddressLength * 8)) cidr := uint8(rng.Uint32() % (AddressLength * 8))
index := rand.Int() % peerNumber index := rng.Int() % peerNumber
root.insert(addr[:], cidr, peers[index]) root.insert(addr[:], cidr, peers[index])
} }
for n := 0; n < b.N; n++ { for n := 0; n < b.N; n++ {
var addr [AddressLength]byte var addr [AddressLength]byte
rand.Read(addr[:]) rng.Read(addr[:])
trie.lookup(addr[:]) trie.lookup(addr[:])
} }
} }