mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

rename MaxDataFrame.ByteOffset to MaximumData

Browse source
This commit is contained in:
Marten Seemann 2020-07-02 16:23:25 +07:00
parent 00f8028e52
commit f4519cfd32
16 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
framer_test.go
View file

@ -38,7 +38,7 @@ var _ = Describe("Framer", func() {
Context("handling control frames", func() { Context("handling control frames", func() {
It("adds control frames", func() { It("adds control frames", func() {
mdf := &wire.MaxDataFrame{ByteOffset: 0x42} mdf := &wire.MaxDataFrame{MaximumData: 0x42}
msf := &wire.MaxStreamsFrame{MaxStreamNum: 0x1337} msf := &wire.MaxStreamsFrame{MaxStreamNum: 0x1337}
framer.QueueControlFrame(mdf) framer.QueueControlFrame(mdf)
framer.QueueControlFrame(msf) framer.QueueControlFrame(msf)
@ -52,7 +52,7 @@ var _ = Describe("Framer", func() {
It("says if it has data", func() { It("says if it has data", func() {
Expect(framer.HasData()).To(BeFalse()) Expect(framer.HasData()).To(BeFalse())
f := &wire.MaxDataFrame{ByteOffset: 0x42} f := &wire.MaxDataFrame{MaximumData: 0x42}
framer.QueueControlFrame(f) framer.QueueControlFrame(f)
Expect(framer.HasData()).To(BeTrue()) Expect(framer.HasData()).To(BeTrue())
frames, _ := framer.AppendControlFrames(nil, 1000) frames, _ := framer.AppendControlFrames(nil, 1000)
@ -62,7 +62,7 @@ var _ = Describe("Framer", func() {
It("appends to the slice given", func() { It("appends to the slice given", func() {
ping := &wire.PingFrame{} ping := &wire.PingFrame{}
mdf := &wire.MaxDataFrame{ByteOffset: 0x42} mdf := &wire.MaxDataFrame{MaximumData: 0x42}
framer.QueueControlFrame(mdf) framer.QueueControlFrame(mdf)
frames, length := framer.AppendControlFrames([]ackhandler.Frame{{Frame: ping}}, 1000) frames, length := framer.AppendControlFrames([]ackhandler.Frame{{Frame: ping}}, 1000)
Expect(frames).To(HaveLen(2)) Expect(frames).To(HaveLen(2))
@ -137,7 +137,7 @@ var _ = Describe("Framer", func() {
} }
stream1.EXPECT().popStreamFrame(gomock.Any()).Return(&ackhandler.Frame{Frame: f}, false) stream1.EXPECT().popStreamFrame(gomock.Any()).Return(&ackhandler.Frame{Frame: f}, false)
framer.AddActiveStream(id1) framer.AddActiveStream(id1)
mdf := &wire.MaxDataFrame{ByteOffset: 1337} mdf := &wire.MaxDataFrame{MaximumData: 1337}
frames := []ackhandler.Frame{{Frame: mdf}} frames := []ackhandler.Frame{{Frame: mdf}}
fs, length := framer.AppendStreamFrames(frames, 1000) fs, length := framer.AppendStreamFrames(frames, 1000)
Expect(fs).To(HaveLen(2)) Expect(fs).To(HaveLen(2))

4
fuzzing/frames/main.go
View file

@ -143,10 +143,10 @@ func getFrames() []wire.Frame {
Token: getRandomData(10), Token: getRandomData(10),
}, },
&wire.MaxDataFrame{ &wire.MaxDataFrame{
ByteOffset: protocol.ByteCount(getRandomNumber()), MaximumData: protocol.ByteCount(getRandomNumber()),
}, },
&wire.MaxDataFrame{ &wire.MaxDataFrame{
ByteOffset: protocol.MaxByteCount, MaximumData: protocol.MaxByteCount,
}, },
&wire.MaxStreamDataFrame{ &wire.MaxStreamDataFrame{
StreamID: protocol.StreamID(getRandomNumber()), StreamID: protocol.StreamID(getRandomNumber()),

2
internal/wire/frame_parser_test.go
View file

@ -143,7 +143,7 @@ var _ = Describe("Frame parsing", func() {
It("unpacks MAX_DATA frames", func() { It("unpacks MAX_DATA frames", func() {
f := &MaxDataFrame{ f := &MaxDataFrame{
ByteOffset: 0xcafe, MaximumData: 0xcafe,
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
err := f.Write(buf, versionIETFFrames) err := f.Write(buf, versionIETFFrames)

2
internal/wire/log.go
View file

@ -36,7 +36,7 @@ func LogFrame(logger utils.Logger, frame Frame, sent bool) {
logger.Debugf("\t%s &wire.AckFrame{LargestAcked: %d, LowestAcked: %d, DelayTime: %s}", dir, f.LargestAcked(), f.LowestAcked(), f.DelayTime.String()) logger.Debugf("\t%s &wire.AckFrame{LargestAcked: %d, LowestAcked: %d, DelayTime: %s}", dir, f.LargestAcked(), f.LowestAcked(), f.DelayTime.String())
} }
case *MaxDataFrame: case *MaxDataFrame:
logger.Debugf("\t%s &wire.MaxDataFrame{ByteOffset: %d}", dir, f.ByteOffset) logger.Debugf("\t%s &wire.MaxDataFrame{MaximumData: %d}", dir, f.MaximumData)
case *MaxStreamDataFrame: case *MaxStreamDataFrame:
logger.Debugf("\t%s &wire.MaxStreamDataFrame{StreamID: %d, ByteOffset: %d}", dir, f.StreamID, f.ByteOffset) logger.Debugf("\t%s &wire.MaxStreamDataFrame{StreamID: %d, ByteOffset: %d}", dir, f.StreamID, f.ByteOffset)
case *DataBlockedFrame: case *DataBlockedFrame:

4
internal/wire/log_test.go
View file

@ -98,10 +98,10 @@ var _ = Describe("Frame logging", func() {
It("logs MAX_DATA frames", func() { It("logs MAX_DATA frames", func() {
frame := &MaxDataFrame{ frame := &MaxDataFrame{
ByteOffset: 42, MaximumData: 42,
} }
LogFrame(logger, frame, false) LogFrame(logger, frame, false)
Expect(buf.String()).To(ContainSubstring("\t<- &wire.MaxDataFrame{ByteOffset: 42}\n")) Expect(buf.String()).To(ContainSubstring("\t<- &wire.MaxDataFrame{MaximumData: 42}\n"))
}) })
It("logs MAX_STREAM_DATA frames", func() { It("logs MAX_STREAM_DATA frames", func() {

8
internal/wire/max_data_frame.go
View file

@ -9,7 +9,7 @@ import (
// A MaxDataFrame carries flow control information for the connection // A MaxDataFrame carries flow control information for the connection
type MaxDataFrame struct { type MaxDataFrame struct {
ByteOffset protocol.ByteCount MaximumData protocol.ByteCount
} }
// parseMaxDataFrame parses a MAX_DATA frame // parseMaxDataFrame parses a MAX_DATA frame
@ -23,18 +23,18 @@ func parseMaxDataFrame(r *bytes.Reader, _ protocol.VersionNumber) (*MaxDataFrame
if err != nil { if err != nil {
return nil, err return nil, err
} }
frame.ByteOffset = protocol.ByteCount(byteOffset) frame.MaximumData = protocol.ByteCount(byteOffset)
return frame, nil return frame, nil
} }
//Write writes a MAX_STREAM_DATA frame //Write writes a MAX_STREAM_DATA frame
func (f *MaxDataFrame) Write(b *bytes.Buffer, version protocol.VersionNumber) error { func (f *MaxDataFrame) Write(b *bytes.Buffer, version protocol.VersionNumber) error {
b.WriteByte(0x10) b.WriteByte(0x10)
utils.WriteVarInt(b, uint64(f.ByteOffset)) utils.WriteVarInt(b, uint64(f.MaximumData))
return nil return nil
} }
// Length of a written frame // Length of a written frame
func (f *MaxDataFrame) Length(version protocol.VersionNumber) protocol.ByteCount { func (f *MaxDataFrame) Length(version protocol.VersionNumber) protocol.ByteCount {
return 1 + utils.VarIntLen(uint64(f.ByteOffset)) return 1 + utils.VarIntLen(uint64(f.MaximumData))
} }

6
internal/wire/max_data_frame_test.go
View file

@ -17,7 +17,7 @@ var _ = Describe("MAX_DATA frame", func() {
b := bytes.NewReader(data) b := bytes.NewReader(data)
frame, err := parseMaxDataFrame(b, versionIETFFrames) frame, err := parseMaxDataFrame(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(frame.ByteOffset).To(Equal(protocol.ByteCount(0xdecafbad123456))) Expect(frame.MaximumData).To(Equal(protocol.ByteCount(0xdecafbad123456)))
Expect(b.Len()).To(BeZero()) Expect(b.Len()).To(BeZero())
}) })
@ -36,7 +36,7 @@ var _ = Describe("MAX_DATA frame", func() {
Context("writing", func() { Context("writing", func() {
It("has proper min length", func() { It("has proper min length", func() {
f := &MaxDataFrame{ f := &MaxDataFrame{
ByteOffset: 0xdeadbeef, MaximumData: 0xdeadbeef,
} }
Expect(f.Length(versionIETFFrames)).To(Equal(1 + utils.VarIntLen(0xdeadbeef))) Expect(f.Length(versionIETFFrames)).To(Equal(1 + utils.VarIntLen(0xdeadbeef)))
}) })
@ -44,7 +44,7 @@ var _ = Describe("MAX_DATA frame", func() {
It("writes a MAX_DATA frame", func() { It("writes a MAX_DATA frame", func() {
b := &bytes.Buffer{} b := &bytes.Buffer{}
f := &MaxDataFrame{ f := &MaxDataFrame{
ByteOffset: 0xdeadbeefcafe, MaximumData: 0xdeadbeefcafe,
} }
err := f.Write(b, versionIETFFrames) err := f.Write(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())

2
packet_packer_test.go
View file

@ -259,7 +259,7 @@ var _ = Describe("Packet packer", func() {
sealingManager.EXPECT().Get0RTTSealer().Return(getSealer(), nil).AnyTimes() sealingManager.EXPECT().Get0RTTSealer().Return(getSealer(), nil).AnyTimes()
pnManager.EXPECT().PeekPacketNumber(protocol.Encryption0RTT).Return(protocol.PacketNumber(0x42), protocol.PacketNumberLen2) pnManager.EXPECT().PeekPacketNumber(protocol.Encryption0RTT).Return(protocol.PacketNumber(0x42), protocol.PacketNumberLen2)
pnManager.EXPECT().PopPacketNumber(protocol.Encryption0RTT).Return(protocol.PacketNumber(0x42)) pnManager.EXPECT().PopPacketNumber(protocol.Encryption0RTT).Return(protocol.PacketNumber(0x42))
cf := ackhandler.Frame{Frame: &wire.MaxDataFrame{ByteOffset: 0x1337}} cf := ackhandler.Frame{Frame: &wire.MaxDataFrame{MaximumData: 0x1337}}
framer.EXPECT().HasData().Return(true) framer.EXPECT().HasData().Return(true)
framer.EXPECT().AppendControlFrames(nil, gomock.Any()).DoAndReturn(func(frames []ackhandler.Frame, _ protocol.ByteCount) ([]ackhandler.Frame, protocol.ByteCount) { framer.EXPECT().AppendControlFrames(nil, gomock.Any()).DoAndReturn(func(frames []ackhandler.Frame, _ protocol.ByteCount) ([]ackhandler.Frame, protocol.ByteCount) {
return append(frames, cf), cf.Length(packer.version) return append(frames, cf), cf.Length(packer.version)

2
qlog/frame.go
View file

@ -173,7 +173,7 @@ func marshalStreamFrame(enc *gojay.Encoder, f *streamFrame) {
func marshalMaxDataFrame(enc *gojay.Encoder, f *wire.MaxDataFrame) { func marshalMaxDataFrame(enc *gojay.Encoder, f *wire.MaxDataFrame) {
enc.StringKey("frame_type", "max_data") enc.StringKey("frame_type", "max_data")
enc.Int64Key("maximum", int64(f.ByteOffset)) enc.Int64Key("maximum", int64(f.MaximumData))
} }
func marshalMaxStreamDataFrame(enc *gojay.Encoder, f *wire.MaxStreamDataFrame) { func marshalMaxStreamDataFrame(enc *gojay.Encoder, f *wire.MaxStreamDataFrame) {

2
qlog/frame_test.go
View file

@ -175,7 +175,7 @@ var _ = Describe("Frames", func() {
It("marshals MAX_DATA frames", func() { It("marshals MAX_DATA frames", func() {
check( check(
&wire.MaxDataFrame{ &wire.MaxDataFrame{
ByteOffset: 1337, MaximumData: 1337,
}, },
map[string]interface{}{ map[string]interface{}{
"frame_type": "max_data", "frame_type": "max_data",

2
qlog/qlog_test.go
View file

@ -300,7 +300,7 @@ var _ = Describe("Tracer", func() {
}, },
123, 123,
&wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 10}}}, &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 10}}},
[]wire.Frame{&wire.MaxDataFrame{ByteOffset: 987}}, []wire.Frame{&wire.MaxDataFrame{MaximumData: 987}},
) )
entry := exportAndParseSingle() entry := exportAndParseSingle()
ev := entry.Event ev := entry.Event

14
retransmission_queue_test.go
View file

@ -24,7 +24,7 @@ var _ = Describe("Retransmission queue", func() {
}) })
It("queues and retrieves a control frame", func() { It("queues and retrieves a control frame", func() {
f := &wire.MaxDataFrame{ByteOffset: 0x42} f := &wire.MaxDataFrame{MaximumData: 0x42}
q.AddInitial(f) q.AddInitial(f)
Expect(q.HasInitialData()).To(BeTrue()) Expect(q.HasInitialData()).To(BeTrue())
Expect(q.GetInitialFrame(f.Length(version) - 1)).To(BeNil()) Expect(q.GetInitialFrame(f.Length(version) - 1)).To(BeNil())
@ -74,7 +74,7 @@ var _ = Describe("Retransmission queue", func() {
}) })
It("retrieves both a CRYPTO frame and a control frame", func() { It("retrieves both a CRYPTO frame and a control frame", func() {
cf := &wire.MaxDataFrame{ByteOffset: 0x42} cf := &wire.MaxDataFrame{MaximumData: 0x42}
f := &wire.CryptoFrame{Data: []byte("foobar")} f := &wire.CryptoFrame{Data: []byte("foobar")}
q.AddInitial(f) q.AddInitial(f)
q.AddInitial(cf) q.AddInitial(cf)
@ -86,7 +86,7 @@ var _ = Describe("Retransmission queue", func() {
It("drops all Initial frames", func() { It("drops all Initial frames", func() {
q.AddInitial(&wire.CryptoFrame{Data: []byte("foobar")}) q.AddInitial(&wire.CryptoFrame{Data: []byte("foobar")})
q.AddInitial(&wire.MaxDataFrame{ByteOffset: 0x42}) q.AddInitial(&wire.MaxDataFrame{MaximumData: 0x42})
q.DropPackets(protocol.EncryptionInitial) q.DropPackets(protocol.EncryptionInitial)
Expect(q.HasInitialData()).To(BeFalse()) Expect(q.HasInitialData()).To(BeFalse())
Expect(q.GetInitialFrame(protocol.MaxByteCount)).To(BeNil()) Expect(q.GetInitialFrame(protocol.MaxByteCount)).To(BeNil())
@ -100,7 +100,7 @@ var _ = Describe("Retransmission queue", func() {
}) })
It("queues and retrieves a control frame", func() { It("queues and retrieves a control frame", func() {
f := &wire.MaxDataFrame{ByteOffset: 0x42} f := &wire.MaxDataFrame{MaximumData: 0x42}
q.AddHandshake(f) q.AddHandshake(f)
Expect(q.HasHandshakeData()).To(BeTrue()) Expect(q.HasHandshakeData()).To(BeTrue())
Expect(q.GetHandshakeFrame(f.Length(version) - 1)).To(BeNil()) Expect(q.GetHandshakeFrame(f.Length(version) - 1)).To(BeNil())
@ -150,7 +150,7 @@ var _ = Describe("Retransmission queue", func() {
}) })
It("retrieves both a CRYPTO frame and a control frame", func() { It("retrieves both a CRYPTO frame and a control frame", func() {
cf := &wire.MaxDataFrame{ByteOffset: 0x42} cf := &wire.MaxDataFrame{MaximumData: 0x42}
f := &wire.CryptoFrame{Data: []byte("foobar")} f := &wire.CryptoFrame{Data: []byte("foobar")}
q.AddHandshake(f) q.AddHandshake(f)
q.AddHandshake(cf) q.AddHandshake(cf)
@ -162,7 +162,7 @@ var _ = Describe("Retransmission queue", func() {
It("drops all Handshake frames", func() { It("drops all Handshake frames", func() {
q.AddHandshake(&wire.CryptoFrame{Data: []byte("foobar")}) q.AddHandshake(&wire.CryptoFrame{Data: []byte("foobar")})
q.AddHandshake(&wire.MaxDataFrame{ByteOffset: 0x42}) q.AddHandshake(&wire.MaxDataFrame{MaximumData: 0x42})
q.DropPackets(protocol.EncryptionHandshake) q.DropPackets(protocol.EncryptionHandshake)
Expect(q.HasHandshakeData()).To(BeFalse()) Expect(q.HasHandshakeData()).To(BeFalse())
Expect(q.GetHandshakeFrame(protocol.MaxByteCount)).To(BeNil()) Expect(q.GetHandshakeFrame(protocol.MaxByteCount)).To(BeNil())
@ -175,7 +175,7 @@ var _ = Describe("Retransmission queue", func() {
}) })
It("queues and retrieves a control frame", func() { It("queues and retrieves a control frame", func() {
f := &wire.MaxDataFrame{ByteOffset: 0x42} f := &wire.MaxDataFrame{MaximumData: 0x42}
Expect(q.HasAppData()).To(BeFalse()) Expect(q.HasAppData()).To(BeFalse())
q.AddAppData(f) q.AddAppData(f)
Expect(q.HasAppData()).To(BeTrue()) Expect(q.HasAppData()).To(BeTrue())

2
session.go
View file

@ -1143,7 +1143,7 @@ func (s *session) handleStreamFrame(frame *wire.StreamFrame) error {
} }
func (s *session) handleMaxDataFrame(frame *wire.MaxDataFrame) { func (s *session) handleMaxDataFrame(frame *wire.MaxDataFrame) {
s.connFlowController.UpdateSendWindow(frame.ByteOffset) s.connFlowController.UpdateSendWindow(frame.MaximumData)
} }
func (s *session) handleMaxStreamDataFrame(frame *wire.MaxStreamDataFrame) error { func (s *session) handleMaxStreamDataFrame(frame *wire.MaxStreamDataFrame) error {

2
session_test.go
View file

@ -225,7 +225,7 @@ var _ = Describe("Session", func() {
It("updates the flow control window of the connection", func() { It("updates the flow control window of the connection", func() {
offset := protocol.ByteCount(0x800000) offset := protocol.ByteCount(0x800000)
connFC.EXPECT().UpdateSendWindow(offset) connFC.EXPECT().UpdateSendWindow(offset)
sess.handleMaxDataFrame(&wire.MaxDataFrame{ByteOffset: offset}) sess.handleMaxDataFrame(&wire.MaxDataFrame{MaximumData: offset})
}) })
It("ignores MAX_STREAM_DATA frames for a closed stream", func() { It("ignores MAX_STREAM_DATA frames for a closed stream", func() {

2
window_update_queue.go
View file

@ -48,7 +48,7 @@ func (q *windowUpdateQueue) QueueAll() {
q.mutex.Lock() q.mutex.Lock()
// queue a connection-level window update // queue a connection-level window update
if q.queuedConn { if q.queuedConn {
q.callback(&wire.MaxDataFrame{ByteOffset: q.connFlowController.GetWindowUpdate()}) q.callback(&wire.MaxDataFrame{MaximumData: q.connFlowController.GetWindowUpdate()})
q.queuedConn = false q.queuedConn = false
} }
// queue all stream-level window updates // queue all stream-level window updates

2
window_update_queue_test.go
View file

@ -94,7 +94,7 @@ var _ = Describe("Window Update Queue", func() {
q.AddConnection() q.AddConnection()
q.QueueAll() q.QueueAll()
Expect(queuedFrames).To(Equal([]wire.Frame{ Expect(queuedFrames).To(Equal([]wire.Frame{
&wire.MaxDataFrame{ByteOffset: 0x1337}, &wire.MaxDataFrame{MaximumData: 0x1337},
})) }))
}) })