Mercurial > gftp.yaz
changeset 432:d7ff8d2d43aa
2004-3-17 Brian Masney <masneyb@gftp.org>
* lib/ftpcommon.h lib/ftps.c - removed encrypted_connection variable
from the rfc959_parms structure
* lib/rfc959.c (rfc959_copy_param_options) - fix for FTPS protocol
so that the proper read/write function is setup whenever the request
structure is copied
| author | masneyb |
|---|---|
| date | Wed, 17 Mar 2004 18:40:41 +0000 |
| parents | 593dddb1e59c |
| children | 77fffba5e170 |
| files | ChangeLog lib/ftpcommon.h lib/ftps.c lib/rfc959.c |
| diffstat | 4 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 17 18:01:48 2004 +0000 +++ b/ChangeLog Wed Mar 17 18:40:41 2004 +0000 @@ -1,4 +1,11 @@ 2004-3-17 Brian Masney <masneyb@gftp.org> + * lib/ftpcommon.h lib/ftps.c - removed encrypted_connection variable + from the rfc959_parms structure + + * lib/rfc959.c (rfc959_copy_param_options) - fix for FTPS protocol + so that the proper read/write function is setup whenever the request + structure is copied + * lib/sslcommon.c - fix so that the option verify_ssl_peer can be toggled while gftp is running and on a per connection basis @@ -2309,7 +2316,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.238 2004/03/17 18:01:47 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.239 2004/03/17 18:40:40 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/ftpcommon.h Wed Mar 17 18:01:48 2004 +0000 +++ b/lib/ftpcommon.h Wed Mar 17 18:40:41 2004 +0000 @@ -27,7 +27,6 @@ * dataconn_rbuf; int data_connection; unsigned int is_ascii_transfer : 1, - encrypted_connection : 1, is_fxp_transfer : 1; int (*auth_tls_start) (gftp_request * request); ssize_t (*data_conn_read) (gftp_request * request, void *ptr, size_t size,
--- a/lib/ftps.c Wed Mar 17 18:01:48 2004 +0000 +++ b/lib/ftps.c Wed Mar 17 18:40:41 2004 +0000 @@ -83,7 +83,6 @@ { params->data_conn_read = gftp_ssl_read; params->data_conn_write = gftp_ssl_write; - params->encrypted_connection = 1; } else { @@ -93,7 +92,6 @@ params->data_conn_read = gftp_fd_read; params->data_conn_write = gftp_fd_write; - params->encrypted_connection = 0; } return (0); @@ -124,9 +122,9 @@ params = request->protocol_data; request->protonum = GFTP_FTPS_NUM; + request->init = ftps_init; params->auth_tls_start = ftps_auth_tls_start; request->get_next_file = ftps_get_next_file; - request->init = ftps_init; request->post_connect = NULL; request->url_prefix = g_strdup ("ftps");
--- a/lib/rfc959.c Wed Mar 17 18:01:48 2004 +0000 +++ b/lib/rfc959.c Wed Mar 17 18:40:41 2004 +0000 @@ -1713,7 +1713,15 @@ dparms = dest_request->protocol_data; sparms = src_request->protocol_data; + dparms->data_connection = -1; dparms->is_ascii_transfer = sparms->is_ascii_transfer; + dparms->is_fxp_transfer = sparms->is_fxp_transfer; + dparms->auth_tls_start = sparms->auth_tls_start; + dparms->data_conn_read = sparms->data_conn_read; + dparms->data_conn_write = sparms->data_conn_write; + + dest_request->read_function = src_request->read_function; + dest_request->write_function = src_request->write_function; }