remove superfluous SmuxConfigParams

Author: xtaci

client/main.go

@@ -475,13 +475,13 @@ func createConn(config *Config, block kcp.BlockCrypt) (*smux.Session, error) {
 		log.Println("SetWriteBuffer:", err)
 	}
 	log.Println("smux version:", config.SmuxVer, "on connection:", kcpconn.LocalAddr(), "->", kcpconn.RemoteAddr())
-	smuxConfig, err := std.BuildSmuxConfig(std.SmuxConfigParams{
-		Version:          config.SmuxVer,
-		MaxReceiveBuffer: config.SmuxBuf,
-		MaxStreamBuffer:  config.StreamBuf,
-		MaxFrameSize:     config.FrameSize,
-		KeepAliveSeconds: config.KeepAlive,
-	})
+	smuxConfig, err := std.BuildSmuxConfig(
+		config.SmuxVer,
+		config.SmuxBuf,
+		config.StreamBuf,
+		config.FrameSize,
+		config.KeepAlive,
+	)
 	if err != nil {
 		log.Fatalf("%+v", err)
 	}

server/main.go

@@ -451,13 +451,13 @@ func handleMux(_Q_ *qpp.QuantumPermutationPad, conn net.Conn, config *Config) {
 	}
 	log.Println("smux version:", config.SmuxVer, "on connection:", conn.LocalAddr(), "->", conn.RemoteAddr())
 
-	smuxConfig, err := std.BuildSmuxConfig(std.SmuxConfigParams{
-		Version:          config.SmuxVer,
-		MaxReceiveBuffer: config.SmuxBuf,
-		MaxStreamBuffer:  config.StreamBuf,
-		MaxFrameSize:     config.FrameSize,
-		KeepAliveSeconds: config.KeepAlive,
-	})
+	smuxConfig, err := std.BuildSmuxConfig(
+		config.SmuxVer,
+		config.SmuxBuf,
+		config.StreamBuf,
+		config.FrameSize,
+		config.KeepAlive,
+	)
 	if err != nil {
 		log.Println(err)
 		conn.Close()

std/smuxcfg.go

@@ -28,24 +28,15 @@ import (
 	"github.com/xtaci/smux"
 )
 
-// SmuxConfigParams organizes the dials that shape a smux session.
-type SmuxConfigParams struct {
-	Version          int
-	MaxReceiveBuffer int
-	MaxStreamBuffer  int
-	MaxFrameSize     int
-	KeepAliveSeconds int
-}
-
 // BuildSmuxConfig constructs a smux.Config from CLI parameters and verifies the
 // result. Callers can log or wrap the returned error for better diagnostics.
-func BuildSmuxConfig(p SmuxConfigParams) (*smux.Config, error) {
+func BuildSmuxConfig(version, maxReceiveBuffer, maxStreamBuffer, maxFrameSize, keepAliveSeconds int) (*smux.Config, error) {
 	cfg := smux.DefaultConfig()
-	cfg.Version = p.Version
-	cfg.MaxReceiveBuffer = p.MaxReceiveBuffer
-	cfg.MaxStreamBuffer = p.MaxStreamBuffer
-	cfg.MaxFrameSize = p.MaxFrameSize
-	cfg.KeepAliveInterval = time.Duration(p.KeepAliveSeconds) * time.Second
+	cfg.Version = version
+	cfg.MaxReceiveBuffer = maxReceiveBuffer
+	cfg.MaxStreamBuffer = maxStreamBuffer
+	cfg.MaxFrameSize = maxFrameSize
+	cfg.KeepAliveInterval = time.Duration(keepAliveSeconds) * time.Second
 
 	return cfg, smux.VerifyConfig(cfg)
 }