mirror of https://github.com/schollz/croc.git
Merge pull request #478 from DasSkelett/fix/relay-address-behind-dns64
Fix relay IPv4 address resolution behind DNS64
This commit is contained in:
commit
c68cfcea8a
|
@ -778,7 +778,7 @@ func (c *Client) Receive() (err error) {
|
||||||
continue
|
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)
|
conn, banner2, externalIP, errConn := tcp.ConnectToTCPServer(serverTry, c.Options.RelayPassword, c.Options.SharedSecret[:3], 500*time.Millisecond)
|
||||||
if errConn != nil {
|
if errConn != nil {
|
||||||
log.Debug(errConn)
|
log.Debug(errConn)
|
||||||
|
|
|
@ -79,15 +79,16 @@ func init() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var err error
|
var err error
|
||||||
DEFAULT_RELAY, err = lookup(DEFAULT_RELAY)
|
var addr string
|
||||||
|
addr, err = lookup(DEFAULT_RELAY)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
DEFAULT_RELAY += ":" + DEFAULT_PORT
|
DEFAULT_RELAY = net.JoinHostPort(addr, DEFAULT_PORT)
|
||||||
} else {
|
} else {
|
||||||
DEFAULT_RELAY = ""
|
DEFAULT_RELAY = ""
|
||||||
}
|
}
|
||||||
DEFAULT_RELAY6, err = lookup(DEFAULT_RELAY6)
|
addr, err = lookup(DEFAULT_RELAY6)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
DEFAULT_RELAY6 = "[" + DEFAULT_RELAY6 + "]:" + DEFAULT_PORT
|
DEFAULT_RELAY6 = net.JoinHostPort(addr, DEFAULT_PORT)
|
||||||
} else {
|
} else {
|
||||||
DEFAULT_RELAY6 = ""
|
DEFAULT_RELAY6 = ""
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue