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

change the idle timeout transport parameter to milliseconds

Browse Source
This commit is contained in:
Marten Seemann
2019-02-23 10:37:08 +08:00
parent 9f5b96f3be
commit 6c726ccba3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/handshake/transport_parameters.go
View File

@@ -153,7 +153,7 @@ func (p *TransportParameters) readNumericTransportParameter(
case initialMaxStreamsUniParameterID: 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.Millisecond)
case maxPacketSizeParameterID: case maxPacketSizeParameterID:
if val < 1200 { if val < 1200 {
return fmt.Errorf("invalid value for max_packet_size: %d (minimum 1200)", val) return fmt.Errorf("invalid value for max_packet_size: %d (minimum 1200)", val)
@@ -196,9 +196,10 @@ func (p *TransportParameters) marshal(b *bytes.Buffer) {
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
idleTimeout := uint64(p.IdleTimeout / time.Millisecond)
utils.BigEndian.WriteUint16(b, uint16(idleTimeoutParameterID)) utils.BigEndian.WriteUint16(b, uint16(idleTimeoutParameterID))
utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(uint64(p.IdleTimeout/time.Second)))) utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(idleTimeout)))
utils.WriteVarInt(b, uint64(p.IdleTimeout/time.Second)) utils.WriteVarInt(b, idleTimeout)
// max_packet_size // max_packet_size
utils.BigEndian.WriteUint16(b, uint16(maxPacketSizeParameterID)) utils.BigEndian.WriteUint16(b, uint16(maxPacketSizeParameterID))
utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(uint64(protocol.MaxReceivePacketSize)))) utils.BigEndian.WriteUint16(b, uint16(utils.VarIntLen(uint64(protocol.MaxReceivePacketSize))))