From 62a844d3264fe71f140d499fce0eaa9743c739c3 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 22 Apr 2016 17:27:53 +0700 Subject: [PATCH] store NackRanges instead of pointers to NackRanges --- ackhandler/incoming_packet_ack_handler.go | 8 ++++---- ackhandler/incoming_packet_ack_handler_test.go | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ackhandler/incoming_packet_ack_handler.go b/ackhandler/incoming_packet_ack_handler.go index 234b1912f..68ccc943d 100644 --- a/ackhandler/incoming_packet_ack_handler.go +++ b/ackhandler/incoming_packet_ack_handler.go @@ -37,16 +37,16 @@ func (h *incomingPacketAckHandler) ReceivedPacket(packetNumber protocol.PacketNu return nil } -// GetNackRanges gets all the NACK ranges -func (h *incomingPacketAckHandler) GetNackRanges() []*frames.NackRange { +// getNackRanges gets all the NACK ranges +func (h *incomingPacketAckHandler) getNackRanges() []frames.NackRange { // ToDo: improve performance - var ranges []*frames.NackRange + var ranges []frames.NackRange inRange := false for i := protocol.PacketNumber(1); i < h.largestObserved; i++ { _, ok := h.observed[i] if !ok { if !inRange { - r := &frames.NackRange{ + r := frames.NackRange{ FirstPacketNumber: i, LastPacketNumber: i, } diff --git a/ackhandler/incoming_packet_ack_handler_test.go b/ackhandler/incoming_packet_ack_handler_test.go index b92615240..abfacdc7a 100644 --- a/ackhandler/incoming_packet_ack_handler_test.go +++ b/ackhandler/incoming_packet_ack_handler_test.go @@ -20,7 +20,7 @@ var _ = Describe("incomingPacketAckHandler", func() { Expect(err).ToNot(HaveOccurred()) } Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(99))) - Expect(len(handler.GetNackRanges())).To(Equal(0)) + Expect(len(handler.getNackRanges())).To(Equal(0)) }) It("handles a single lost package", func() { @@ -31,7 +31,7 @@ var _ = Describe("incomingPacketAckHandler", func() { handler.ReceivedPacket(protocol.PacketNumber(i), false) } Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9))) - nackRanges := handler.GetNackRanges() + nackRanges := handler.getNackRanges() Expect(len(nackRanges)).To(Equal(1)) Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(5))) Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(5))) @@ -45,7 +45,7 @@ var _ = Describe("incomingPacketAckHandler", func() { handler.ReceivedPacket(protocol.PacketNumber(i), false) } Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9))) - nackRanges := handler.GetNackRanges() + nackRanges := handler.getNackRanges() Expect(len(nackRanges)).To(Equal(1)) Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(5))) Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(6))) @@ -59,7 +59,7 @@ var _ = Describe("incomingPacketAckHandler", func() { handler.ReceivedPacket(protocol.PacketNumber(i), false) } Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9))) - nackRanges := handler.GetNackRanges() + nackRanges := handler.getNackRanges() Expect(len(nackRanges)).To(Equal(2)) Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(3))) Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(3))) @@ -75,7 +75,7 @@ var _ = Describe("incomingPacketAckHandler", func() { handler.ReceivedPacket(protocol.PacketNumber(i), false) } Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9))) - nackRanges := handler.GetNackRanges() + nackRanges := handler.getNackRanges() Expect(len(nackRanges)).To(Equal(2)) Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(2))) Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(4))) @@ -90,7 +90,7 @@ var _ = Describe("incomingPacketAckHandler", func() { Expect(err).ToNot(HaveOccurred()) err = handler.ReceivedPacket(protocol.PacketNumber(2), false) Expect(err).ToNot(HaveOccurred()) - nackRanges := handler.GetNackRanges() + nackRanges := handler.getNackRanges() Expect(len(nackRanges)).To(Equal(0)) })