Merge pull request #218 from HyNetwork/wip-disable-pmtud

Disable PMTUD

cmd/client.go

@@ -67,7 +67,7 @@ func client(config *clientConfig) {
 		InitialConnectionReceiveWindow: config.ReceiveWindow,
 		MaxConnectionReceiveWindow:     config.ReceiveWindow,
 		KeepAlive:                      true,
-		DisablePathMTUDiscovery:        config.DisableMTUDiscovery,
+		DisablePathMTUDiscovery:        true, // Ref: https://github.com/lucas-clemente/quic-go/issues/3327
 		EnableDatagrams:                true,
 	}
 	if config.ReceiveWindowConn == 0 {

cmd/config.go

@@ -49,7 +49,6 @@ type serverConfig struct {
 	ReceiveWindowConn   uint64 `json:"recv_window_conn"`
 	ReceiveWindowClient uint64 `json:"recv_window_client"`
 	MaxConnClient       int    `json:"max_conn_client"`
-	DisableMTUDiscovery bool   `json:"disable_mtu_discovery"`
 	IPv6Only            bool   `json:"ipv6_only"`
 	Resolver            string `json:"resolver"`
 }
@@ -139,19 +138,18 @@ type clientConfig struct {
 		Listen  string `json:"listen"`
 		Timeout int    `json:"timeout"`
 	} `json:"tproxy_udp"`
-	ACL                 string `json:"acl"`
-	MMDB                string `json:"mmdb"`
-	Obfs                string `json:"obfs"`
-	Auth                []byte `json:"auth"`
-	AuthString          string `json:"auth_str"`
-	ALPN                string `json:"alpn"`
-	ServerName          string `json:"server_name"`
-	Insecure            bool   `json:"insecure"`
-	CustomCA            string `json:"ca"`
-	ReceiveWindowConn   uint64 `json:"recv_window_conn"`
-	ReceiveWindow       uint64 `json:"recv_window"`
-	DisableMTUDiscovery bool   `json:"disable_mtu_discovery"`
-	Resolver            string `json:"resolver"`
+	ACL               string `json:"acl"`
+	MMDB              string `json:"mmdb"`
+	Obfs              string `json:"obfs"`
+	Auth              []byte `json:"auth"`
+	AuthString        string `json:"auth_str"`
+	ALPN              string `json:"alpn"`
+	ServerName        string `json:"server_name"`
+	Insecure          bool   `json:"insecure"`
+	CustomCA          string `json:"ca"`
+	ReceiveWindowConn uint64 `json:"recv_window_conn"`
+	ReceiveWindow     uint64 `json:"recv_window"`
+	Resolver          string `json:"resolver"`
 }
 
 func (c *clientConfig) Check() error {

cmd/server.go

@@ -70,7 +70,7 @@ func server(config *serverConfig) {
 		MaxConnectionReceiveWindow:     config.ReceiveWindowClient,
 		MaxIncomingStreams:             int64(config.MaxConnClient),
 		KeepAlive:                      true,
-		DisablePathMTUDiscovery:        config.DisableMTUDiscovery,
+		DisablePathMTUDiscovery:        true, // Ref: https://github.com/lucas-clemente/quic-go/issues/3327
 		EnableDatagrams:                true,
 	}
 	if config.ReceiveWindowConn == 0 {

pkg/congestion/brutal.go

@@ -6,6 +6,8 @@ import (
 )
 
 const (
+	initMaxDatagramSize = 1252
+
 	pktInfoSlotCount = 4
 	minSampleCount   = 50
 	minAckRate       = 0.75
@@ -28,7 +30,8 @@ type pktInfo struct {
 
 func NewBrutalSender(bps congestion.ByteCount) *BrutalSender {
 	bs := &BrutalSender{
-		bps: bps,
+		bps:             bps,
+		maxDatagramSize: initMaxDatagramSize,
 	}
 	bs.pacer = newPacer(func() congestion.ByteCount {
 		return congestion.ByteCount(float64(bs.bps) / bs.getAckRate())

pkg/congestion/pacer.go

@@ -7,9 +7,8 @@ import (
 )
 
 const (
-	initMaxDatagramSize = 1252
-	maxBurstPackets     = 10
-	minPacingDelay      = time.Millisecond
+	maxBurstPackets = 10
+	minPacingDelay  = time.Millisecond
 )
 
 // The pacer implements a token bucket pacing algorithm.