schollz/croc
1
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2024-11-28 01:16:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #180 from maximbaz/support-default-port-receiver

Browse Source 
Support default port on receiver side
This commit is contained in:
Zack 2019-11-19 16:38:40 -08:00 committed by GitHub
commit 88c4257816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats 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)