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

Merge pull request #857 from lucas-clemente/maxpacketsize-handshake-param

Browse Source 
send the maximum packet size in the TLS transport parameters
This commit is contained in:
Marten Seemann
2017-09-29 23:14:38 +07:00
committed by GitHub
parent 8d273d30af dc6d1b6822
commit 1931ce502e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/handshake/params_negotiator.go
View File

@@ -88,11 +88,14 @@ func (h *paramsNegotiator) GetTransportParameters() []transportParameter {
binary.BigEndian.PutUint32(initialMaxStreamID, math.MaxUint32) binary.BigEndian.PutUint32(initialMaxStreamID, math.MaxUint32)
idleTimeout := make([]byte, 2) idleTimeout := make([]byte, 2)
binary.BigEndian.PutUint16(idleTimeout, uint16(h.GetIdleConnectionStateLifetime().Seconds())) binary.BigEndian.PutUint16(idleTimeout, uint16(h.GetIdleConnectionStateLifetime().Seconds()))
maxPacketSize := make([]byte, 2)
binary.BigEndian.PutUint16(maxPacketSize, uint16(protocol.MaxReceivePacketSize))
params := []transportParameter{ params := []transportParameter{
{initialMaxStreamDataParameterID, initialMaxStreamData}, {initialMaxStreamDataParameterID, initialMaxStreamData},
{initialMaxDataParameterID, initialMaxData}, {initialMaxDataParameterID, initialMaxData},
{initialMaxStreamIDParameterID, initialMaxStreamID}, {initialMaxStreamIDParameterID, initialMaxStreamID},
{idleTimeoutParameterID, idleTimeout}, {idleTimeoutParameterID, idleTimeout},
{maxPacketSizeParameterID, maxPacketSize},
} }
h.mutex.RLock() h.mutex.RLock()
defer h.mutex.RUnlock() defer h.mutex.RUnlock()

3
internal/handshake/params_negotiator_test.go
View File

@@ -49,13 +49,14 @@ var _ = Describe("Params Negotiator (for TLS)", func() {
It("creates the parameters list", func() { It("creates the parameters list", func() {
buf := make([]byte, 4) buf := make([]byte, 4)
values := paramsListToMap(pn.GetTransportParameters()) values := paramsListToMap(pn.GetTransportParameters())
Expect(values).To(HaveLen(4)) Expect(values).To(HaveLen(5))
binary.BigEndian.PutUint32(buf, uint32(protocol.ReceiveStreamFlowControlWindow)) binary.BigEndian.PutUint32(buf, uint32(protocol.ReceiveStreamFlowControlWindow))
Expect(values).To(HaveKeyWithValue(initialMaxStreamDataParameterID, buf)) Expect(values).To(HaveKeyWithValue(initialMaxStreamDataParameterID, buf))
binary.BigEndian.PutUint32(buf, uint32(protocol.ReceiveConnectionFlowControlWindow)) binary.BigEndian.PutUint32(buf, uint32(protocol.ReceiveConnectionFlowControlWindow))
Expect(values).To(HaveKeyWithValue(initialMaxDataParameterID, buf)) Expect(values).To(HaveKeyWithValue(initialMaxDataParameterID, buf))
Expect(values).To(HaveKeyWithValue(initialMaxStreamIDParameterID, []byte{0xff, 0xff, 0xff, 0xff})) Expect(values).To(HaveKeyWithValue(initialMaxStreamIDParameterID, []byte{0xff, 0xff, 0xff, 0xff}))
Expect(values).To(HaveKeyWithValue(idleTimeoutParameterID, []byte{0x50, 0x0})) Expect(values).To(HaveKeyWithValue(idleTimeoutParameterID, []byte{0x50, 0x0}))
Expect(values).To(HaveKeyWithValue(maxPacketSizeParameterID, []byte{0x5, 0xac})) // 1452 = 0x5ac
}) })
It("request ommision of the connection ID", func() { It("request ommision of the connection ID", func() {