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

Avoid forever lock

Browse Source 
If we close the connection two times the second time will hang forever waiting for a server code.
This commit is contained in:
Davide D'Agostino 2017-05-01 18:18:54 -07:00 committed by Davide D'Agostino
parent 0895dc7f07
commit 58864d889b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ftp.go
View File

@ -47,8 +47,9 @@ type Entry struct {
// Response represents a data-connection // Response represents a data-connection
type Response struct { type Response struct {
conn net.Conn conn net.Conn
c *ServerConn c *ServerConn
connClosed bool
} }
// Connect is an alias to Dial, for backward compatibility // Connect is an alias to Dial, for backward compatibility
@ -337,7 +338,7 @@ func (c *ServerConn) NameList(path string) (entries []string, err error) {
return return
} }
r := &Response{conn, c} r := &Response{conn, c, false}
defer r.Close() defer r.Close()
scanner := bufio.NewScanner(r) scanner := bufio.NewScanner(r)
@ -368,7 +369,7 @@ func (c *ServerConn) List(path string) (entries []*Entry, err error) {
return return
} }
r := &Response{conn, c} r := &Response{conn, c, false}
defer r.Close() defer r.Close()
scanner := bufio.NewScanner(r) scanner := bufio.NewScanner(r)
@ -445,7 +446,7 @@ func (c *ServerConn) RetrFrom(path string, offset uint64) (*Response, error) {
return nil, err return nil, err
} }
return &Response{conn, c}, nil return &Response{conn, c, false}, nil
} }
// Stor issues a STOR FTP command to store a file to the remote FTP server. // Stor issues a STOR FTP command to store a file to the remote FTP server.
@ -537,11 +538,15 @@ func (r *Response) Read(buf []byte) (int, error) {
// Close implements the io.Closer interface on a FTP data connection. // Close implements the io.Closer interface on a FTP data connection.
func (r *Response) Close() error { func (r *Response) Close() error {
if r.connClosed == true {
return nil
}
err := r.conn.Close() err := r.conn.Close()
_, _, err2 := r.c.conn.ReadResponse(StatusClosingDataConnection) _, _, err2 := r.c.conn.ReadResponse(StatusClosingDataConnection)
if err2 != nil { if err2 != nil {
err = err2 err = err2
} }
r.connClosed = true
return err return err
} }