reorder some parameters

XTLS · Sep 18, 2024 · 3f63052 · 3f63052
1 parent e5ca940
commit 3f63052
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
@@ -235,8 +235,8 @@ type SplitHTTPConfig struct {
 }
 
 type Xmux struct {
-	MaxConnections *Int32Range `json:"maxConnections"`
 	MaxConcurrency *Int32Range `json:"maxConcurrency"`
+	MaxConnections *Int32Range `json:"maxConnections"`
 	CMaxReuseTimes *Int32Range `json:"cMaxReuseTimes"`
 	CMaxLifetimeMs *Int32Range `json:"cMaxLifetimeMs"`
 }
@@ -269,8 +269,8 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
 
 	// Multiplexing config
 	muxProtobuf := splithttp.Multiplexing{
-		MaxConnections: splithttpNewRandRangeConfig(c.Xmux.MaxConnections),
 		MaxConcurrency: splithttpNewRandRangeConfig(c.Xmux.MaxConcurrency),
+		MaxConnections: splithttpNewRandRangeConfig(c.Xmux.MaxConnections),
 		CMaxReuseTimes: splithttpNewRandRangeConfig(c.Xmux.CMaxReuseTimes),
 		CMaxLifetimeMs: splithttpNewRandRangeConfig(c.Xmux.CMaxLifetimeMs),
 	}

diff --git a/transport/internet/splithttp/config.pb.go b/transport/internet/splithttp/config.pb.go
diff --git a/transport/internet/splithttp/config.proto b/transport/internet/splithttp/config.proto
@@ -24,8 +24,8 @@ message RandRangeConfig {
 }
 
 message Multiplexing {
-  RandRangeConfig maxConnections = 1;
   RandRangeConfig maxConcurrency = 2;
+  RandRangeConfig maxConnections = 1;
   RandRangeConfig cMaxReuseTimes = 3;
   RandRangeConfig cMaxLifetimeMs = 4;
 }