From a3d6f0807470f629c05f49bdb6ff85e86663bf80 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 26 Aug 2019 09:55:42 +0700 Subject: [PATCH] move the ackhandler.Packet to the ackhandler interface file --- internal/ackhandler/interfaces.go | 19 +++++++++++++++++++ internal/ackhandler/packet.go | 27 --------------------------- 2 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 internal/ackhandler/packet.go diff --git a/internal/ackhandler/interfaces.go b/internal/ackhandler/interfaces.go index a2d660c1c..817f0d827 100644 --- a/internal/ackhandler/interfaces.go +++ b/internal/ackhandler/interfaces.go @@ -8,6 +8,25 @@ import ( "github.com/lucas-clemente/quic-go/quictrace" ) +// A Packet is a packet +type Packet struct { + PacketNumber protocol.PacketNumber + Frames []wire.Frame + LargestAcked protocol.PacketNumber // InvalidPacketNumber if the packet doesn't contain an ACK + Length protocol.ByteCount + EncryptionLevel protocol.EncryptionLevel + SendTime time.Time + + // There are two reasons why a packet cannot be retransmitted: + // * it was already retransmitted + // * this packet is a retransmission, and we already received an ACK for the original packet + canBeRetransmitted bool + includedInBytesInFlight bool + retransmittedAs []protocol.PacketNumber + isRetransmission bool // we need a separate bool here because 0 is a valid packet number + retransmissionOf protocol.PacketNumber +} + // SentPacketHandler handles ACKs received for outgoing packets type SentPacketHandler interface { // SentPacket may modify the packet diff --git a/internal/ackhandler/packet.go b/internal/ackhandler/packet.go deleted file mode 100644 index 0ace4d657..000000000 --- a/internal/ackhandler/packet.go +++ /dev/null @@ -1,27 +0,0 @@ -package ackhandler - -import ( - "time" - - "github.com/lucas-clemente/quic-go/internal/protocol" - "github.com/lucas-clemente/quic-go/internal/wire" -) - -// A Packet is a packet -type Packet struct { - PacketNumber protocol.PacketNumber - Frames []wire.Frame - LargestAcked protocol.PacketNumber // InvalidPacketNumber if the packet doesn't contain an ACK - Length protocol.ByteCount - EncryptionLevel protocol.EncryptionLevel - SendTime time.Time - - // There are two reasons why a packet cannot be retransmitted: - // * it was already retransmitted - // * this packet is a retransmission, and we already received an ACK for the original packet - canBeRetransmitted bool - includedInBytesInFlight bool - retransmittedAs []protocol.PacketNumber - isRetransmission bool // we need a separate bool here because 0 is a valid packet number - retransmissionOf protocol.PacketNumber -}