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

Merge pull request #101 from digineo/tcpaddr

Browse Source 
Use net.TCPAddr to extract remote IP address
This commit is contained in:
Julien Laffaye 2017-12-29 17:48:55 +01:00 committed by GitHub
commit c2fc7f0a5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ftp.go
View File

@ -74,17 +74,13 @@ func DialTimeout(addr string, timeout time.Duration) (*ServerConn, error) {
// Use the resolved IP address in case addr contains a domain name // Use the resolved IP address in case addr contains a domain name
// If we use the domain name, we might not resolve to the same IP. // If we use the domain name, we might not resolve to the same IP.
remoteAddr := tconn.RemoteAddr().String() remoteAddr := tconn.RemoteAddr().(*net.TCPAddr)
host, _, err := net.SplitHostPort(remoteAddr)
if err != nil {
return nil, err
}
conn := textproto.NewConn(tconn) conn := textproto.NewConn(tconn)
c := &ServerConn{ c := &ServerConn{
conn: conn, conn: conn,
host: host, host: remoteAddr.IP.String(),
timeout: timeout, timeout: timeout,
features: make(map[string]string), features: make(map[string]string),
} }