From eea0b1eacde2a427f8f280e481fd6d1d471e3599 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 23 Jan 2021 11:44:13 +0800 Subject: [PATCH] rename MaxPacketSizeIPv{4,6} to InitialPacketSizeIPv{4,6} --- internal/congestion/cubic_sender.go | 2 +- internal/protocol/params.go | 8 ++++---- internal/wire/extended_header_test.go | 6 +++--- packet_packer.go | 4 ++-- packet_packer_test.go | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/congestion/cubic_sender.go b/internal/congestion/cubic_sender.go index 7c5ee3b0..087cf929 100644 --- a/internal/congestion/cubic_sender.go +++ b/internal/congestion/cubic_sender.go @@ -11,7 +11,7 @@ import ( const ( // maxDatagramSize is the default maximum packet size used in the Linux TCP implementation. // Used in QUIC for congestion window computations in bytes. - maxDatagramSize = protocol.ByteCount(protocol.MaxPacketSizeIPv4) + maxDatagramSize = protocol.ByteCount(protocol.InitialPacketSizeIPv4) maxBurstBytes = 3 * maxDatagramSize renoBeta = 0.7 // Reno backoff factor. maxCongestionWindow = protocol.MaxCongestionWindowPackets * maxDatagramSize diff --git a/internal/protocol/params.go b/internal/protocol/params.go index 2f080320..852fe1ac 100644 --- a/internal/protocol/params.go +++ b/internal/protocol/params.go @@ -5,11 +5,11 @@ import "time" // DesiredReceiveBufferSize is the kernel UDP receive buffer size that we'd like to use. const DesiredReceiveBufferSize = (1 << 20) * 2 // 2 MB -// MaxPacketSizeIPv4 is the maximum packet size that we use for sending IPv4 packets. -const MaxPacketSizeIPv4 = 1252 +// InitialPacketSizeIPv4 is the maximum packet size that we use for sending IPv4 packets. +const InitialPacketSizeIPv4 = 1252 -// MaxPacketSizeIPv6 is the maximum packet size that we use for sending IPv6 packets. -const MaxPacketSizeIPv6 = 1232 +// InitialPacketSizeIPv6 is the maximum packet size that we use for sending IPv6 packets. +const InitialPacketSizeIPv6 = 1232 // MaxCongestionWindowPackets is the maximum congestion window in packet. const MaxCongestionWindowPackets = 10000 diff --git a/internal/wire/extended_header_test.go b/internal/wire/extended_header_test.go index b9ed884f..d9c6369c 100644 --- a/internal/wire/extended_header_test.go +++ b/internal/wire/extended_header_test.go @@ -34,7 +34,7 @@ var _ = Describe("Header", func() { DestConnectionID: protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe}, SrcConnectionID: protocol.ConnectionID{0xde, 0xca, 0xfb, 0xad, 0x0, 0x0, 0x13, 0x37}, Version: 0x1020304, - Length: protocol.MaxPacketSizeIPv4, + Length: protocol.InitialPacketSizeIPv4, }, PacketNumber: 0xdecaf, PacketNumberLen: protocol.PacketNumberLen3, @@ -47,8 +47,8 @@ var _ = Describe("Header", func() { 0x8, // src connection ID length 0xde, 0xca, 0xfb, 0xad, 0x0, 0x0, 0x13, 0x37, // source connection ID } - expected = append(expected, encodeVarInt(protocol.MaxPacketSizeIPv4)...) // length - expected = append(expected, []byte{0xd, 0xec, 0xaf}...) // packet number + expected = append(expected, encodeVarInt(protocol.InitialPacketSizeIPv4)...) // length + expected = append(expected, []byte{0xd, 0xec, 0xaf}...) // packet number Expect(buf.Bytes()).To(Equal(expected)) }) diff --git a/packet_packer.go b/packet_packer.go index b1a2258f..6e248220 100644 --- a/packet_packer.go +++ b/packet_packer.go @@ -110,9 +110,9 @@ func getMaxPacketSize(addr net.Addr) protocol.ByteCount { // Use the minimum size of an Initial packet as the max packet size. if udpAddr, ok := addr.(*net.UDPAddr); ok { if utils.IsIPv4(udpAddr.IP) { - maxSize = protocol.MaxPacketSizeIPv4 + maxSize = protocol.InitialPacketSizeIPv4 } else { - maxSize = protocol.MaxPacketSizeIPv6 + maxSize = protocol.InitialPacketSizeIPv6 } } return maxSize diff --git a/packet_packer_test.go b/packet_packer_test.go index 8eac0145..516d2087 100644 --- a/packet_packer_test.go +++ b/packet_packer_test.go @@ -119,13 +119,13 @@ var _ = Describe("Packet packer", func() { It("uses the maximum IPv4 packet size, if the remote address is IPv4", func() { addr := &net.UDPAddr{IP: net.IPv4(11, 12, 13, 14), Port: 1337} - Expect(getMaxPacketSize(addr)).To(BeEquivalentTo(protocol.MaxPacketSizeIPv4)) + Expect(getMaxPacketSize(addr)).To(BeEquivalentTo(protocol.InitialPacketSizeIPv4)) }) It("uses the maximum IPv6 packet size, if the remote address is IPv6", func() { ip := net.ParseIP("2001:0db8:85a3:0000:0000:8a2e:0370:7334") addr := &net.UDPAddr{IP: ip, Port: 1337} - Expect(getMaxPacketSize(addr)).To(BeEquivalentTo(protocol.MaxPacketSizeIPv6)) + Expect(getMaxPacketSize(addr)).To(BeEquivalentTo(protocol.InitialPacketSizeIPv6)) }) })