mirrors_public/schollz_croc
1
1
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

Support default port on receiver side

Browse source
This commit is contained in:
Maxim Baz 2019-11-20 01:11:52 +01:00
parent eb85477086
commit 1a544e4624
No known key found for this signature in database
GPG key ID: 011FDC52DA839335
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/croc/croc.go
View file

@ -331,12 +331,12 @@ func (c *Client) Send(options TransferOptions) (err error) {
}
go func() {
log.Debugf("establishing connection to %s", c.Options.RelayAddress)
var banner string
if !strings.Contains(c.Options.RelayAddress, ":") {
// try the default port, 9009
c.Options.RelayAddress += ":9009"
}
log.Debugf("establishing connection to %s", c.Options.RelayAddress)
var banner string
conn, banner, ipaddr, err := tcp.ConnectToTCPServer(c.Options.RelayAddress, c.Options.RelayPassword, c.Options.SharedSecret, 5*time.Second)
log.Debugf("banner: %s", banner)
if err != nil {
@ -435,11 +435,17 @@ func (c *Client) Receive() (err error) {
)
c.ExternalIPConnected = c.Options.RelayAddress
usingLocal = true
break
}
}
log.Debugf("discoveries: %+v", discoveries)
log.Debug("establishing connection")
}
if !strings.Contains(c.Options.RelayAddress, ":") {
// try the default port, 9009
c.Options.RelayAddress += ":9009"
}
log.Debugf("establishing receiver connection to %s", c.Options.RelayAddress)
var banner string
c.conn[0], banner, c.ExternalIP, err = tcp.ConnectToTCPServer(c.Options.RelayAddress, c.Options.RelayPassword, c.Options.SharedSecret)
log.Debugf("banner: %s", banner)