return the packet number length when peek a new packet number

This commit is contained in:
Marten Seemann 2018-11-01 17:09:47 +07:00
parent ebbf839fa4
commit c81cd92daf
7 changed files with 48 additions and 113 deletions

View file

@ -60,9 +60,8 @@ func getMaxPacketSize(addr net.Addr) protocol.ByteCount {
}
type packetNumberManager interface {
PeekPacketNumber() protocol.PacketNumber
PeekPacketNumber() (protocol.PacketNumber, protocol.PacketNumberLen)
PopPacketNumber() protocol.PacketNumber
GetPacketNumberLen(protocol.PacketNumber) protocol.PacketNumberLen
}
type sealingManager interface {
@ -399,12 +398,10 @@ func (p *packetPacker) composeNextPacket(
}
func (p *packetPacker) getHeader(encLevel protocol.EncryptionLevel) *wire.Header {
pnum := p.pnManager.PeekPacketNumber()
packetNumberLen := p.pnManager.GetPacketNumberLen(pnum)
pn, pnLen := p.pnManager.PeekPacketNumber()
header := &wire.Header{
PacketNumber: pnum,
PacketNumberLen: packetNumberLen,
PacketNumber: pn,
PacketNumberLen: pnLen,
Version: p.version,
DestConnectionID: p.destConnID,
}