forked from quic-go/quic-go
remove unused RTTStats from the received packet handler (#4287)
This commit is contained in:
@@ -20,5 +20,5 @@ func NewAckHandler(
|
|||||||
logger utils.Logger,
|
logger utils.Logger,
|
||||||
) (SentPacketHandler, ReceivedPacketHandler) {
|
) (SentPacketHandler, ReceivedPacketHandler) {
|
||||||
sph := newSentPacketHandler(initialPacketNumber, initialMaxDatagramSize, rttStats, clientAddressValidated, enableECN, pers, tracer, logger)
|
sph := newSentPacketHandler(initialPacketNumber, initialMaxDatagramSize, rttStats, clientAddressValidated, enableECN, pers, tracer, logger)
|
||||||
return sph, newReceivedPacketHandler(sph, rttStats, logger)
|
return sph, newReceivedPacketHandler(sph, logger)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,16 +21,12 @@ type receivedPacketHandler struct {
|
|||||||
|
|
||||||
var _ ReceivedPacketHandler = &receivedPacketHandler{}
|
var _ ReceivedPacketHandler = &receivedPacketHandler{}
|
||||||
|
|
||||||
func newReceivedPacketHandler(
|
func newReceivedPacketHandler(sentPackets sentPacketTracker, logger utils.Logger) ReceivedPacketHandler {
|
||||||
sentPackets sentPacketTracker,
|
|
||||||
rttStats *utils.RTTStats,
|
|
||||||
logger utils.Logger,
|
|
||||||
) ReceivedPacketHandler {
|
|
||||||
return &receivedPacketHandler{
|
return &receivedPacketHandler{
|
||||||
sentPackets: sentPackets,
|
sentPackets: sentPackets,
|
||||||
initialPackets: newReceivedPacketTracker(rttStats, logger),
|
initialPackets: newReceivedPacketTracker(logger),
|
||||||
handshakePackets: newReceivedPacketTracker(rttStats, logger),
|
handshakePackets: newReceivedPacketTracker(logger),
|
||||||
appDataPackets: newReceivedPacketTracker(rttStats, logger),
|
appDataPackets: newReceivedPacketTracker(logger),
|
||||||
lowest1RTTPacket: protocol.InvalidPacketNumber,
|
lowest1RTTPacket: protocol.InvalidPacketNumber,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,11 +18,7 @@ var _ = Describe("Received Packet Handler", func() {
|
|||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
sentPackets = NewMockSentPacketTracker(mockCtrl)
|
sentPackets = NewMockSentPacketTracker(mockCtrl)
|
||||||
handler = newReceivedPacketHandler(
|
handler = newReceivedPacketHandler(sentPackets, utils.DefaultLogger)
|
||||||
sentPackets,
|
|
||||||
&utils.RTTStats{},
|
|
||||||
utils.DefaultLogger,
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
It("generates ACKs for different packet number spaces", func() {
|
It("generates ACKs for different packet number spaces", func() {
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ type receivedPacketTracker struct {
|
|||||||
packetHistory *receivedPacketHistory
|
packetHistory *receivedPacketHistory
|
||||||
|
|
||||||
maxAckDelay time.Duration
|
maxAckDelay time.Duration
|
||||||
rttStats *utils.RTTStats
|
|
||||||
|
|
||||||
hasNewAck bool // true as soon as we received an ack-eliciting new packet
|
hasNewAck bool // true as soon as we received an ack-eliciting new packet
|
||||||
ackQueued bool // true once we received more than 2 (or later in the connection 10) ack-eliciting packets
|
ackQueued bool // true once we received more than 2 (or later in the connection 10) ack-eliciting packets
|
||||||
@@ -33,14 +32,10 @@ type receivedPacketTracker struct {
|
|||||||
logger utils.Logger
|
logger utils.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func newReceivedPacketTracker(
|
func newReceivedPacketTracker(logger utils.Logger) *receivedPacketTracker {
|
||||||
rttStats *utils.RTTStats,
|
|
||||||
logger utils.Logger,
|
|
||||||
) *receivedPacketTracker {
|
|
||||||
return &receivedPacketTracker{
|
return &receivedPacketTracker{
|
||||||
packetHistory: newReceivedPacketHistory(),
|
packetHistory: newReceivedPacketHistory(),
|
||||||
maxAckDelay: protocol.MaxAckDelay,
|
maxAckDelay: protocol.MaxAckDelay,
|
||||||
rttStats: rttStats,
|
|
||||||
logger: logger,
|
logger: logger,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,14 +12,10 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var _ = Describe("Received Packet Tracker", func() {
|
var _ = Describe("Received Packet Tracker", func() {
|
||||||
var (
|
var tracker *receivedPacketTracker
|
||||||
tracker *receivedPacketTracker
|
|
||||||
rttStats *utils.RTTStats
|
|
||||||
)
|
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
rttStats = &utils.RTTStats{}
|
tracker = newReceivedPacketTracker(utils.DefaultLogger)
|
||||||
tracker = newReceivedPacketTracker(rttStats, utils.DefaultLogger)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
Context("accepting packets", func() {
|
Context("accepting packets", func() {
|
||||||
|
|||||||
Reference in New Issue
Block a user