ouyang/rustdesk-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(server): Rustdesk Id Server Port & Relay Server Port #104

Browse Source
This commit is contained in:
lejianwen
2025-01-16 20:57:00 +08:00
parent a7e4ce4f72
commit 56014d35bd
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/rustdesk.go
View File

@@ -12,14 +12,14 @@ const (
) )
type Rustdesk struct { type Rustdesk struct {
IdServer string `mapstructure:"id-server"` IdServer string `mapstructure:"id-server"`
IdServerPort int `mapstructure:"-"` IdServerPort int `mapstructure:"-"`
RelayServer string `mapstructure:"relay-server"` RelayServer string `mapstructure:"relay-server"`
RelayPort int `mapstructure:"-"` RelayServerPort int `mapstructure:"-"`
ApiServer string `mapstructure:"api-server"` ApiServer string `mapstructure:"api-server"`
Key string `mapstructure:"key"` Key string `mapstructure:"key"`
KeyFile string `mapstructure:"key-file"` KeyFile string `mapstructure:"key-file"`
Personal int `mapstructure:"personal"` Personal int `mapstructure:"personal"`
//webclient-magic-queryonline //webclient-magic-queryonline
WebclientMagicQueryonline int `mapstructure:"webclient-magic-queryonline"` WebclientMagicQueryonline int `mapstructure:"webclient-magic-queryonline"`
} }
@@ -50,8 +50,8 @@ func (rd *Rustdesk) ParsePort() {
relayres := strings.Split(rd.RelayServer, ":") relayres := strings.Split(rd.RelayServer, ":")
if len(relayres) == 1 { if len(relayres) == 1 {
rd.RelayPort = DefaultRelayServerPort rd.RelayServerPort = DefaultRelayServerPort
} else if len(relayres) == 2 { } else if len(relayres) == 2 {
rd.RelayPort, _ = strconv.Atoi(relayres[1]) rd.RelayServerPort, _ = strconv.Atoi(relayres[1])
} }
} }

13
service/serverCmd.go
View File

@@ -41,7 +41,14 @@ func (is *ServerCmdService) Create(u *model.ServerCmd) error {
} }
// SendCmd 发送命令 // SendCmd 发送命令
func (is *ServerCmdService) SendCmd(port string, cmd string, arg string) (string, error) { func (is *ServerCmdService) SendCmd(target string, cmd string, arg string) (string, error) {
port := 0
switch target {
case model.ServerCmdTargetIdServer:
port = global.Config.Rustdesk.IdServerPort - 1
case model.ServerCmdTargetRelayServer:
port = global.Config.Rustdesk.RelayServerPort
}
//组装命令 //组装命令
cmd = cmd + " " + arg cmd = cmd + " " + arg
res, err := is.SendSocketCmd("v6", port, cmd) res, err := is.SendSocketCmd("v6", port, cmd)
@@ -57,14 +64,14 @@ func (is *ServerCmdService) SendCmd(port string, cmd string, arg string) (string
} }
// SendSocketCmd // SendSocketCmd
func (is *ServerCmdService) SendSocketCmd(ty string, port string, cmd string) (string, error) { func (is *ServerCmdService) SendSocketCmd(ty string, port int, cmd string) (string, error) {
addr := "[::1]" addr := "[::1]"
tcp := "tcp6" tcp := "tcp6"
if ty == "v4" { if ty == "v4" {
tcp = "tcp" tcp = "tcp"
addr = "127.0.0.1" addr = "127.0.0.1"
} }
conn, err := net.Dial(tcp, fmt.Sprintf("%s:%s", addr, port)) conn, err := net.Dial(tcp, fmt.Sprintf("%s:%v", addr, port))
if err != nil { if err != nil {
global.Logger.Debugf("%s connect to id server failed: %v", ty, err) global.Logger.Debugf("%s connect to id server failed: %v", ty, err)
return "", err return "", err