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

Merge pull request #2086 from lucas-clemente/fix-conn-close-length

Browse Source 
fix length calculcation for CONNECTION_CLOSE frames
This commit is contained in:
Marten Seemann
2019-08-23 22:05:52 +07:00
committed by GitHub
parent 21b2ede9cd 0dbfefc1f6
commit 6a7b9c6412
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/wire/connection_close_frame.go
View File

@@ -62,7 +62,7 @@ func parseConnectionCloseFrame(r *bytes.Reader, version protocol.VersionNumber)
func (f *ConnectionCloseFrame) Length(version protocol.VersionNumber) protocol.ByteCount { func (f *ConnectionCloseFrame) Length(version protocol.VersionNumber) protocol.ByteCount {
length := 1 + utils.VarIntLen(uint64(f.ErrorCode)) + 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 { if !f.IsApplicationError {
length++ // for the frame type length += utils.VarIntLen(f.FrameType) // for the frame type
} }
return length return length
} }

1
internal/wire/connection_close_frame_test.go
View File

@@ -132,6 +132,7 @@ var _ = Describe("CONNECTION_CLOSE Frame", func() {
b := &bytes.Buffer{} b := &bytes.Buffer{}
f := &ConnectionCloseFrame{ f := &ConnectionCloseFrame{
ErrorCode: 0xcafe, ErrorCode: 0xcafe,
FrameType: 0xdeadbeef,
ReasonPhrase: "foobar", ReasonPhrase: "foobar",
} }
Expect(f.Write(b, versionIETFFrames)).To(Succeed()) Expect(f.Write(b, versionIETFFrames)).To(Succeed())