mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 12:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2432 from lucas-clemente/max-udp-payload-size

Browse source 
rename the max_packet_size transport parameter to max_udp_payload_size
This commit is contained in:
Marten Seemann 2020-03-23 16:21:03 +07:00 • committed by GitHub
commit 9dec939784
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/wire/transport_parameter_test.go
View file

@ -107,7 +107,7 @@ var _ = Describe("Transport Parameters", func() {
It("errors when the max_packet_size is too small", func() { It("errors when the max_packet_size is too small", func() {
b := &bytes.Buffer{} b := &bytes.Buffer{}
utils.WriteVarInt(b, uint64(maxPacketSizeParameterID)) utils.WriteVarInt(b, uint64(maxUDPPayloadSizeParameterID))
utils.WriteVarInt(b, uint64(utils.VarIntLen(1199))) utils.WriteVarInt(b, uint64(utils.VarIntLen(1199)))
utils.WriteVarInt(b, 1199) utils.WriteVarInt(b, 1199)
p := &TransportParameters{} p := &TransportParameters{}

16
internal/wire/transport_parameters.go
View file

@ -28,7 +28,7 @@ const (
originalConnectionIDParameterID transportParameterID = 0x0 originalConnectionIDParameterID transportParameterID = 0x0
maxIdleTimeoutParameterID transportParameterID = 0x1 maxIdleTimeoutParameterID transportParameterID = 0x1
statelessResetTokenParameterID transportParameterID = 0x2 statelessResetTokenParameterID transportParameterID = 0x2
maxPacketSizeParameterID transportParameterID = 0x3 maxUDPPayloadSizeParameterID transportParameterID = 0x3
initialMaxDataParameterID transportParameterID = 0x4 initialMaxDataParameterID transportParameterID = 0x4
initialMaxStreamDataBidiLocalParameterID transportParameterID = 0x5 initialMaxStreamDataBidiLocalParameterID transportParameterID = 0x5
initialMaxStreamDataBidiRemoteParameterID transportParameterID = 0x6 initialMaxStreamDataBidiRemoteParameterID transportParameterID = 0x6
@ -64,7 +64,7 @@ type TransportParameters struct {
DisableActiveMigration bool DisableActiveMigration bool
MaxPacketSize protocol.ByteCount MaxUDPPayloadSize protocol.ByteCount
MaxUniStreamNum protocol.StreamNum MaxUniStreamNum protocol.StreamNum
MaxBidiStreamNum protocol.StreamNum MaxBidiStreamNum protocol.StreamNum
@ -123,7 +123,7 @@ func (p *TransportParameters) unmarshal(data []byte, sentBy protocol.Perspective
initialMaxStreamsBidiParameterID, initialMaxStreamsBidiParameterID,
initialMaxStreamsUniParameterID, initialMaxStreamsUniParameterID,
maxIdleTimeoutParameterID, maxIdleTimeoutParameterID,
maxPacketSizeParameterID, maxUDPPayloadSizeParameterID,
activeConnectionIDLimitParameterID: activeConnectionIDLimitParameterID:
if err := p.readNumericTransportParameter(r, paramID, int(paramLen)); err != nil { if err := p.readNumericTransportParameter(r, paramID, int(paramLen)); err != nil {
return err return err
@ -172,8 +172,8 @@ func (p *TransportParameters) unmarshal(data []byte, sentBy protocol.Perspective
if !readMaxAckDelay { if !readMaxAckDelay {
p.MaxAckDelay = protocol.DefaultMaxAckDelay p.MaxAckDelay = protocol.DefaultMaxAckDelay
} }
if p.MaxPacketSize == 0 { if p.MaxUDPPayloadSize == 0 {
p.MaxPacketSize = protocol.MaxByteCount p.MaxUDPPayloadSize = protocol.MaxByteCount
} }
// check that every transport parameter was sent at most once // check that every transport parameter was sent at most once
@ -257,11 +257,11 @@ func (p *TransportParameters) readNumericTransportParameter(
p.MaxUniStreamNum = protocol.StreamNum(val) p.MaxUniStreamNum = protocol.StreamNum(val)
case maxIdleTimeoutParameterID: case maxIdleTimeoutParameterID:
p.MaxIdleTimeout = utils.MaxDuration(protocol.MinRemoteIdleTimeout, time.Duration(val)*time.Millisecond) p.MaxIdleTimeout = utils.MaxDuration(protocol.MinRemoteIdleTimeout, time.Duration(val)*time.Millisecond)
case maxPacketSizeParameterID: case maxUDPPayloadSizeParameterID:
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)
} }
p.MaxPacketSize = protocol.ByteCount(val) p.MaxUDPPayloadSize = protocol.ByteCount(val)
case ackDelayExponentParameterID: case ackDelayExponentParameterID:
if val > protocol.MaxAckDelayExponent { if val > protocol.MaxAckDelayExponent {
return fmt.Errorf("invalid value for ack_delay_exponent: %d (maximum %d)", val, protocol.MaxAckDelayExponent) return fmt.Errorf("invalid value for ack_delay_exponent: %d (maximum %d)", val, protocol.MaxAckDelayExponent)
@ -311,7 +311,7 @@ func (p *TransportParameters) Marshal() []byte {
// idle_timeout // idle_timeout
p.marshalVarintParam(b, maxIdleTimeoutParameterID, uint64(p.MaxIdleTimeout/time.Millisecond)) p.marshalVarintParam(b, maxIdleTimeoutParameterID, uint64(p.MaxIdleTimeout/time.Millisecond))
// max_packet_size // max_packet_size
p.marshalVarintParam(b, maxPacketSizeParameterID, uint64(protocol.MaxReceivePacketSize)) p.marshalVarintParam(b, maxUDPPayloadSizeParameterID, uint64(protocol.MaxReceivePacketSize))
// max_ack_delay // max_ack_delay
// Only send it if is different from the default value. // Only send it if is different from the default value.
if p.MaxAckDelay != protocol.DefaultMaxAckDelay { if p.MaxAckDelay != protocol.DefaultMaxAckDelay {

4
packet_packer.go
View file

@ -739,7 +739,7 @@ func (p *packetPacker) SetToken(token []byte) {
} }
func (p *packetPacker) HandleTransportParameters(params *wire.TransportParameters) { func (p *packetPacker) HandleTransportParameters(params *wire.TransportParameters) {
if params.MaxPacketSize != 0 { if params.MaxUDPPayloadSize != 0 {
p.maxPacketSize = utils.MinByteCount(p.maxPacketSize, params.MaxPacketSize) p.maxPacketSize = utils.MinByteCount(p.maxPacketSize, params.MaxUDPPayloadSize)
} }
} }

4
packet_packer_test.go
View file

@ -732,7 +732,7 @@ var _ = Describe("Packet packer", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
// now reduce the maxPacketSize // now reduce the maxPacketSize
packer.HandleTransportParameters(&wire.TransportParameters{ packer.HandleTransportParameters(&wire.TransportParameters{
MaxPacketSize: maxPacketSize - 10, MaxUDPPayloadSize: maxPacketSize - 10,
}) })
framer.EXPECT().AppendControlFrames(gomock.Any(), gomock.Any()).Do(func(_ []ackhandler.Frame, maxLen protocol.ByteCount) ([]ackhandler.Frame, protocol.ByteCount) { framer.EXPECT().AppendControlFrames(gomock.Any(), gomock.Any()).Do(func(_ []ackhandler.Frame, maxLen protocol.ByteCount) ([]ackhandler.Frame, protocol.ByteCount) {
Expect(maxLen).To(Equal(initialMaxPacketSize - 10)) Expect(maxLen).To(Equal(initialMaxPacketSize - 10))
@ -757,7 +757,7 @@ var _ = Describe("Packet packer", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
// now try to increase the maxPacketSize // now try to increase the maxPacketSize
packer.HandleTransportParameters(&wire.TransportParameters{ packer.HandleTransportParameters(&wire.TransportParameters{
MaxPacketSize: maxPacketSize + 10, MaxUDPPayloadSize: maxPacketSize + 10,
}) })
framer.EXPECT().AppendControlFrames(gomock.Any(), gomock.Any()).Do(func(_ []ackhandler.Frame, maxLen protocol.ByteCount) ([]ackhandler.Frame, protocol.ByteCount) { framer.EXPECT().AppendControlFrames(gomock.Any(), gomock.Any()).Do(func(_ []ackhandler.Frame, maxLen protocol.ByteCount) ([]ackhandler.Frame, protocol.ByteCount) {
Expect(maxLen).To(Equal(initialMaxPacketSize)) Expect(maxLen).To(Equal(initialMaxPacketSize))

4
qlog/event.go
View file

@ -277,7 +277,7 @@ type eventTransportParameters struct {
StatelessResetToken *[16]byte StatelessResetToken *[16]byte
DisableActiveMigration bool DisableActiveMigration bool
MaxIdleTimeout time.Duration MaxIdleTimeout time.Duration
MaxPacketSize protocol.ByteCount MaxUDPPayloadSize protocol.ByteCount
AckDelayExponent uint8 AckDelayExponent uint8
MaxAckDelay time.Duration MaxAckDelay time.Duration
ActiveConnectionIDLimit uint64 ActiveConnectionIDLimit uint64
@ -306,7 +306,7 @@ func (e eventTransportParameters) MarshalJSONObject(enc *gojay.Encoder) {
} }
enc.BoolKey("disable_active_migration", e.DisableActiveMigration) enc.BoolKey("disable_active_migration", e.DisableActiveMigration)
enc.FloatKeyOmitEmpty("max_idle_timeout", milliseconds(e.MaxIdleTimeout)) enc.FloatKeyOmitEmpty("max_idle_timeout", milliseconds(e.MaxIdleTimeout))
enc.Uint64KeyNullEmpty("max_packet_size", uint64(e.MaxPacketSize)) enc.Uint64KeyNullEmpty("max_udp_payload_size", uint64(e.MaxUDPPayloadSize))
enc.Uint8KeyOmitEmpty("ack_delay_exponent", e.AckDelayExponent) enc.Uint8KeyOmitEmpty("ack_delay_exponent", e.AckDelayExponent)
enc.FloatKeyOmitEmpty("max_ack_delay", milliseconds(e.MaxAckDelay)) enc.FloatKeyOmitEmpty("max_ack_delay", milliseconds(e.MaxAckDelay))
enc.Uint64KeyOmitEmpty("active_connection_id_limit", e.ActiveConnectionIDLimit) enc.Uint64KeyOmitEmpty("active_connection_id_limit", e.ActiveConnectionIDLimit)

2
qlog/qlog.go
View file

@ -149,7 +149,7 @@ func (t *tracer) recordTransportParameters(time time.Time, owner owner, tp *wire
StatelessResetToken: tp.StatelessResetToken, StatelessResetToken: tp.StatelessResetToken,
DisableActiveMigration: tp.DisableActiveMigration, DisableActiveMigration: tp.DisableActiveMigration,
MaxIdleTimeout: tp.MaxIdleTimeout, MaxIdleTimeout: tp.MaxIdleTimeout,
MaxPacketSize: tp.MaxPacketSize, MaxUDPPayloadSize: tp.MaxUDPPayloadSize,
AckDelayExponent: tp.AckDelayExponent, AckDelayExponent: tp.AckDelayExponent,
MaxAckDelay: tp.MaxAckDelay, MaxAckDelay: tp.MaxAckDelay,
ActiveConnectionIDLimit: tp.ActiveConnectionIDLimit, ActiveConnectionIDLimit: tp.ActiveConnectionIDLimit,

4
qlog/qlog_test.go
View file

@ -165,7 +165,7 @@ var _ = Describe("Tracer", func() {
MaxAckDelay: 123 * time.Millisecond, MaxAckDelay: 123 * time.Millisecond,
AckDelayExponent: 12, AckDelayExponent: 12,
DisableActiveMigration: true, DisableActiveMigration: true,
MaxPacketSize: 1234, MaxUDPPayloadSize: 1234,
MaxIdleTimeout: 321 * time.Millisecond, MaxIdleTimeout: 321 * time.Millisecond,
StatelessResetToken: &[16]byte{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00}, StatelessResetToken: &[16]byte{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00},
OriginalConnectionID: protocol.ConnectionID{0xde, 0xad, 0xc0, 0xde}, OriginalConnectionID: protocol.ConnectionID{0xde, 0xad, 0xc0, 0xde},
@ -180,7 +180,7 @@ var _ = Describe("Tracer", func() {
Expect(ev).To(HaveKeyWithValue("original_connection_id", "deadc0de")) Expect(ev).To(HaveKeyWithValue("original_connection_id", "deadc0de"))
Expect(ev).To(HaveKeyWithValue("stateless_reset_token", "112233445566778899aabbccddeeff00")) Expect(ev).To(HaveKeyWithValue("stateless_reset_token", "112233445566778899aabbccddeeff00"))
Expect(ev).To(HaveKeyWithValue("max_idle_timeout", float64(321))) Expect(ev).To(HaveKeyWithValue("max_idle_timeout", float64(321)))
Expect(ev).To(HaveKeyWithValue("max_packet_size", float64(1234))) Expect(ev).To(HaveKeyWithValue("max_udp_payload_size", float64(1234)))
Expect(ev).To(HaveKeyWithValue("ack_delay_exponent", float64(12))) Expect(ev).To(HaveKeyWithValue("ack_delay_exponent", float64(12)))
Expect(ev).To(HaveKeyWithValue("active_connection_id_limit", float64(7))) Expect(ev).To(HaveKeyWithValue("active_connection_id_limit", float64(7)))
Expect(ev).To(HaveKeyWithValue("initial_max_data", float64(4000))) Expect(ev).To(HaveKeyWithValue("initial_max_data", float64(4000)))

2
session_test.go
View file

@ -1436,7 +1436,7 @@ var _ = Describe("Session", func() {
InitialMaxData: 0x5000, InitialMaxData: 0x5000,
ActiveConnectionIDLimit: 3, ActiveConnectionIDLimit: 3,
// marshaling always sets it to this value // marshaling always sets it to this value
MaxPacketSize: protocol.MaxReceivePacketSize, MaxUDPPayloadSize: protocol.MaxReceivePacketSize,
} }
streamManager.EXPECT().UpdateLimits(params) streamManager.EXPECT().UpdateLimits(params)
packer.EXPECT().HandleTransportParameters(params) packer.EXPECT().HandleTransportParameters(params)