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

don't send STOP_WAITING frames (for IETF QUIC)

Browse Source
This commit is contained in:
Marten Seemann
2017-12-14 13:24:14 +07:00
parent 93e99e239c
commit 2c83c9e3f0
7 changed files with 151 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/wire/stop_waiting_frame.go
View File

@@ -22,7 +22,10 @@ var (
errPacketNumberLenNotSet = errors.New("StopWaitingFrame: PacketNumberLen not set")
)
func (f *StopWaitingFrame) Write(b *bytes.Buffer, _ protocol.VersionNumber) error {
func (f *StopWaitingFrame) Write(b *bytes.Buffer, v protocol.VersionNumber) error {
if v.UsesIETFFrameFormat() {
return errors.New("STOP_WAITING not defined in IETF QUIC")
}
// make sure the PacketNumber was set
if f.PacketNumber == protocol.PacketNumber(0) {
return errPacketNumberNotSet

23
internal/wire/stop_waiting_frame_test.go
View File

@@ -84,7 +84,7 @@ var _ = Describe("StopWaitingFrame", func() {
LeastUnacked: 10,
PacketNumberLen: protocol.PacketNumberLen1,
}
err := frame.Write(b, protocol.VersionWhatever)
err := frame.Write(b, versionBigEndian)
Expect(err).To(MatchError(errPacketNumberNotSet))
})
@@ -94,7 +94,7 @@ var _ = Describe("StopWaitingFrame", func() {
LeastUnacked: 10,
PacketNumber: 13,
}
err := frame.Write(b, protocol.VersionWhatever)
err := frame.Write(b, versionBigEndian)
Expect(err).To(MatchError(errPacketNumberLenNotSet))
})
@@ -105,10 +105,21 @@ var _ = Describe("StopWaitingFrame", func() {
PacketNumber: 5,
PacketNumberLen: protocol.PacketNumberLen1,
}
err := frame.Write(b, protocol.VersionWhatever)
err := frame.Write(b, versionBigEndian)
Expect(err).To(MatchError(errLeastUnackedHigherThanPacketNumber))
})
It("refuses to write for IETF QUIC", func() {
b := &bytes.Buffer{}
frame := &StopWaitingFrame{
LeastUnacked: 10,
PacketNumber: 13,
PacketNumberLen: protocol.PacketNumberLen6,
}
err := frame.Write(b, versionIETFFrames)
Expect(err).To(MatchError("STOP_WAITING not defined in IETF QUIC"))
})
Context("LeastUnackedDelta length", func() {
Context("in big endian", func() {
It("writes a 1-byte LeastUnackedDelta", func() {
@@ -179,7 +190,7 @@ var _ = Describe("StopWaitingFrame", func() {
})
Context("self consistency", func() {
It("reads a stop waiting frame that it wrote", func() {
It("reads a STOP_WAITING frame that it wrote", func() {
packetNumber := protocol.PacketNumber(13)
frame := &StopWaitingFrame{
LeastUnacked: 10,
@@ -187,9 +198,9 @@ var _ = Describe("StopWaitingFrame", func() {
PacketNumberLen: protocol.PacketNumberLen4,
}
b := &bytes.Buffer{}
err := frame.Write(b, protocol.VersionWhatever)
err := frame.Write(b, versionBigEndian)
Expect(err).ToNot(HaveOccurred())
readframe, err := ParseStopWaitingFrame(bytes.NewReader(b.Bytes()), packetNumber, protocol.PacketNumberLen4, protocol.VersionWhatever)
readframe, err := ParseStopWaitingFrame(bytes.NewReader(b.Bytes()), packetNumber, protocol.PacketNumberLen4, versionBigEndian)
Expect(err).ToNot(HaveOccurred())
Expect(readframe.LeastUnacked).To(Equal(frame.LeastUnacked))
})