feat: add a query parameter to control whether UDP functionality is disabled

Author: yosebyte

internal/client.go

@@ -62,9 +62,9 @@ func NewClient(parsedURL *url.URL, logger *logs.Logger) (*Client, error) {
 // Run 管理客户端生命周期
 func (c *Client) Run() {
 	logInfo := func(prefix string) {
-		c.logger.Info("%v: client://%v@%v/%v?min=%v&mode=%v&read=%v&rate=%v&slot=%v&proxy=%v",
+		c.logger.Info("%v: client://%v@%v/%v?min=%v&mode=%v&read=%v&rate=%v&slot=%v&proxy=%v&noudp=%v",
 			prefix, c.tunnelKey, c.tunnelTCPAddr, c.getTargetAddrsString(),
-			c.minPoolCapacity, c.runMode, c.readTimeout, c.rateLimit/125000, c.slotLimit, c.proxyProtocol)
+			c.minPoolCapacity, c.runMode, c.readTimeout, c.rateLimit/125000, c.slotLimit, c.proxyProtocol, c.disableUDP)
 	}
 	logInfo("Client started")
 
@@ -83,7 +83,7 @@ func (c *Client) Run() {
 					return
 				case <-time.After(serviceCooldown):
 				}
-				logInfo("Client restarting")
+				logInfo("Client restart")
 			}
 		}
 	}()

internal/common.go

@@ -47,6 +47,7 @@ type Common struct {
 	minPoolCapacity  int                // 最小池容量
 	maxPoolCapacity  int                // 最大池容量
 	proxyProtocol    string             // 代理协议
+	disableUDP       string             // 禁用UDP
 	rateLimit        int                // 速率限制
 	rateLimiter      *conn.RateLimiter  // 全局限速器
 	readTimeout      time.Duration      // 读取超时
@@ -98,6 +99,7 @@ const (
 	defaultRateLimit     = 0               // 默认速率限制
 	defaultSlotLimit     = 65536           // 默认槽位限制
 	defaultProxyProtocol = "0"             // 默认代理协议
+	defaultUDPStrategy   = "0"             // 默认UDP策略
 )
 
 // getTCPBuffer 获取TCP缓冲区
@@ -402,6 +404,15 @@ func (c *Common) getProxyProtocol(parsedURL *url.URL) {
 	}
 }
 
+// getUDPStrategy 获取UDP策略
+func (c *Common) getUDPStrategy(parsedURL *url.URL) {
+	if udpStrategy := parsedURL.Query().Get("noudp"); udpStrategy != "" {
+		c.disableUDP = udpStrategy
+	} else {
+		c.disableUDP = defaultUDPStrategy
+	}
+}
+
 // initConfig 初始化配置
 func (c *Common) initConfig(parsedURL *url.URL) error {
 	if err := c.getAddress(parsedURL); err != nil {
@@ -415,6 +426,7 @@ func (c *Common) initConfig(parsedURL *url.URL) error {
 	c.getRateLimit(parsedURL)
 	c.getSlotLimit(parsedURL)
 	c.getProxyProtocol(parsedURL)
+	c.getUDPStrategy(parsedURL)
 
 	return nil
 }
@@ -487,7 +499,7 @@ func (c *Common) initTunnelListener() error {
 	}
 
 	// 初始化隧道UDP监听器
-	if c.tunnelUDPAddr != nil {
+	if c.tunnelUDPAddr != nil && c.disableUDP != "1" {
 		tunnelUDPConn, err := net.ListenUDP("udp", c.tunnelUDPAddr)
 		if err != nil {
 			return fmt.Errorf("initTunnelListener: listenUDP failed: %w", err)
@@ -514,7 +526,7 @@ func (c *Common) initTargetListener() error {
 	}
 
 	// 初始化目标UDP监听器
-	if len(c.targetUDPAddrs) > 0 {
+	if len(c.targetUDPAddrs) > 0 && c.disableUDP != "1" {
 		targetUDPConn, err := net.ListenUDP("udp", c.targetUDPAddrs[0])
 		if err != nil {
 			return fmt.Errorf("initTargetListener: listenUDP failed: %w", err)
@@ -743,8 +755,12 @@ func (c *Common) commonLoop() {
 	for c.ctx.Err() == nil {
 		// 等待连接池准备就绪
 		if c.tunnelPool.Ready() {
-			go c.commonTCPLoop()
-			go c.commonUDPLoop()
+			if c.targetListener != nil {
+				go c.commonTCPLoop()
+			}
+			if c.targetUDPConn != nil {
+				go c.commonUDPLoop()
+			}
 			return
 		}
 
@@ -1014,9 +1030,13 @@ func (c *Common) commonOnce() error {
 			// 处理信号
 			switch signalURL.Fragment {
 			case "1": // TCP
-				go c.commonTCPOnce(signalURL)
+				if len(c.targetTCPAddrs) > 0 {
+					go c.commonTCPOnce(signalURL)
+				}
 			case "2": // UDP
-				go c.commonUDPOnce(signalURL)
+				if c.disableUDP != "1" {
+					go c.commonUDPOnce(signalURL)
+				}
 			case "c": // 连接池清理
 				go func() {
 					c.tunnelPool.Clean()

internal/master.go

@@ -1775,7 +1775,7 @@ func (m *Master) generateConfigURL(instance *Instance) string {
 	// 根据实例类型设置默认参数
 	switch instance.Type {
 	case "client":
-		// client参数: min, mode, read, rate, slot, proxy
+		// client参数: min, mode, read, rate, slot, proxy, noudp
 		if query.Get("min") == "" {
 			query.Set("min", strconv.Itoa(defaultMinPool))
 		}
@@ -1794,8 +1794,11 @@ func (m *Master) generateConfigURL(instance *Instance) string {
 		if query.Get("proxy") == "" {
 			query.Set("proxy", defaultProxyProtocol)
 		}
+		if query.Get("noudp") == "" {
+			query.Set("noudp", defaultUDPStrategy)
+		}
 	case "server":
-		// server参数: max, mode, read, rate, slot, proxy
+		// server参数: max, mode, read, rate, slot, proxy, noudp
 		if query.Get("max") == "" {
 			query.Set("max", strconv.Itoa(defaultMaxPool))
 		}
@@ -1814,6 +1817,9 @@ func (m *Master) generateConfigURL(instance *Instance) string {
 		if query.Get("proxy") == "" {
 			query.Set("proxy", defaultProxyProtocol)
 		}
+		if query.Get("noudp") == "" {
+			query.Set("noudp", defaultUDPStrategy)
+		}
 	}
 
 	parsedURL.RawQuery = query.Encode()

internal/server.go

@@ -64,9 +64,9 @@ func NewServer(parsedURL *url.URL, tlsCode string, tlsConfig *tls.Config, logger
 // Run 管理服务端生命周期
 func (s *Server) Run() {
 	logInfo := func(prefix string) {
-		s.logger.Info("%v: server://%v@%v/%v?max=%v&mode=%v&read=%v&rate=%v&slot=%v&proxy=%v",
+		s.logger.Info("%v: server://%v@%v/%v?max=%v&mode=%v&read=%v&rate=%v&slot=%v&proxy=%v&noudp=%v",
 			prefix, s.tunnelKey, s.tunnelTCPAddr, s.getTargetAddrsString(),
-			s.maxPoolCapacity, s.runMode, s.readTimeout, s.rateLimit/125000, s.slotLimit, s.proxyProtocol)
+			s.maxPoolCapacity, s.runMode, s.readTimeout, s.rateLimit/125000, s.slotLimit, s.proxyProtocol, s.disableUDP)
 	}
 	logInfo("Server started")
 
@@ -85,7 +85,7 @@ func (s *Server) Run() {
 					return
 				case <-time.After(serviceCooldown):
 				}
-				logInfo("Server restarting")
+				logInfo("Server restart")
 			}
 		}
 	}()