Mercurial > gftp.yaz
diff lib/gftp.h @ 169:d40f9db52cdf
2003-6-8 Brian Masney <masneyb@gftp.org>
* lib/https.c lib/options.h lib/sslcommon.c - make sure USE_SSL is
defined before using any SSL functions
* lib/gftp.h lib/protocols.c lib/rfc2068.c lib/sshv2.c lib/sslcommon.c
lib/rfc959.c - make sure we use request->datafd for the connection. Removed
sockfd from gftp_request structure
* lib/rfc959.c - add data_connection to rfc959_parms structure. Use
this for the FTP data connection
* src/text/gftp-text.c - fixes for username/password prompt
* src/gtk/misc-gtk.c src/gtk/transfer.c - s/sockfd/datafd/g
* configure.in - added lib/Makefile (forgot to commit last time)
* Makefile.am - added intl to SUBDIRS
| author | masneyb |
|---|---|
| date | Sun, 08 Jun 2003 15:49:02 +0000 |
| parents | c505d9ba9d53 |
| children | 4c288d05b26a |
line wrap: on
line diff
--- a/lib/gftp.h Sun Jun 08 15:04:40 2003 +0000 +++ b/lib/gftp.h Sun Jun 08 15:49:02 2003 +0000 @@ -304,8 +304,7 @@ unsigned int port; /* Port of remote site */ - int sockfd, /* Control connection (read) */ - datafd, /* Data connection */ + int datafd, /* Data connection */ cachefd; /* For the directory cache */ int wakeup_main_thread[2]; /* FD that gets written to by the threads to wakeup the parent */ @@ -665,7 +664,7 @@ #define GFTP_BOOKMARK_NUM 5 #define GFTP_IS_CONNECTED(request) ((request) != NULL && \ - ((request)->sockfd > 0 || \ + ((request)->datafd > 0 || \ (request)->cached || \ (request)->always_connected))