brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #43 from HnH/master

Browse Source 
ServerConn::openDataConn() recursively tries to use EPSV and PASV.
This commit is contained in:
Julien Laffaye 2016-02-27 11:10:24 +01:00
commit 0e072be722
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ftp.go
View File

@ -221,28 +221,18 @@ func (c *ServerConn) pasv() (port int, err error) {
// openDataConn creates a new FTP data connection.
func (c *ServerConn) openDataConn() (net.Conn, error) {
var port int
var err error
var (
port int
err error
)
// If features contains nat6 or EPSV => EPSV
// else -> PASV
_, nat6Supported := c.features["nat6"]
_, epsvSupported := c.features["EPSV"]
if !nat6Supported && !epsvSupported {
port, _ = c.pasv()
}
if port == 0 {
port, err = c.epsv()
if err != nil {
if port, err = c.epsv(); err != nil {
if port, err = c.pasv(); err != nil {
return nil, err
}
}
// Build the new net address string
addr := net.JoinHostPort(c.host, strconv.Itoa(port))
return net.DialTimeout("tcp", addr, c.timeout)
return net.DialTimeout("tcp", net.JoinHostPort(c.host, strconv.Itoa(port)), c.timeout)
}
// cmd is a helper function to execute a command and check for the expected FTP