relay_ip 指定

README-English.md

@@ -28,6 +28,7 @@ relay - relay service to be used in case of impenetration
 - server_port Server start port Only server configuration
 - reg_port The port where the relay is registered to listen when the server is started.
 - must_key key is required to Connect
+- relay_ip ip of RelayService onlyRelayConfiguration
 
 # docker-compose installation
 

README.md

@@ -27,6 +27,8 @@ relay - 在无法穿透情况下使用的中继服务
 - server_port 服务端启动端口 仅server配置
 - reg_port 服务端启动的relay注册监听端口 仅server配置
 - must_key 必须带key才能连接
+- relay_ip 中继服务的ip 仅relay配置
+
 # docker-compose安装
 
 下载仓库中的`docker-compose.yml`、`config.json`

common/config.go

@@ -17,6 +17,7 @@ type Config struct {
 	ServerPort uint16   `json:"server_port"`
 	RelayPort  uint16   `json:"relay_port"`
 	MustKey    bool     `json:"must_key"`
+	RelayIp    string   `json:"relay_ip"`
 }
 
 var Conf *Config

config.json

@@ -1,12 +1,12 @@
 {
   "whiteList": false,
-  "ipList": [
-  ],
+  "ipList": [],
   "must_key": true,
   "debug": false,
   "reg_server":"127.0.0.1:21120",
   "relay_name":"go_rust_desk_relay",
   "server_port": 21116,
   "relay_port":21117,
-  "reg_port": 21120
+  "reg_port": 21120,
+  "relay_ip": "127.0.0.1"
 }

model/model_msg/msg.go

@@ -24,6 +24,7 @@ type RegMsg struct {
 	Ping      uint      `json:"ping"`
 	Cpu       uint      `json:"cpu"`
 	NetFlow   float64   `json:"net_flow"`
+	IP        string    `json:"ip"`
 }
 type RegMsgR struct {
 	Err string `json:"err"`

relay/relay.go

@@ -64,7 +64,7 @@ func handlerMsg(msg []byte, writer *common.Writer) {
 	}
 }
 
-//黑名单检测
+// 黑名单检测
 func blacklistDetection(addr *common.Addr) bool {
 	in := common.InList(addr.GetIP())
 	if common.Conf.WhiteList && in {
@@ -92,7 +92,7 @@ func regRelay() {
 						Base: model_msg.Base{
 							MsgType: model_msg.RegType,
 						},
-						RegMsg: &model_msg.RegMsg{Name: common.Conf.RelayName, Time: time.Now(), RelayPort: common.Conf.RelayPort, Upload: u, Download: d, Ping: p, Cpu: cpuTest(), NetFlow: netFlow()},
+						RegMsg: &model_msg.RegMsg{IP: common.Conf.RelayIp, Name: common.Conf.RelayName, Time: time.Now(), RelayPort: common.Conf.RelayPort, Upload: u, Download: d, Ping: p, Cpu: cpuTest(), NetFlow: netFlow()},
 					})
 					_, err1 := dial.Write(marshal)
 					if err1 != nil {

server/server.go

@@ -3,7 +3,6 @@ package server
 import (
 	"fmt"
 	logs "github.com/danbai225/go-logs"
-	"github.com/gogf/gf/v2/container/gqueue"
 	"github.com/gogf/gf/v2/container/gring"
 	"go-rustdesk-server/common"
 	"go-rustdesk-server/data_server"
@@ -12,7 +11,6 @@ import (
 )
 
 var dataSever data_server.DataSever
-var queue = gqueue.New()
 var r = gring.New(32, true)
 var rendezvousServers = make([]string, 0)
 var serial = int32(1)
@@ -32,7 +30,7 @@ func Start() {
 	common.NewMonitor(false, "tcp", fmt.Sprintf(":%d", common.Conf.ServerPort), handlerMsg).Start()
 }
 
-//黑名单检测
+// 黑名单检测
 func blacklistDetection(id string, addr *common.Addr) bool {
 	in := common.InList(addr.GetIP())
 	if common.Conf.WhiteList && in {
@@ -53,7 +51,7 @@ func loadRelay() {
 	}
 }
 
-//获取一个中继服务器
+// 获取一个中继服务器
 func getRelay() string {
 	online, _ := dataSever.GetRelayAllOnline()
 	if len(online) != len(rendezvousServers) {
@@ -63,15 +61,15 @@ func getRelay() string {
 		logs.Err("NoRegisteredRelayServer")
 		return ""
 	}
-	var Rrelay *model.Relay
+	var Relay *model.Relay
 	for _, relay := range online {
 		if relay.Cpu < 60 && (float64(relay.Upload)-relay.NetFlow) > (float64(relay.Upload)*0.1) {
-			Rrelay = relay
+			Relay = relay
 			break
 		}
 	}
-	if Rrelay == nil {
-		Rrelay = online[rand.Intn(len(online))]
+	if Relay == nil {
+		Relay = online[rand.Intn(len(online))]
 	}
-	return fmt.Sprintf("%s:%d", Rrelay.IP, Rrelay.Port)
+	return fmt.Sprintf("%s:%d", Relay.IP, Relay.Port)
 }

server/sync.go

@@ -8,7 +8,7 @@ import (
 	"go-rustdesk-server/model/model_msg"
 )
 
-//同步服务
+// 同步服务
 func handlerSyncMsg(msg []byte, writer *common.Writer) {
 	if len(msg) == 0 {
 		return
@@ -33,7 +33,7 @@ func handlerSyncMsg(msg []byte, writer *common.Writer) {
 	}
 }
 
-//regRelay
+// regRelay
 func regRelay(msg *model_msg.RegMsg, writer *common.Writer) {
 	m := model_msg.Msg{
 		Base:    model_msg.Base{MsgType: model_msg.RegRType},
@@ -52,10 +52,14 @@ func regRelay(msg *model_msg.RegMsg, writer *common.Writer) {
 		m.RegMsgR.Err = err.Error()
 		return
 	}
+	ip := writer.GetAddr().GetIP()
+	if msg.IP != "" {
+		ip = msg.IP
+	}
 	newRelay := &model.Relay{
 		Name:        msg.Name,
 		Port:        msg.RelayPort,
-		IP:          writer.GetAddr().GetIP(),
+		IP:          ip,
 		Online:      true,
 		LastRegTime: &msg.Time,
 		Download:    msg.Download,
@@ -78,7 +82,7 @@ func regRelay(msg *model_msg.RegMsg, writer *common.Writer) {
 			}})
 		loadRelay()
 		logs.Info("new relay", newRelay.Name, writer.GetAddrStr())
-	} else if relay.IP == writer.GetAddr().GetIP() {
+	} else if relay.IP == ip {
 		newRelay.Uid = relay.Uid
 		err = dataSever.UpdateRelay(newRelay)
 		if err != nil {