initialize StreamFrameQueue in Session, not in PacketPacker

This commit is contained in:
Marten Seemann
2016-06-10 19:06:40 +07:00
parent 478e4c95e1
commit b1c27b5eca
3 changed files with 7 additions and 24 deletions

View File

@@ -34,7 +34,7 @@ type packetPacker struct {
lastPacketNumber protocol.PacketNumber
}
func newPacketPacker(connectionID protocol.ConnectionID, cryptoSetup *handshake.CryptoSetup, sentPacketHandler ackhandler.SentPacketHandler, connectionParametersHandler *handshake.ConnectionParametersManager, blockedManager *blockedManager, version protocol.VersionNumber) *packetPacker {
func newPacketPacker(connectionID protocol.ConnectionID, cryptoSetup *handshake.CryptoSetup, sentPacketHandler ackhandler.SentPacketHandler, connectionParametersHandler *handshake.ConnectionParametersManager, blockedManager *blockedManager, streamFrameQueue *streamFrameQueue, version protocol.VersionNumber) *packetPacker {
return &packetPacker{
cryptoSetup: cryptoSetup,
connectionID: connectionID,
@@ -42,7 +42,7 @@ func newPacketPacker(connectionID protocol.ConnectionID, cryptoSetup *handshake.
version: version,
sentPacketHandler: sentPacketHandler,
blockedManager: blockedManager,
streamFrameQueue: newStreamFrameQueue(),
streamFrameQueue: streamFrameQueue,
}
}
@@ -245,12 +245,3 @@ func (p *packetPacker) composeNextPacket(stopWaitingFrame *frames.StopWaitingFra
return payloadFrames, nil
}
// Empty returns true if no frames are queued
func (p *packetPacker) Empty() bool {
return p.streamFrameQueue.ByteLen() == 0
}
func (p *packetPacker) StreamFrameQueueByteLen() protocol.ByteCount {
return p.streamFrameQueue.ByteLen()
}