添加多种模式

main.go

@@ -7,13 +7,14 @@ import (
 )
 
 var (
-	configPath = flag.String("config", "config.json", "配置文件路径")
-	tcpPort    = flag.Int("tcpport", 8284, "Socket连接或者监听的端口")
-	httpPort   = flag.Int("httpport", 8024, "当mode为server时为服务端监听端口，当为mode为client时为转发至本地客户端的端口")
-	rpMode     = flag.String("mode", "client", "启动模式，可选为client、server")
-	verifyKey  = flag.String("vkey", "", "验证密钥")
-	config     Config
-	err        error
+	configPath   = flag.String("config", "config.json", "配置文件路径")
+	tcpPort      = flag.Int("tcpport", 8284, "Socket连接或者监听的端口")
+	httpPort     = flag.Int("httpport", 8024, "当mode为server时为服务端监听端口，当为mode为client时为转发至本地客户端的端口")
+	rpMode       = flag.String("mode", "client", "启动模式，可选为client、server")
+	tunnelTarget = flag.String("target", "10.1.50.203:80", "tunnel模式远程目标")
+	verifyKey    = flag.String("vkey", "", "验证密钥")
+	config       Config
+	err          error
 )
 
 func main() {
@@ -29,7 +30,7 @@ func main() {
 		log.Println("客户端启动，连接：", config.Server.Ip, "， 端口：", config.Server.Tcp)
 		cli := NewRPClient(fmt.Sprintf("%s:%d", config.Server.Ip, config.Server.Tcp), config.Server.Num)
 		cli.Start()
-	} else if *rpMode == "server" {
+	} else {
 		if *verifyKey == "" {
 			log.Fatalln("必须输入一个验证的key")
 		}
@@ -39,11 +40,20 @@ func main() {
 		if *httpPort <= 0 || *httpPort >= 65536 {
 			log.Fatalln("请输入正确的http端口。")
 		}
-		log.Println("服务端启动，监听tcp服务端端口：", *tcpPort, "， http服务端端口：", *httpPort)
-		svr := NewRPServer(*tcpPort, *httpPort)
-		if err := svr.Start(); err != nil {
-			log.Fatalln(err)
+		log.Println("服务端启动，监听tcp服务端端口：", *tcpPort, "， 外部服务端端口：", *httpPort)
+		if *rpMode == "httpServer" {
+			svr := NewHttpModeServer(*tcpPort, *httpPort)
+			if err := svr.Start(); err != nil {
+				log.Fatalln(err)
+			}
+		} else if *rpMode == "tunnelServer" {
+			svr := NewTunnelModeServer(*tcpPort, *httpPort, *tunnelTarget)
+			if err := svr.Start(); err != nil {
+				log.Fatalln(err)
+			}
+		} else if *rpMode == "sock5Server" {
+			svr := NewSock5ModeServer(*tcpPort, *httpPort)
+			svr.Start()
 		}
-		defer svr.Close()
 	}
 }