gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

use a chan instead of a context to track handshake completion (#4547)

Browse Source 
No functional change expected.
This commit is contained in:
Marten Seemann
2024-06-03 13:47:25 +08:00
committed by GitHub
parent 5446b5f912
commit 73a5370f3c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
connection.go
View File

@@ -169,10 +169,9 @@ type connection struct {
// closeChan is used to notify the run loop that it should terminate // closeChan is used to notify the run loop that it should terminate
closeChan chan closeError closeChan chan closeError
ctx context.Context ctx context.Context
ctxCancel context.CancelCauseFunc ctxCancel context.CancelCauseFunc
handshakeCtx context.Context handshakeCompleteChan chan struct{}
handshakeCtxCancel context.CancelFunc
undecryptablePackets []receivedPacket // undecryptable packets, waiting for a change in encryption level undecryptablePackets []receivedPacket // undecryptable packets, waiting for a change in encryption level
undecryptablePacketsToProcess []receivedPacket undecryptablePacketsToProcess []receivedPacket
@@ -486,7 +485,7 @@ func (s *connection) preSetup() {
s.receivedPackets = make(chan receivedPacket, protocol.MaxConnUnprocessedPackets) s.receivedPackets = make(chan receivedPacket, protocol.MaxConnUnprocessedPackets)
s.closeChan = make(chan closeError, 1) s.closeChan = make(chan closeError, 1)
s.sendingScheduled = make(chan struct{}, 1) s.sendingScheduled = make(chan struct{}, 1)
s.handshakeCtx, s.handshakeCtxCancel = context.WithCancel(context.Background()) s.handshakeCompleteChan = make(chan struct{})
now := time.Now() now := time.Now()
s.lastPacketReceivedTime = now s.lastPacketReceivedTime = now
@@ -667,7 +666,7 @@ func (s *connection) earlyConnReady() <-chan struct{} {
} }
func (s *connection) HandshakeComplete() <-chan struct{} { func (s *connection) HandshakeComplete() <-chan struct{} {
return s.handshakeCtx.Done() return s.handshakeCompleteChan
} }
func (s *connection) Context() context.Context { func (s *connection) Context() context.Context {
@@ -732,7 +731,7 @@ func (s *connection) idleTimeoutStartTime() time.Time {
} }
func (s *connection) handleHandshakeComplete() error { func (s *connection) handleHandshakeComplete() error {
defer s.handshakeCtxCancel() defer close(s.handshakeCompleteChan)
// Once the handshake completes, we have derived 1-RTT keys. // Once the handshake completes, we have derived 1-RTT keys.
// There's no point in queueing undecryptable packets for later decryption anymore. // There's no point in queueing undecryptable packets for later decryption anymore.
s.undecryptablePackets = nil s.undecryptablePackets = nil