From f204b088a6f3570a5f94f9b9eff733f3ccae9819 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Tue, 26 Apr 2016 17:02:00 +0700 Subject: [PATCH] rename frame.MaxLength() to frame.MinLength() --- frames/ack_frame.go | 4 ++-- frames/ack_frame_test.go | 8 ++++---- frames/connection_close_frame.go | 4 ++-- frames/connection_close_frame_test.go | 4 ++-- frames/frame.go | 2 +- frames/rst_stream_frame.go | 4 ++-- frames/stop_waiting_frame.go | 4 ++-- frames/stream_frame.go | 8 ++++---- frames/stream_frame_test.go | 6 +++--- frames/window_update_frame.go | 4 ++-- packet_packer.go | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/frames/ack_frame.go b/frames/ack_frame.go index 22fa55a2..3823a9c8 100644 --- a/frames/ack_frame.go +++ b/frames/ack_frame.go @@ -67,8 +67,8 @@ func (f *AckFrame) Write(b *bytes.Buffer, packetNumber protocol.PacketNumber, pa return nil } -// MaxLength of a written frame -func (f *AckFrame) MaxLength() int { +// MinLength of a written frame +func (f *AckFrame) MinLength() int { l := 1 + 1 + 6 + 2 + 1 + 1 + 4 l += (1 + 2) * 0 /* TODO: num_timestamps */ if f.HasNACK() { diff --git a/frames/ack_frame_test.go b/frames/ack_frame_test.go index ebbf38d1..8fa5ca4d 100644 --- a/frames/ack_frame_test.go +++ b/frames/ack_frame_test.go @@ -247,17 +247,17 @@ var _ = Describe("AckFrame", func() { Expect(packetNumber2).To(BeEquivalentTo([]byte{1, 0, 0, 0, 0, 0})) }) - It("has proper max length", func() { + It("has proper min length", func() { b := &bytes.Buffer{} f := &AckFrame{ Entropy: 2, LargestObserved: 1, } f.Write(b, 1, 6) - Expect(f.MaxLength()).To(Equal(b.Len())) + Expect(f.MinLength()).To(Equal(b.Len())) }) - It("has proper max length with nack ranges", func() { + It("has proper min length with nack ranges", func() { b := &bytes.Buffer{} f := &AckFrame{ Entropy: 2, @@ -271,7 +271,7 @@ var _ = Describe("AckFrame", func() { } err := f.Write(b, 1, 6) Expect(err).ToNot(HaveOccurred()) - Expect(f.MaxLength()).To(Equal(b.Len())) + Expect(f.MinLength()).To(Equal(b.Len())) }) }) diff --git a/frames/connection_close_frame.go b/frames/connection_close_frame.go index 86e14020..101f37bf 100644 --- a/frames/connection_close_frame.go +++ b/frames/connection_close_frame.go @@ -46,8 +46,8 @@ func ParseConnectionCloseFrame(r *bytes.Reader) (*ConnectionCloseFrame, error) { return frame, nil } -// MaxLength of a written frame -func (f *ConnectionCloseFrame) MaxLength() int { +// MinLength of a written frame +func (f *ConnectionCloseFrame) MinLength() int { return 1 + 4 + 2 + len(f.ReasonPhrase) } diff --git a/frames/connection_close_frame_test.go b/frames/connection_close_frame_test.go index e653275e..8a318532 100644 --- a/frames/connection_close_frame_test.go +++ b/frames/connection_close_frame_test.go @@ -71,14 +71,14 @@ var _ = Describe("ConnectionCloseFrame", func() { Expect(err).To(HaveOccurred()) }) - It("has proper max length", func() { + It("has proper min length", func() { b := &bytes.Buffer{} f := &ConnectionCloseFrame{ ErrorCode: 0xDEADBEEF, ReasonPhrase: "foobar", } f.Write(b, 1, 6) - Expect(f.MaxLength()).To(Equal(b.Len())) + Expect(f.MinLength()).To(Equal(b.Len())) }) }) diff --git a/frames/frame.go b/frames/frame.go index a69c9421..1484d69d 100644 --- a/frames/frame.go +++ b/frames/frame.go @@ -9,5 +9,5 @@ import ( // A Frame in QUIC type Frame interface { Write(b *bytes.Buffer, packetNumber protocol.PacketNumber, packetNumberLen uint8) error - MaxLength() int + MinLength() int } diff --git a/frames/rst_stream_frame.go b/frames/rst_stream_frame.go index a1aa35e0..f08f453c 100644 --- a/frames/rst_stream_frame.go +++ b/frames/rst_stream_frame.go @@ -19,8 +19,8 @@ func (f *RstStreamFrame) Write(b *bytes.Buffer, packetNumber protocol.PacketNumb panic("RstStreamFrame: Write not yet implemented") } -// MaxLength of a written frame -func (f *RstStreamFrame) MaxLength() int { +// MinLength of a written frame +func (f *RstStreamFrame) MinLength() int { panic("RstStreamFrame: Write not yet implemented") } diff --git a/frames/stop_waiting_frame.go b/frames/stop_waiting_frame.go index 1f4c05d5..e1a41ba0 100644 --- a/frames/stop_waiting_frame.go +++ b/frames/stop_waiting_frame.go @@ -30,8 +30,8 @@ func (f *StopWaitingFrame) Write(b *bytes.Buffer, packetNumber protocol.PacketNu return nil } -// MaxLength of a written frame -func (f *StopWaitingFrame) MaxLength() int { +// MinLength of a written frame +func (f *StopWaitingFrame) MinLength() int { return 1 + 1 + 6 } diff --git a/frames/stream_frame.go b/frames/stream_frame.go index b0e529d0..532db111 100644 --- a/frames/stream_frame.go +++ b/frames/stream_frame.go @@ -89,17 +89,17 @@ func (f *StreamFrame) Write(b *bytes.Buffer, packetNumber protocol.PacketNumber, return nil } -// MaxLength of a written frame -func (f *StreamFrame) MaxLength() int { +// MinLength of a written frame +func (f *StreamFrame) MinLength() int { return 1 + 4 + 8 + 2 + 1 } // MaybeSplitOffFrame removes the first n bytes and returns them as a separate frame. If n >= len(n), nil is returned and nothing is modified. func (f *StreamFrame) MaybeSplitOffFrame(n int) *StreamFrame { - if n >= f.MaxLength()-1+len(f.Data) { + if n >= f.MinLength()-1+len(f.Data) { return nil } - n -= f.MaxLength() - 1 + n -= f.MinLength() - 1 defer func() { f.Data = f.Data[n:] diff --git a/frames/stream_frame_test.go b/frames/stream_frame_test.go index efd8df35..d3631592 100644 --- a/frames/stream_frame_test.go +++ b/frames/stream_frame_test.go @@ -51,7 +51,7 @@ var _ = Describe("StreamFrame", func() { Expect(b.Bytes()).To(Equal([]byte{0xbf, 0x1, 0, 0, 0, 0x10, 0, 0, 0, 0, 0, 0, 0, 0x06, 0x00, 'f', 'o', 'o', 'b', 'a', 'r'})) }) - It("has proper max length", func() { + It("has proper min length", func() { b := &bytes.Buffer{} f := &StreamFrame{ StreamID: 1, @@ -59,7 +59,7 @@ var _ = Describe("StreamFrame", func() { Offset: 1, } f.Write(b, 1, 6) - Expect(f.MaxLength()).To(Equal(b.Len())) + Expect(f.MinLength()).To(Equal(b.Len())) }) }) @@ -81,7 +81,7 @@ var _ = Describe("StreamFrame", func() { Offset: 3, FinBit: true, } - previous := f.MaybeSplitOffFrame(f.MaxLength() - 1 + 3) + previous := f.MaybeSplitOffFrame(f.MinLength() - 1 + 3) Expect(previous).ToNot(BeNil()) Expect(previous.StreamID).To(Equal(protocol.StreamID(1))) Expect(previous.Data).To(Equal([]byte("foo"))) diff --git a/frames/window_update_frame.go b/frames/window_update_frame.go index df32feff..3de6b032 100644 --- a/frames/window_update_frame.go +++ b/frames/window_update_frame.go @@ -18,8 +18,8 @@ func (f *WindowUpdateFrame) Write(b *bytes.Buffer, packetNumber protocol.PacketN panic("WindowUpdateFrame: Write not yet implemented") } -// MaxLength of a written frame -func (f *WindowUpdateFrame) MaxLength() int { +// MinLength of a written frame +func (f *WindowUpdateFrame) MinLength() int { panic("WindowUpdateFrame: Write not yet implemented") } diff --git a/packet_packer.go b/packet_packer.go index fba9dd48..51337253 100644 --- a/packet_packer.go +++ b/packet_packer.go @@ -96,7 +96,7 @@ func (p *packetPacker) composeNextPayload(currentPacketNumber protocol.PacketNum } // Does the frame fit into the remaining space? - if payload.Len()-1+frame.MaxLength() > protocol.MaxFrameSize { + if payload.Len()-1+frame.MinLength() > protocol.MaxFrameSize { return payload.Bytes(), nil }