feat: support relay udp (Ehco1996#361)

wudi952777 · Aug 16, 2024 · 2f2331a · 2f2331a
1 parent 33207dc
commit 2f2331a
Show file tree

Hide file tree

Showing 38 changed files with 835 additions and 1,348 deletions.
diff --git a/examples/block.json b/examples/block.json
diff --git a/examples/cf-ws.json b/examples/cf-ws.json
diff --git a/examples/config.json b/examples/config.json
@@ -9,71 +9,41 @@
             "listen_type": "raw",
             "transport_type": "raw",
             "label": "relay1",
-            "tcp_remotes": ["0.0.0.0:5201"],
-            "udp_remotes": ["0.0.0.0:5201"]
+            "tcp_remotes": [
+                "0.0.0.0:5201"
+            ]
         },
         {
             "listen": "127.0.0.1:1235",
             "listen_type": "raw",
             "transport_type": "ws",
-            "tcp_remotes": ["ws://0.0.0.0:2443"],
-            "udp_remotes": ["0.0.0.0:5201"]
+            "tcp_remotes": [
+                "ws://0.0.0.0:2443"
+            ]
         },
         {
             "listen": "127.0.0.1:1236",
             "listen_type": "raw",
             "transport_type": "wss",
-            "tcp_remotes": ["wss://0.0.0.0:3443"],
-            "udp_remotes": ["0.0.0.0:5201"]
-        },
-        {
-            "listen": "127.0.0.1:1237",
-            "listen_type": "raw",
-            "transport_type": "mwss",
-            "tcp_remotes": ["wss://0.0.0.0:4443"],
-            "udp_remotes": ["0.0.0.0:5201"]
-        },
-        {
-            "listen": "127.0.0.1:1238",
-            "listen_type": "raw",
-            "transport_type": "mtcp",
-            "tcp_remotes": ["0.0.0.0:4444"],
-            "udp_remotes": ["0.0.0.0:5201"]
+            "tcp_remotes": [
+                "wss://0.0.0.0:3443"
+            ]
         },
         {
             "listen": "127.0.0.1:2443",
             "listen_type": "ws",
             "transport_type": "raw",
-            "tcp_remotes": ["0.0.0.0:5201"],
-            "udp_remotes": []
+            "tcp_remotes": [
+                "0.0.0.0:5201"
+            ]
         },
         {
             "listen": "127.0.0.1:3443",
             "listen_type": "wss",
             "transport_type": "raw",
-            "tcp_remotes": ["0.0.0.0:5201"],
-            "udp_remotes": []
-        },
-        {
-            "listen": "127.0.0.1:4443",
-            "listen_type": "mwss",
-            "transport_type": "raw",
-            "tcp_remotes": ["0.0.0.0:5201"],
-            "udp_remotes": []
-        },
-        {
-            "listen": "127.0.0.1:4444",
-            "listen_type": "mtcp",
-            "transport_type": "raw",
-            "tcp_remotes": ["0.0.0.0:5201"],
-            "udp_remotes": []
-        },
-        {
-            "label": "ping_test",
-            "listen": "127.0.0.1:8888",
-            "listen_type": "raw",
-            "transport_type": "raw",
-            "tcp_remotes": ["8.8.8.8:5201", "google.com:5201"]
+            "tcp_remotes": [
+                "0.0.0.0:5201"
+            ]
         }
     ]
-}
+}
diff --git a/examples/mptcp.json b/examples/mptcp.json
diff --git a/examples/mws.json b/examples/mws.json
diff --git a/examples/speed_limit.json b/examples/speed_limit.json
diff --git a/examples/sub.json b/examples/sub.json
diff --git a/examples/web.json b/examples/web.json
diff --git a/examples/with_ping.json b/examples/with_ping.json
diff --git a/examples/ws_config.json b/examples/ws_config.json
diff --git a/internal/cli/config.go b/internal/cli/config.go
@@ -9,7 +9,6 @@ import (
 	"github.com/Ehco1996/ehco/internal/metrics"
 	"github.com/Ehco1996/ehco/internal/relay"
 	"github.com/Ehco1996/ehco/internal/relay/conf"
-	"github.com/Ehco1996/ehco/internal/tls"
 	"github.com/Ehco1996/ehco/internal/web"
 	"github.com/Ehco1996/ehco/pkg/buffer"
 	"github.com/Ehco1996/ehco/pkg/log"
@@ -42,24 +41,11 @@ func loadConfig() (cfg *config.Config, err error) {
 		if TCPRemoteAddr != "" {
 			cfg.RelayConfigs[0].TCPRemotes = []string{TCPRemoteAddr}
 		}
-		if UDPRemoteAddr != "" {
-			cfg.RelayConfigs[0].UDPRemotes = []string{UDPRemoteAddr}
-		}
 		if err := cfg.Adjust(); err != nil {
 			return nil, err
 		}
 	}
 
-	// init tls when need
-	for _, cfg := range cfg.RelayConfigs {
-		if cfg.ListenType == constant.RelayTypeWSS || cfg.ListenType == constant.RelayTypeMWSS ||
-			cfg.TransportType == constant.RelayTypeWSS || cfg.TransportType == constant.RelayTypeMWSS {
-			if err := tls.InitTlsCfg(); err != nil {
-				return nil, err
-			}
-			break
-		}
-	}
 	return cfg, nil
 }
 

diff --git a/internal/cli/flags.go b/internal/cli/flags.go
@@ -10,7 +10,6 @@ var (
 	LocalAddr            string
 	ListenType           constant.RelayType
 	TCPRemoteAddr        string
-	UDPRemoteAddr        string
 	TransportType        constant.RelayType
 	ConfigPath           string
 	WebPort              int
@@ -39,16 +38,10 @@ var RootFlags = []cli.Flag{
 	},
 	&cli.StringFlag{
 		Name:        "r,remote",
-		Usage:       "TCP 转发地址，例如 0.0.0.0:5201，通过 ws 隧道转发时应为 ws://0.0.0.0:2443",
+		Usage:       "转发地址，例如 0.0.0.0:5201，通过 ws 隧道转发时应为 ws://0.0.0.0:2443",
 		EnvVars:     []string{"EHCO_REMOTE_ADDR"},
 		Destination: &TCPRemoteAddr,
 	},
-	&cli.StringFlag{
-		Name:        "ur,udp_remote",
-		Usage:       "UDP 转发地址，例如 0.0.0.0:1234",
-		EnvVars:     []string{"EHCO_UDP_REMOTE_ADDR"},
-		Destination: &UDPRemoteAddr,
-	},
 	&cli.StringFlag{
 		Name:        "tt,transport_type",
 		Value:       "raw",

diff --git a/internal/cmgr/cmgr.go b/internal/cmgr/cmgr.go
@@ -16,7 +16,8 @@ const (
 	ConnectionTypeClosed = "closed"
 )
 
-// connection manager interface
+// connection manager interface/
+// TODO support closed connection
 type Cmgr interface {
 	ListConnections(connType string, page, pageSize int) []conn.RelayConn
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -7,9 +7,10 @@ import (
 	"strings"
 	"time"
 
-	myhttp "github.com/Ehco1996/ehco/pkg/http"
-
+	"github.com/Ehco1996/ehco/internal/constant"
 	"github.com/Ehco1996/ehco/internal/relay/conf"
+	"github.com/Ehco1996/ehco/internal/tls"
+	myhttp "github.com/Ehco1996/ehco/pkg/http"
 	"github.com/Ehco1996/ehco/pkg/sub"
 	xConf "github.com/xtls/xray-core/infra/conf"
 	"go.uber.org/zap"
@@ -121,6 +122,15 @@ func (c *Config) Adjust() error {
 		}
 		labelMap[r.Label] = struct{}{}
 	}
+	// init tls when need
+	for _, r := range c.RelayConfigs {
+		if r.ListenType == constant.RelayTypeWSS {
+			if err := tls.InitTlsCfg(); err != nil {
+				return err
+			}
+			break
+		}
+	}
 	return nil
 }