diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:56:08 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:56:08 +0000 |
| commit | 9b148dad600b3fe76d38e612c1865f85bbab254f (patch) | |
| tree | 5eecb1b68dae24f30b0cc543aa9058a11d7125b0 | |
| parent | be512dcc6854cb921d03b5a711eddf503ec2b23b (diff) | |
Fixed passive connect waiting bug
Author: jgg
Date: 2000-06-18 04:19:39 GMT
Fixed passive connect waiting bug
| -rw-r--r-- | methods/ftp.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc index ac12d0913..57095c4bf 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: ftp.cc,v 1.19 2000/01/10 03:44:54 jgg Exp $ +// $Id: ftp.cc,v 1.20 2000/06/18 04:19:39 jgg Exp $ /* ###################################################################### HTTP Aquire Method - This is the FTP aquire method for APT. @@ -536,11 +536,11 @@ bool FTPConn::CreateDataFd() /* This implements a timeout for connect by opening the connection nonblocking */ - if (WaitFd(ServerFd,true,TimeOut) == false) + if (WaitFd(DataFd,true,TimeOut) == false) return _error->Error("Could not connect data socket, connection timed out"); unsigned int Err; unsigned int Len = sizeof(Err); - if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0) + if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0) return _error->Errno("getsockopt","Failed"); if (Err != 0) return _error->Error("Could not connect."); |