7x31
/
anylink
mirror of https://github.com/bjdgyc/anylink.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加 advertise_dtls_addr

This commit is contained in:
bjdgyc 2024-10-28 18:14:21 +08:00
parent 436b8e3129
commit 5826ebe6eb
5 changed files with 76 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
doc/README.md
View File

@ -12,45 +12,50 @@
> >
> 需要展示主页的同学，可以在QQ群 直接联系我添加。 > 需要展示主页的同学，可以在QQ群 直接联系我添加。
| 昵称 | 主页 / 联系方式 | | 昵称 | 主页 / 联系方式 |
|-------------|------------------------------| |--------------------|------------------------------|
| 代码 oo8 | | | 代码 oo8 | |
| 甘磊 | https://github.com/ganlei333 | | 甘磊 | https://github.com/ganlei333 |
| Oo@ | https://github.com/chooop | | Oo@ | https://github.com/chooop |
| 虚极静笃 | | | 虚极静笃 | |
| 请喝可乐 | | | 请喝可乐 | |
| 加油加油 | | | 加油加油 | |
| 李建 | | | 李建 | |
| lanbin | | | lanbin | |
| 乐在东途 | | | 乐在东途 | |
| 孤鸿 | | | 孤鸿 | |
| 刘国华 | | | 刘国华 | |
| 改名好无聊 | | | 改名好无聊 | |
| 全能互联网专家 | | | 全能互联网专家 | |
| JCM | | | JCM | |
| Eh... | | | Eh... | |
| 沉 | | | 沉 | |
| 刘国华 | | | 刘国华 | |
| 忧郁的豚骨拉面 | | | 忧郁的豚骨拉面 | |
| 张小旋当爹地 | | | 张小旋当爹地 | |
| 对方正在输入 | | | 对方正在输入 | |
| Ronny | | | Ronny | |
| 奔跑的少年 | | | 奔跑的少年 | |
| ZBW | | | ZBW | |
| 悲鸣 | | | 悲鸣 | |
| 谢谢 | | | 谢谢 | |
| 云思科技 | | | 云思科技 | |
| 哆啦A伟(张佳伟) | | | 哆啦A伟(张佳伟) | |
| 人类的悲欢并不相通 | | | 人类的悲欢并不相通 | |
| 做人要低调 | | | 做人要低调 | |
| 洛洛 | | | 洛洛 | |
| Dragon Liao | | | Dragon Liao | |
| 诸葛御风 | | | 诸葛御风 | |
| 杨杨得亿 | | | 杨杨得亿 | |
| Thanataos | | | Thanataos | |
| 憨大叔 | | | 憨大叔 | |
| 明月 | | | 明月 | |
| Amis | | | Amis | |
| Blake | |
| 刘国华 | |
| ZBW | |
| 全能互联网专家 | |
| 广播.会议.音响.无纸化.物联网中控 | |

49
server/base/cfg.go
View File

@ -33,28 +33,29 @@ var (
type ServerConfig struct { type ServerConfig struct {
// LinkAddr string `json:"link_addr"` // LinkAddr string `json:"link_addr"`
Conf string `json:"conf"` Conf string `json:"conf"`
Profile string `json:"profile"` Profile string `json:"profile"`
ProfileName string `json:"profile_name"` ProfileName string `json:"profile_name"`
ServerAddr string `json:"server_addr"` ServerAddr string `json:"server_addr"`
ServerDTLSAddr string `json:"server_dtls_addr"` ServerDTLS bool `json:"server_dtls"`
ServerDTLS bool `json:"server_dtls"` ServerDTLSAddr string `json:"server_dtls_addr"`
AdminAddr string `json:"admin_addr"` AdvertiseDTLSAddr string `json:"advertise_dtls_addr"`
ProxyProtocol bool `json:"proxy_protocol"` AdminAddr string `json:"admin_addr"`
DbType string `json:"db_type"` ProxyProtocol bool `json:"proxy_protocol"`
DbSource string `json:"db_source"` DbType string `json:"db_type"`
CertFile string `json:"cert_file"` DbSource string `json:"db_source"`
CertKey string `json:"cert_key"` CertFile string `json:"cert_file"`
FilesPath string `json:"files_path"` CertKey string `json:"cert_key"`
LogPath string `json:"log_path"` FilesPath string `json:"files_path"`
LogLevel string `json:"log_level"` LogPath string `json:"log_path"`
HttpServerLog bool `json:"http_server_log"` LogLevel string `json:"log_level"`
Pprof bool `json:"pprof"` HttpServerLog bool `json:"http_server_log"`
Issuer string `json:"issuer"` Pprof bool `json:"pprof"`
AdminUser string `json:"admin_user"` Issuer string `json:"issuer"`
AdminPass string `json:"admin_pass"` AdminUser string `json:"admin_user"`
AdminOtp string `json:"admin_otp"` AdminPass string `json:"admin_pass"`
JwtSecret string `json:"jwt_secret"` AdminOtp string `json:"admin_otp"`
JwtSecret string `json:"jwt_secret"`
LinkMode string `json:"link_mode"` // tun tap macvtap ipvtap LinkMode string `json:"link_mode"` // tun tap macvtap ipvtap
Ipv4Master string `json:"ipv4_master"` // eth0 Ipv4Master string `json:"ipv4_master"` // eth0
@ -132,6 +133,10 @@ func initServerCfg() {
Cfg.JwtSecret = jwtSecret Cfg.JwtSecret = jwtSecret
} }
if Cfg.AdvertiseDTLSAddr == "" {
Cfg.AdvertiseDTLSAddr = Cfg.ServerDTLSAddr
}
fmt.Printf("ServerCfg: %+v \n", Cfg) fmt.Printf("ServerCfg: %+v \n", Cfg)
} }

1
server/base/config.go
View File

@ -26,6 +26,7 @@ var configs = []config{
{Typ: cfgStr, Name: "server_addr", Usage: "TCP服务监听地址(任意端口)", ValStr: ":443"}, {Typ: cfgStr, Name: "server_addr", Usage: "TCP服务监听地址(任意端口)", ValStr: ":443"},
{Typ: cfgBool, Name: "server_dtls", Usage: "开启DTLS", ValBool: false}, {Typ: cfgBool, Name: "server_dtls", Usage: "开启DTLS", ValBool: false},
{Typ: cfgStr, Name: "server_dtls_addr", Usage: "DTLS监听地址(任意端口)", ValStr: ":443"}, {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: cfgStr, Name: "admin_addr", Usage: "后台服务监听地址", ValStr: ":8800"},
{Typ: cfgBool, Name: "proxy_protocol", Usage: "TCP代理协议", ValBool: false}, {Typ: cfgBool, Name: "proxy_protocol", Usage: "TCP代理协议", ValBool: false},
{Typ: cfgStr, Name: "db_type", Usage: "数据库类型 [sqlite3 mysql postgres]", ValStr: "sqlite3"}, {Typ: cfgStr, Name: "db_type", Usage: "数据库类型 [sqlite3 mysql postgres]", ValStr: "sqlite3"},

2
server/conf/server-sample.toml
View File

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

4
server/handler/link_tunnel.go
View File

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