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

fix debug log messages for key updates

Browse source
This commit is contained in:
Marten Seemann 2020-09-10 14:58:22 +07:00
parent c5a132f158
commit a87fdf1a7d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/handshake/updatable_aead.go
View file

@ -191,10 +191,10 @@ func (a *updatableAEAD) Open(dst, src []byte, rcvTime time.Time, pn protocol.Pac
return nil, qerr.NewError(qerr.ProtocolViolation, "keys updated too quickly") return nil, qerr.NewError(qerr.ProtocolViolation, "keys updated too quickly")
} }
a.rollKeys() a.rollKeys()
a.logger.Debugf("Peer updated keys to %d", a.keyPhase)
// The peer initiated this key update. It's safe to drop the keys for the previous generation now. // The peer initiated this key update. It's safe to drop the keys for the previous generation now.
// Start a timer to drop the previous key generation. // Start a timer to drop the previous key generation.
a.startKeyDropTimer(rcvTime) a.startKeyDropTimer(rcvTime)
a.logger.Debugf("Peer updated keys to %s", a.keyPhase)
if a.tracer != nil { if a.tracer != nil {
a.tracer.UpdatedKey(a.keyPhase, true) a.tracer.UpdatedKey(a.keyPhase, true)
} }
@ -246,11 +246,11 @@ func (a *updatableAEAD) shouldInitiateKeyUpdate() bool {
return false return false
} }
if a.numRcvdWithCurrentKey >= a.keyUpdateInterval { if a.numRcvdWithCurrentKey >= a.keyUpdateInterval {
a.logger.Debugf("Received %d packets with current key phase. Initiating key update to the next key phase: %s", a.numRcvdWithCurrentKey, a.keyPhase+1) a.logger.Debugf("Received %d packets with current key phase. Initiating key update to the next key phase: %d", a.numRcvdWithCurrentKey, a.keyPhase+1)
return true return true
} }
if a.numSentWithCurrentKey >= a.keyUpdateInterval { if a.numSentWithCurrentKey >= a.keyUpdateInterval {
a.logger.Debugf("Sent %d packets with current key phase. Initiating key update to the next key phase: %s", a.numSentWithCurrentKey, a.keyPhase+1) a.logger.Debugf("Sent %d packets with current key phase. Initiating key update to the next key phase: %d", a.numSentWithCurrentKey, a.keyPhase+1)
return true return true
} }
return false return false
@ -259,7 +259,7 @@ func (a *updatableAEAD) shouldInitiateKeyUpdate() bool {
func (a *updatableAEAD) KeyPhase() protocol.KeyPhaseBit { func (a *updatableAEAD) KeyPhase() protocol.KeyPhaseBit {
if a.shouldInitiateKeyUpdate() { if a.shouldInitiateKeyUpdate() {
a.rollKeys() a.rollKeys()
a.logger.Debugf("Initiating key update to key phase %s", a.keyPhase) a.logger.Debugf("Initiating key update to key phase %d", a.keyPhase)
if a.tracer != nil { if a.tracer != nil {
a.tracer.UpdatedKey(a.keyPhase, false) a.tracer.UpdatedKey(a.keyPhase, false)
} }