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

rename the constants for the max stream ids in the transport parameters

Browse Source 
No functional change expected.
This commit is contained in:
Marten Seemann
2018-05-06 12:13:04 +09:00
parent a58cfd64e9
commit f29c37b951
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/handshake/tls_extension.go
View File

@@ -11,11 +11,11 @@ const quicTLSExtensionType = 26
const ( const (
initialMaxStreamDataParameterID transportParameterID = 0x0 initialMaxStreamDataParameterID transportParameterID = 0x0
initialMaxDataParameterID transportParameterID = 0x1 initialMaxDataParameterID transportParameterID = 0x1
initialMaxStreamsBiDiParameterID transportParameterID = 0x2 initialMaxBidiStreamsParameterID transportParameterID = 0x2
idleTimeoutParameterID transportParameterID = 0x3 idleTimeoutParameterID transportParameterID = 0x3
maxPacketSizeParameterID transportParameterID = 0x5 maxPacketSizeParameterID transportParameterID = 0x5
statelessResetTokenParameterID transportParameterID = 0x6 statelessResetTokenParameterID transportParameterID = 0x6
initialMaxStreamsUniParameterID transportParameterID = 0x8 initialMaxUniStreamsParameterID transportParameterID = 0x8
) )
type transportParameter struct { type transportParameter struct {

2
internal/handshake/tls_extension_handler_client_test.go
View File

@@ -69,7 +69,7 @@ var _ = Describe("TLS Extension Handler, for the client", func() {
parameters = map[transportParameterID][]byte{ parameters = map[transportParameterID][]byte{
initialMaxStreamDataParameterID: {0x11, 0x22, 0x33, 0x44}, initialMaxStreamDataParameterID: {0x11, 0x22, 0x33, 0x44},
initialMaxDataParameterID: {0x22, 0x33, 0x44, 0x55}, initialMaxDataParameterID: {0x22, 0x33, 0x44, 0x55},
initialMaxStreamsBiDiParameterID: {0x33, 0x44}, initialMaxBidiStreamsParameterID: {0x33, 0x44},
idleTimeoutParameterID: {0x13, 0x37}, idleTimeoutParameterID: {0x13, 0x37},
statelessResetTokenParameterID: bytes.Repeat([]byte{0}, 16), statelessResetTokenParameterID: bytes.Repeat([]byte{0}, 16),
} }

2
internal/handshake/tls_extension_handler_server_test.go
View File

@@ -80,7 +80,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
parameters = map[transportParameterID][]byte{ parameters = map[transportParameterID][]byte{
initialMaxStreamDataParameterID: {0x11, 0x22, 0x33, 0x44}, initialMaxStreamDataParameterID: {0x11, 0x22, 0x33, 0x44},
initialMaxDataParameterID: {0x22, 0x33, 0x44, 0x55}, initialMaxDataParameterID: {0x22, 0x33, 0x44, 0x55},
initialMaxStreamsBiDiParameterID: {0x33, 0x44}, initialMaxBidiStreamsParameterID: {0x33, 0x44},
idleTimeoutParameterID: {0x13, 0x37}, idleTimeoutParameterID: {0x13, 0x37},
} }
}) })

12
internal/handshake/transport_parameter_test.go
View File

@@ -128,8 +128,8 @@ var _ = Describe("Transport Parameters", func() {
parameters = map[transportParameterID][]byte{ parameters = map[transportParameterID][]byte{
initialMaxStreamDataParameterID: {0x11, 0x22, 0x33, 0x44}, initialMaxStreamDataParameterID: {0x11, 0x22, 0x33, 0x44},
initialMaxDataParameterID: {0x22, 0x33, 0x44, 0x55}, initialMaxDataParameterID: {0x22, 0x33, 0x44, 0x55},
initialMaxStreamsBiDiParameterID: {0x33, 0x44}, initialMaxBidiStreamsParameterID: {0x33, 0x44},
initialMaxStreamsUniParameterID: {0x44, 0x55}, initialMaxUniStreamsParameterID: {0x44, 0x55},
idleTimeoutParameterID: {0x13, 0x37}, idleTimeoutParameterID: {0x13, 0x37},
maxPacketSizeParameterID: {0x73, 0x31}, maxPacketSizeParameterID: {0x73, 0x31},
} }
@@ -186,13 +186,13 @@ var _ = Describe("Transport Parameters", func() {
}) })
It("rejects the parameters if the initial_max_stream_id_bidi has the wrong length", func() { It("rejects the parameters if the initial_max_stream_id_bidi has the wrong length", func() {
parameters[initialMaxStreamsBiDiParameterID] = []byte{0x11, 0x22, 0x33} // should be 2 bytes parameters[initialMaxBidiStreamsParameterID] = []byte{0x11, 0x22, 0x33} // should be 2 bytes
_, err := readTransportParameters(paramsMapToList(parameters)) _, err := readTransportParameters(paramsMapToList(parameters))
Expect(err).To(MatchError("wrong length for initial_max_stream_id_bidi: 3 (expected 2)")) Expect(err).To(MatchError("wrong length for initial_max_stream_id_bidi: 3 (expected 2)"))
}) })
It("rejects the parameters if the initial_max_stream_id_bidi has the wrong length", func() { It("rejects the parameters if the initial_max_stream_id_bidi has the wrong length", func() {
parameters[initialMaxStreamsUniParameterID] = []byte{0x11, 0x22, 0x33} // should be 2 bytes parameters[initialMaxUniStreamsParameterID] = []byte{0x11, 0x22, 0x33} // should be 2 bytes
_, err := readTransportParameters(paramsMapToList(parameters)) _, err := readTransportParameters(paramsMapToList(parameters))
Expect(err).To(MatchError("wrong length for initial_max_stream_id_uni: 3 (expected 2)")) Expect(err).To(MatchError("wrong length for initial_max_stream_id_uni: 3 (expected 2)"))
}) })
@@ -248,8 +248,8 @@ var _ = Describe("Transport Parameters", func() {
Expect(values).To(HaveLen(6)) Expect(values).To(HaveLen(6))
Expect(values).To(HaveKeyWithValue(initialMaxStreamDataParameterID, []byte{0xde, 0xad, 0xbe, 0xef})) Expect(values).To(HaveKeyWithValue(initialMaxStreamDataParameterID, []byte{0xde, 0xad, 0xbe, 0xef}))
Expect(values).To(HaveKeyWithValue(initialMaxDataParameterID, []byte{0xde, 0xca, 0xfb, 0xad})) Expect(values).To(HaveKeyWithValue(initialMaxDataParameterID, []byte{0xde, 0xca, 0xfb, 0xad}))
Expect(values).To(HaveKeyWithValue(initialMaxStreamsBiDiParameterID, []byte{0x12, 0x34})) Expect(values).To(HaveKeyWithValue(initialMaxBidiStreamsParameterID, []byte{0x12, 0x34}))
Expect(values).To(HaveKeyWithValue(initialMaxStreamsUniParameterID, []byte{0x43, 0x21})) Expect(values).To(HaveKeyWithValue(initialMaxUniStreamsParameterID, []byte{0x43, 0x21}))
Expect(values).To(HaveKeyWithValue(idleTimeoutParameterID, []byte{0xca, 0xfe})) Expect(values).To(HaveKeyWithValue(idleTimeoutParameterID, []byte{0xca, 0xfe}))
Expect(values).To(HaveKeyWithValue(maxPacketSizeParameterID, []byte{0x5, 0xac})) // 1452 = 0x5ac Expect(values).To(HaveKeyWithValue(maxPacketSizeParameterID, []byte{0x5, 0xac})) // 1452 = 0x5ac
}) })

8
internal/handshake/transport_parameters.go
View File

@@ -116,12 +116,12 @@ func readTransportParameters(paramsList []transportParameter) (*TransportParamet
return nil, fmt.Errorf("wrong length for initial_max_data: %d (expected 4)", len(p.Value)) return nil, fmt.Errorf("wrong length for initial_max_data: %d (expected 4)", len(p.Value))
} }
params.ConnectionFlowControlWindow = protocol.ByteCount(binary.BigEndian.Uint32(p.Value)) params.ConnectionFlowControlWindow = protocol.ByteCount(binary.BigEndian.Uint32(p.Value))
case initialMaxStreamsBiDiParameterID: case initialMaxBidiStreamsParameterID:
if len(p.Value) != 2 { if len(p.Value) != 2 {
return nil, fmt.Errorf("wrong length for initial_max_stream_id_bidi: %d (expected 2)", len(p.Value)) return nil, fmt.Errorf("wrong length for initial_max_stream_id_bidi: %d (expected 2)", len(p.Value))
} }
params.MaxBidiStreams = binary.BigEndian.Uint16(p.Value) params.MaxBidiStreams = binary.BigEndian.Uint16(p.Value)
case initialMaxStreamsUniParameterID: case initialMaxUniStreamsParameterID:
if len(p.Value) != 2 { if len(p.Value) != 2 {
return nil, fmt.Errorf("wrong length for initial_max_stream_id_uni: %d (expected 2)", len(p.Value)) return nil, fmt.Errorf("wrong length for initial_max_stream_id_uni: %d (expected 2)", len(p.Value))
} }
@@ -168,8 +168,8 @@ func (p *TransportParameters) getTransportParameters() []transportParameter {
params := []transportParameter{ params := []transportParameter{
{initialMaxStreamDataParameterID, initialMaxStreamData}, {initialMaxStreamDataParameterID, initialMaxStreamData},
{initialMaxDataParameterID, initialMaxData}, {initialMaxDataParameterID, initialMaxData},
{initialMaxStreamsBiDiParameterID, initialMaxBidiStreamID}, {initialMaxBidiStreamsParameterID, initialMaxBidiStreamID},
{initialMaxStreamsUniParameterID, initialMaxUniStreamID}, {initialMaxUniStreamsParameterID, initialMaxUniStreamID},
{idleTimeoutParameterID, idleTimeout}, {idleTimeoutParameterID, idleTimeout},
{maxPacketSizeParameterID, maxPacketSize}, {maxPacketSizeParameterID, maxPacketSize},
} }