mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

wire: use a dedicated rand.Rand for greasing transport parameters (#3758)

Browse source 
rand.Seed is deprecated since Go 1.20. This change also reduces
(potential) lock contention when obtaining random numbers / bytes.
This commit is contained in:
Marten Seemann 2023-04-19 15:21:25 +02:00 • committed by GitHub
parent f36690ae9c
commit a519d827d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/wire/transport_parameters.go
View file

@ -9,6 +9,7 @@ import (
"math/rand" "math/rand"
"net" "net"
"sort" "sort"
"sync"
"time" "time"
"github.com/quic-go/quic-go/internal/protocol" "github.com/quic-go/quic-go/internal/protocol"
@ -25,8 +26,13 @@ var AdditionalTransportParametersClient map[uint64][]byte
const transportParameterMarshalingVersion = 1 const transportParameterMarshalingVersion = 1
var (
randomMutex sync.Mutex
random rand.Rand
)
func init() { func init() {
rand.Seed(time.Now().UTC().UnixNano()) random = *rand.New(rand.NewSource(time.Now().UnixNano()))
} }
type transportParameterID uint64 type transportParameterID uint64
@ -330,10 +336,12 @@ func (p *TransportParameters) Marshal(pers protocol.Perspective) []byte {
// add a greased value // add a greased value
b = quicvarint.Append(b, uint64(27+31*rand.Intn(100))) b = quicvarint.Append(b, uint64(27+31*rand.Intn(100)))
length := rand.Intn(16) randomMutex.Lock()
length := random.Intn(16)
b = quicvarint.Append(b, uint64(length)) b = quicvarint.Append(b, uint64(length))
b = b[:len(b)+length] b = b[:len(b)+length]
rand.Read(b[len(b)-length:]) random.Read(b[len(b)-length:])
randomMutex.Unlock()
// initial_max_stream_data_bidi_local // initial_max_stream_data_bidi_local
b = p.marshalVarintParam(b, initialMaxStreamDataBidiLocalParameterID, uint64(p.InitialMaxStreamDataBidiLocal)) b = p.marshalVarintParam(b, initialMaxStreamDataBidiLocalParameterID, uint64(p.InitialMaxStreamDataBidiLocal))