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

Merge pull request #1588 from lucas-clemente/renumber-transport-parameters

Browse Source 
renumber transport parameters
This commit is contained in:
Marten Seemann
2018-11-08 17:40:56 +07:00
committed by GitHub
parent 768004c4bc 6da4ef356f
commit c671e7b79c
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
internal/handshake/transport_parameters.go
View File

@@ -15,16 +15,16 @@ import (
type transportParameterID uint16 type transportParameterID uint16
const ( const (
initialMaxStreamDataBidiLocalParameterID transportParameterID = 0x0 idleTimeoutParameterID transportParameterID = 0x1
initialMaxDataParameterID transportParameterID = 0x1 statelessResetTokenParameterID transportParameterID = 0x2
initialMaxBidiStreamsParameterID transportParameterID = 0x2 maxPacketSizeParameterID transportParameterID = 0x3
idleTimeoutParameterID transportParameterID = 0x3 initialMaxDataParameterID transportParameterID = 0x4
maxPacketSizeParameterID transportParameterID = 0x5 initialMaxStreamDataBidiLocalParameterID transportParameterID = 0x5
statelessResetTokenParameterID transportParameterID = 0x6 initialMaxStreamDataBidiRemoteParameterID transportParameterID = 0x6
initialMaxUniStreamsParameterID transportParameterID = 0x8 initialMaxStreamDataUniParameterID transportParameterID = 0x7
disableMigrationParameterID transportParameterID = 0x9 initialMaxStreamsBidiParameterID transportParameterID = 0x8
initialMaxStreamDataBidiRemoteParameterID transportParameterID = 0xa initialMaxStreamsUniParameterID transportParameterID = 0x9
initialMaxStreamDataUniParameterID transportParameterID = 0xb disableMigrationParameterID transportParameterID = 0xc
) )
// TransportParameters are parameters sent to the peer during the handshake // TransportParameters are parameters sent to the peer during the handshake
@@ -59,8 +59,8 @@ func (p *TransportParameters) unmarshal(data []byte, sentBy protocol.Perspective
initialMaxStreamDataBidiRemoteParameterID, initialMaxStreamDataBidiRemoteParameterID,
initialMaxStreamDataUniParameterID, initialMaxStreamDataUniParameterID,
initialMaxDataParameterID, initialMaxDataParameterID,
initialMaxBidiStreamsParameterID, initialMaxStreamsBidiParameterID,
initialMaxUniStreamsParameterID, initialMaxStreamsUniParameterID,
idleTimeoutParameterID, idleTimeoutParameterID,
maxPacketSizeParameterID: maxPacketSizeParameterID:
if err := p.readNumericTransportParameter(r, paramID, int(paramLen)); err != nil { if err := p.readNumericTransportParameter(r, paramID, int(paramLen)); err != nil {
@@ -128,9 +128,9 @@ func (p *TransportParameters) readNumericTransportParameter(
p.InitialMaxStreamDataUni = protocol.ByteCount(val) p.InitialMaxStreamDataUni = protocol.ByteCount(val)
case initialMaxDataParameterID: case initialMaxDataParameterID:
p.InitialMaxData = protocol.ByteCount(val) p.InitialMaxData = protocol.ByteCount(val)
case initialMaxBidiStreamsParameterID: case initialMaxStreamsBidiParameterID:
p.MaxBidiStreams = val p.MaxBidiStreams = val
case initialMaxUniStreamsParameterID: case initialMaxStreamsUniParameterID:
p.MaxUniStreams = val p.MaxUniStreams = val
case idleTimeoutParameterID: case idleTimeoutParameterID:
p.IdleTimeout = utils.MaxDuration(protocol.MinRemoteIdleTimeout, time.Duration(val)*time.Second) p.IdleTimeout = utils.MaxDuration(protocol.MinRemoteIdleTimeout, time.Duration(val)*time.Second)
@@ -163,11 +163,11 @@ func (p *TransportParameters) marshal(b *bytes.Buffer) {
utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(uint64(p.InitialMaxData)))) utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(uint64(p.InitialMaxData))))
utils.WriteVarInt(b, uint64(p.InitialMaxData)) utils.WriteVarInt(b, uint64(p.InitialMaxData))
// initial_max_bidi_streams // initial_max_bidi_streams
utils.BigEndian.WriteUint16(b, uint16(initialMaxBidiStreamsParameterID)) utils.BigEndian.WriteUint16(b, uint16(initialMaxStreamsBidiParameterID))
utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(p.MaxBidiStreams))) utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(p.MaxBidiStreams)))
utils.WriteVarInt(b, p.MaxBidiStreams) utils.WriteVarInt(b, p.MaxBidiStreams)
// initial_max_uni_streams // initial_max_uni_streams
utils.BigEndian.WriteUint16(b, uint16(initialMaxUniStreamsParameterID)) utils.BigEndian.WriteUint16(b, uint16(initialMaxStreamsUniParameterID))
utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(p.MaxUniStreams))) utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(p.MaxUniStreams)))
utils.WriteVarInt(b, p.MaxUniStreams) utils.WriteVarInt(b, p.MaxUniStreams)
// idle_timeout // idle_timeout