gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

shorten variable names in the AckRange struct

Browse Source
This commit is contained in:
Marten Seemann
2017-09-22 19:34:53 +07:00
parent c78a4b2b73
commit 19f1293fe2
9 changed files with 188 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ackhandler/received_packet_handler.go
View File

@@ -93,7 +93,7 @@ func (h *receivedPacketHandler) maybeQueueAck(packetNumber protocol.PacketNumber
}
// check if a new missing range above the previously was created
if h.lastAck != nil && h.packetHistory.GetHighestAckRange().FirstPacketNumber > h.lastAck.LargestAcked {
if h.lastAck != nil && h.packetHistory.GetHighestAckRange().First > h.lastAck.LargestAcked {
h.ackQueued = true
}
@@ -121,7 +121,7 @@ func (h *receivedPacketHandler) GetAckFrame() *wire.AckFrame {
ackRanges := h.packetHistory.GetAckRanges()
ack := &wire.AckFrame{
LargestAcked: h.largestObserved,
LowestAcked: ackRanges[len(ackRanges)-1].FirstPacketNumber,
LowestAcked: ackRanges[len(ackRanges)-1].First,
PacketReceivedTime: h.largestObservedReceivedTime,
}

4
ackhandler/received_packet_handler_test.go
View File

@@ -210,8 +210,8 @@ var _ = Describe("receivedPacketHandler", func() {
Expect(ack.LargestAcked).To(Equal(protocol.PacketNumber(4)))
Expect(ack.LowestAcked).To(Equal(protocol.PacketNumber(1)))
Expect(ack.AckRanges).To(HaveLen(2))
Expect(ack.AckRanges[0]).To(Equal(wire.AckRange{FirstPacketNumber: 4, LastPacketNumber: 4}))
Expect(ack.AckRanges[1]).To(Equal(wire.AckRange{FirstPacketNumber: 1, LastPacketNumber: 1}))
Expect(ack.AckRanges[0]).To(Equal(wire.AckRange{First: 4, Last: 4}))
Expect(ack.AckRanges[1]).To(Equal(wire.AckRange{First: 1, Last: 1}))
})
It("accepts packets below the lower limit", func() {

6
ackhandler/received_packet_history.go
View File

@@ -101,7 +101,7 @@ func (h *receivedPacketHistory) GetAckRanges() []wire.AckRange {
ackRanges := make([]wire.AckRange, h.ranges.Len())
i := 0
for el := h.ranges.Back(); el != nil; el = el.Prev() {
ackRanges[i] = wire.AckRange{FirstPacketNumber: el.Value.Start, LastPacketNumber: el.Value.End}
ackRanges[i] = wire.AckRange{First: el.Value.Start, Last: el.Value.End}
i++
}
return ackRanges
@@ -111,8 +111,8 @@ func (h *receivedPacketHistory) GetHighestAckRange() wire.AckRange {
ackRange := wire.AckRange{}
if h.ranges.Len() > 0 {
r := h.ranges.Back().Value
ackRange.FirstPacketNumber = r.Start
ackRange.LastPacketNumber = r.End
ackRange.First = r.Start
ackRange.Last = r.End
}
return ackRange
}

12
ackhandler/received_packet_history_test.go
View File

@@ -208,7 +208,7 @@ var _ = Describe("receivedPacketHistory", func() {
hist.ReceivedPacket(5)
ackRanges := hist.GetAckRanges()
Expect(ackRanges).To(HaveLen(1))
Expect(ackRanges[0]).To(Equal(wire.AckRange{FirstPacketNumber: 4, LastPacketNumber: 5}))
Expect(ackRanges[0]).To(Equal(wire.AckRange{First: 4, Last: 5}))
})
It("gets multiple ACK ranges", func() {
@@ -221,9 +221,9 @@ var _ = Describe("receivedPacketHistory", func() {
hist.ReceivedPacket(2)
ackRanges := hist.GetAckRanges()
Expect(ackRanges).To(HaveLen(3))
Expect(ackRanges[0]).To(Equal(wire.AckRange{FirstPacketNumber: 10, LastPacketNumber: 11}))
Expect(ackRanges[1]).To(Equal(wire.AckRange{FirstPacketNumber: 4, LastPacketNumber: 6}))
Expect(ackRanges[2]).To(Equal(wire.AckRange{FirstPacketNumber: 1, LastPacketNumber: 2}))
Expect(ackRanges[0]).To(Equal(wire.AckRange{First: 10, Last: 11}))
Expect(ackRanges[1]).To(Equal(wire.AckRange{First: 4, Last: 6}))
Expect(ackRanges[2]).To(Equal(wire.AckRange{First: 1, Last: 2}))
})
})
@@ -235,14 +235,14 @@ var _ = Describe("receivedPacketHistory", func() {
It("gets a single ACK range", func() {
hist.ReceivedPacket(4)
hist.ReceivedPacket(5)
Expect(hist.GetHighestAckRange()).To(Equal(wire.AckRange{FirstPacketNumber: 4, LastPacketNumber: 5}))
Expect(hist.GetHighestAckRange()).To(Equal(wire.AckRange{First: 4, Last: 5}))
})
It("gets the highest of multiple ACK ranges", func() {
hist.ReceivedPacket(3)
hist.ReceivedPacket(6)
hist.ReceivedPacket(7)
Expect(hist.GetHighestAckRange()).To(Equal(wire.AckRange{FirstPacketNumber: 6, LastPacketNumber: 7}))
Expect(hist.GetHighestAckRange()).To(Equal(wire.AckRange{First: 6, Last: 7}))
})
})
})

8
ackhandler/sent_packet_handler.go
View File

@@ -206,14 +206,14 @@ func (h *sentPacketHandler) determineNewlyAckedPackets(ackFrame *wire.AckFrame)
if ackFrame.HasMissingRanges() {
ackRange := ackFrame.AckRanges[len(ackFrame.AckRanges)-1-ackRangeIndex]
for packetNumber > ackRange.LastPacketNumber && ackRangeIndex < len(ackFrame.AckRanges)-1 {
for packetNumber > ackRange.Last && ackRangeIndex < len(ackFrame.AckRanges)-1 {
ackRangeIndex++
ackRange = ackFrame.AckRanges[len(ackFrame.AckRanges)-1-ackRangeIndex]
}
if packetNumber >= ackRange.FirstPacketNumber { // packet i contained in ACK range
if packetNumber > ackRange.LastPacketNumber {
return nil, fmt.Errorf("BUG: ackhandler would have acked wrong packet 0x%x, while evaluating range 0x%x -> 0x%x", packetNumber, ackRange.FirstPacketNumber, ackRange.LastPacketNumber)
if packetNumber >= ackRange.First { // packet i contained in ACK range
if packetNumber > ackRange.Last {
return nil, fmt.Errorf("BUG: ackhandler would have acked wrong packet 0x%x, while evaluating range 0x%x -> 0x%x", packetNumber, ackRange.First, ackRange.Last)
}
ackedPackets = append(ackedPackets, el)
}

34
ackhandler/sent_packet_handler_test.go
View File

@@ -355,8 +355,8 @@ var _ = Describe("SentPacketHandler", func() {
LargestAcked: 12,
LowestAcked: 5,
AckRanges: []wire.AckRange{
{FirstPacketNumber: 12, LastPacketNumber: 12},
{FirstPacketNumber: 5, LastPacketNumber: 10},
{First: 12, Last: 12},
{First: 5, Last: 10},
},
}
err := handler.ReceivedAck(&ack, 1337, time.Now())
@@ -403,8 +403,8 @@ var _ = Describe("SentPacketHandler", func() {
LargestAcked: 9,
LowestAcked: 2,
AckRanges: []wire.AckRange{ // packets 4 and 5 were lost
{FirstPacketNumber: 6, LastPacketNumber: 9},
{FirstPacketNumber: 2, LastPacketNumber: 3},
{First: 6, Last: 9},
{First: 2, Last: 3},
},
}
err := handler.ReceivedAck(&ack, 1, time.Now())
@@ -439,10 +439,10 @@ var _ = Describe("SentPacketHandler", func() {
LargestAcked: 9,
LowestAcked: 1,
AckRanges: []wire.AckRange{ // packets 2, 4 and 5, and 8 were lost
{FirstPacketNumber: 9, LastPacketNumber: 9},
{FirstPacketNumber: 6, LastPacketNumber: 7},
{FirstPacketNumber: 3, LastPacketNumber: 3},
{FirstPacketNumber: 1, LastPacketNumber: 1},
{First: 9, Last: 9},
{First: 6, Last: 7},
{First: 3, Last: 3},
{First: 1, Last: 1},
},
}
err := handler.ReceivedAck(&ack, 1, time.Now())
@@ -465,8 +465,8 @@ var _ = Describe("SentPacketHandler", func() {
LargestAcked: protocol.PacketNumber(largestObserved),
LowestAcked: 1,
AckRanges: []wire.AckRange{
{FirstPacketNumber: 4, LastPacketNumber: protocol.PacketNumber(largestObserved)},
{FirstPacketNumber: 1, LastPacketNumber: 2},
{First: 4, Last: protocol.PacketNumber(largestObserved)},
{First: 1, Last: 2},
},
}
err := handler.ReceivedAck(&ack1, 1, time.Now())
@@ -489,8 +489,8 @@ var _ = Describe("SentPacketHandler", func() {
LargestAcked: 6,
LowestAcked: 1,
AckRanges: []wire.AckRange{
{FirstPacketNumber: 4, LastPacketNumber: 6},
{FirstPacketNumber: 1, LastPacketNumber: 2},
{First: 4, Last: 6},
{First: 1, Last: 2},
},
}
err := handler.ReceivedAck(&ack1, 1, time.Now())
@@ -521,9 +521,9 @@ var _ = Describe("SentPacketHandler", func() {
LargestAcked: 10,
LowestAcked: 1,
AckRanges: []wire.AckRange{
{FirstPacketNumber: 8, LastPacketNumber: 10},
{FirstPacketNumber: 3, LastPacketNumber: 3},
{FirstPacketNumber: 1, LastPacketNumber: 1},
{First: 8, Last: 10},
{First: 3, Last: 3},
{First: 1, Last: 1},
},
}
err = handler.ReceivedAck(&ack2, 2, time.Now())
@@ -639,8 +639,8 @@ var _ = Describe("SentPacketHandler", func() {
LargestAcked: 3,
LowestAcked: 1,
AckRanges: []wire.AckRange{
{FirstPacketNumber: 3, LastPacketNumber: 3},
{FirstPacketNumber: 1, LastPacketNumber: 1},
{First: 3, Last: 3},
{First: 1, Last: 1},
},
}
err = handler.ReceivedAck(&ack, 1, time.Now())