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

use a varint for the error code in the CONNECTION_CLOSE frame

Browse Source
This commit is contained in:
Marten Seemann
2019-06-14 17:35:40 +08:00
parent 2225bfd9a2
commit 453aa23553
4 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/protocol/protocol.go
View File

@@ -41,7 +41,7 @@ type ByteCount uint64
const MaxByteCount = ByteCount(1<<62 - 1)
// An ApplicationErrorCode is an application-defined error code.
type ApplicationErrorCode uint16
type ApplicationErrorCode uint64
// MaxReceivePacketSize maximum packet size of any QUIC packet, based on
// ethernet's max size, minus the IP and UDP headers. IPv6 has a 40 byte header,

2
internal/qerr/error_codes.go
View File

@@ -7,7 +7,7 @@ import (
)
// ErrorCode can be used as a normal error without reason.
type ErrorCode uint16
type ErrorCode uint64
// The error codes defined by QUIC
const (

6
internal/wire/connection_close_frame.go
View File

@@ -23,7 +23,7 @@ func parseConnectionCloseFrame(r *bytes.Reader, version protocol.VersionNumber)
}
f := &ConnectionCloseFrame{IsApplicationError: typeByte == 0x1d}
ec, err := utils.BigEndian.ReadUint16(r)
ec, err := utils.ReadVarInt(r)
if err != nil {
return nil, err
}
@@ -57,7 +57,7 @@ func parseConnectionCloseFrame(r *bytes.Reader, version protocol.VersionNumber)
// Length of a written frame
func (f *ConnectionCloseFrame) Length(version protocol.VersionNumber) protocol.ByteCount {
length := 1 + 2 + utils.VarIntLen(uint64(len(f.ReasonPhrase))) + protocol.ByteCount(len(f.ReasonPhrase))
length := 1 + utils.VarIntLen(uint64(f.ErrorCode)) + utils.VarIntLen(uint64(len(f.ReasonPhrase))) + protocol.ByteCount(len(f.ReasonPhrase))
if !f.IsApplicationError {
length++ // for the frame type
}
@@ -71,7 +71,7 @@ func (f *ConnectionCloseFrame) Write(b *bytes.Buffer, version protocol.VersionNu
b.WriteByte(0x1c)
}
utils.BigEndian.WriteUint16(b, uint16(f.ErrorCode))
utils.WriteVarInt(b, uint64(f.ErrorCode))
if !f.IsApplicationError {
utils.WriteVarInt(b, 0)
}

38
internal/wire/connection_close_frame_test.go
View File

@@ -15,7 +15,8 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
Context("when parsing", func() {
It("accepts sample frame containing a QUIC error code", func() {
reason := "No recent network activity."
data := []byte{0x1c, 0x0, 0x19}
data := []byte{0x1c}
data = append(data, encodeVarInt(0x19)...)
data = append(data, encodeVarInt(0x1337)...) // frame type
data = append(data, encodeVarInt(uint64(len(reason)))...) // reason phrase length
data = append(data, []byte(reason)...)
@@ -30,20 +31,22 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
It("accepts sample frame containing an application error code", func() {
reason := "The application messed things up."
data := []byte{0x1d, 0x0, 0x19}
data := []byte{0x1d}
data = append(data, encodeVarInt(0xcafe)...)
data = append(data, encodeVarInt(uint64(len(reason)))...) // reason phrase length
data = append(data, reason...)
b := bytes.NewReader(data)
frame, err := parseConnectionCloseFrame(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred())
Expect(frame.IsApplicationError).To(BeTrue())
Expect(frame.ErrorCode).To(Equal(qerr.ErrorCode(0x19)))
Expect(frame.ErrorCode).To(Equal(qerr.ErrorCode(0xcafe)))
Expect(frame.ReasonPhrase).To(Equal(reason))
Expect(b.Len()).To(BeZero())
})
It("rejects long reason phrases", func() {
data := []byte{0x1c, 0xca, 0xfe}
data := []byte{0x1c}
data = append(data, encodeVarInt(0xcafe)...)
data = append(data, encodeVarInt(0x42)...) // frame type
data = append(data, encodeVarInt(0xffff)...) // reason phrase length
b := bytes.NewReader(data)
@@ -53,7 +56,8 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
It("errors on EOFs", func() {
reason := "No recent network activity."
data := []byte{0x1c, 0x0, 0x19}
data := []byte{0x1c}
data = append(data, encodeVarInt(0x19)...)
data = append(data, encodeVarInt(0x1337)...) // frame type
data = append(data, encodeVarInt(uint64(len(reason)))...) // reason phrase length
data = append(data, []byte(reason)...)
@@ -66,7 +70,8 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
})
It("parses a frame without a reason phrase", func() {
data := []byte{0x1c, 0xca, 0xfe}
data := []byte{0x1c}
data = append(data, encodeVarInt(0xcafe)...)
data = append(data, encodeVarInt(0x42)...) // frame type
data = append(data, encodeVarInt(0)...)
b := bytes.NewReader(data)
@@ -83,9 +88,9 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
frame := &ConnectionCloseFrame{
ErrorCode: 0xbeef,
}
err := frame.Write(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred())
expected := []byte{0x1c, 0xbe, 0xef}
Expect(frame.Write(b, versionIETFFrames)).To(Succeed())
expected := []byte{0x1c}
expected = append(expected, encodeVarInt(0xbeef)...)
expected = append(expected, encodeVarInt(0)...) // frame type
expected = append(expected, encodeVarInt(0)...) // reason phrase length
Expect(b.Bytes()).To(Equal(expected))
@@ -97,9 +102,9 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
ErrorCode: 0xdead,
ReasonPhrase: "foobar",
}
err := frame.Write(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred())
expected := []byte{0x1c, 0xde, 0xad}
Expect(frame.Write(b, versionIETFFrames)).To(Succeed())
expected := []byte{0x1c}
expected = append(expected, encodeVarInt(0xdead)...)
expected = append(expected, encodeVarInt(0)...) // frame type
expected = append(expected, encodeVarInt(6)...) // reason phrase length
expected = append(expected, []byte("foobar")...)
@@ -113,9 +118,9 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
ErrorCode: 0xdead,
ReasonPhrase: "foobar",
}
err := frame.Write(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred())
expected := []byte{0x1d, 0xde, 0xad}
Expect(frame.Write(b, versionIETFFrames)).To(Succeed())
expected := []byte{0x1d}
expected = append(expected, encodeVarInt(0xdead)...)
expected = append(expected, encodeVarInt(6)...) // reason phrase length
expected = append(expected, []byte("foobar")...)
Expect(b.Bytes()).To(Equal(expected))
@@ -127,8 +132,7 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
ErrorCode: 0xcafe,
ReasonPhrase: "foobar",
}
err := f.Write(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred())
Expect(f.Write(b, versionIETFFrames)).To(Succeed())
Expect(f.Length(versionIETFFrames)).To(Equal(protocol.ByteCount(b.Len())))
})