添加 advertise_dtls_addr

doc/README.md

@@ -13,7 +13,7 @@
 > 需要展示主页的同学，可以在QQ群 直接联系我添加。
 
 | 昵称                 | 主页 / 联系方式                    |
-|-------------|------------------------------|
+|--------------------|------------------------------|
 | 代码 oo8             |                              |
 | 甘磊                 | https://github.com/ganlei333 |
 | Oo@                | https://github.com/chooop    |
@@ -51,6 +51,11 @@
 | 憨大叔                |                              |
 | 明月                 |                              |
 | Amis               |                              |
+| Blake              |                              |
+| 刘国华                |                              |
+| ZBW                |                              |
+| 全能互联网专家            |                              |
+| 广播.会议.音响.无纸化.物联网中控 |                              |
 
 
 

server/base/cfg.go

@@ -37,8 +37,9 @@ type ServerConfig struct {
 	Profile           string `json:"profile"`
 	ProfileName       string `json:"profile_name"`
 	ServerAddr        string `json:"server_addr"`
-	ServerDTLSAddr string `json:"server_dtls_addr"`
 	ServerDTLS        bool   `json:"server_dtls"`
+	ServerDTLSAddr    string `json:"server_dtls_addr"`
+	AdvertiseDTLSAddr string `json:"advertise_dtls_addr"`
 	AdminAddr         string `json:"admin_addr"`
 	ProxyProtocol     bool   `json:"proxy_protocol"`
 	DbType            string `json:"db_type"`
@@ -132,6 +133,10 @@ func initServerCfg() {
 		Cfg.JwtSecret = jwtSecret
 	}
 
+	if Cfg.AdvertiseDTLSAddr == "" {
+		Cfg.AdvertiseDTLSAddr = Cfg.ServerDTLSAddr
+	}
+
 	fmt.Printf("ServerCfg: %+v \n", Cfg)
 }
 

server/base/config.go

@@ -26,6 +26,7 @@ var configs = []config{
 	{Typ: cfgStr, Name: "server_addr", Usage: "TCP服务监听地址(任意端口)", ValStr: ":443"},
 	{Typ: cfgBool, Name: "server_dtls", Usage: "开启DTLS", ValBool: false},
 	{Typ: cfgStr, Name: "server_dtls_addr", Usage: "DTLS监听地址(任意端口)", ValStr: ":443"},
+	{Typ: cfgStr, Name: "advertise_dtls_addr", Usage: "DTLS对外映射端口(为空则与server_dtls_addr相同)", ValStr: ""},
 	{Typ: cfgStr, Name: "admin_addr", Usage: "后台服务监听地址", ValStr: ":8800"},
 	{Typ: cfgBool, Name: "proxy_protocol", Usage: "TCP代理协议", ValBool: false},
 	{Typ: cfgStr, Name: "db_type", Usage: "数据库类型 [sqlite3 mysql postgres]", ValStr: "sqlite3"},

server/conf/server-sample.toml

@@ -44,6 +44,8 @@ server_addr = ":443"
 server_dtls = false
 #UDP监听地址(任意端口)
 server_dtls_addr = ":443"
+#DTLS对外映射端口(为空则与server_dtls_addr相同)
+advertise_dtls_addr = ""
 #后台服务监听地址
 admin_addr = ":8800"
 #开启tcp proxy protocol协议

server/handler/link_tunnel.go

@@ -87,8 +87,8 @@ func LinkTunnel(w http.ResponseWriter, r *http.Request) {
 	cSess.CstpDpd = cstpDpd
 
 	dtlsPort := "443"
-	if strings.Contains(base.Cfg.ServerDTLSAddr, ":") {
-		ss := strings.Split(base.Cfg.ServerDTLSAddr, ":")
+	if strings.Contains(base.Cfg.AdvertiseDTLSAddr, ":") {
+		ss := strings.Split(base.Cfg.AdvertiseDTLSAddr, ":")
 		dtlsPort = ss[1]
 	}