Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #478 from DasSkelett/fix/relay-address-behind-dns64 

Fix relay IPv4 address resolution behind DNS64
This commit is contained in:
Zack 2022-05-18 16:48:51 -07:00 committed by GitHub
parent 9de06a6bf9 38ed8ecc3c
commit c68cfcea8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/croc/croc.go
View File

@ -778,7 +778,7 @@ func (c *Client) Receive() (err error) {
continue
}
serverTry := fmt.Sprintf("%s:%s", ip, port)
serverTry := net.JoinHostPort(ip, port)
conn, banner2, externalIP, errConn := tcp.ConnectToTCPServer(serverTry, c.Options.RelayPassword, c.Options.SharedSecret[:3], 500*time.Millisecond)
if errConn != nil {
log.Debug(errConn)

9
src/models/constants.go
View File

@ -79,15 +79,16 @@ func init() {
}
}
var err error
DEFAULT_RELAY, err = lookup(DEFAULT_RELAY)
var addr string
addr, err = lookup(DEFAULT_RELAY)
if err == nil {
DEFAULT_RELAY += ":" + DEFAULT_PORT
DEFAULT_RELAY = net.JoinHostPort(addr, DEFAULT_PORT)
} else {
DEFAULT_RELAY = ""
}
DEFAULT_RELAY6, err = lookup(DEFAULT_RELAY6)
addr, err = lookup(DEFAULT_RELAY6)
if err == nil {
DEFAULT_RELAY6 = "[" + DEFAULT_RELAY6 + "]:" + DEFAULT_PORT
DEFAULT_RELAY6 = net.JoinHostPort(addr, DEFAULT_PORT)
} else {
DEFAULT_RELAY6 = ""
}