Re: [gftp] PASV/PORT issue still happening

[Brian Masney <masneyb@gftp.org>]

On Mon, Mar 15, 2004 at 01:05:34PM -0500, Tracer Bullet wrote:
> I wrote about this problem ealier, but here goes again.  I set a
> bookmark to have a passive setting different than in the global
> settings, for this exemple the global setting is passive on, and the
> bookmark is passive off.  When I connect to the bookmark, the directory
> listing is retrieved after issuing a PORT command, but any files
> transfered are retrieved after a PASV command is issued.  I tried the
> patch for 2.0.16 that Brian suggested, as well as upgrading to the
> version at http://www.gftp.org/gftp-test.tar.bz2 as of sometime at the
> end of February, but still no joy.

I have attached a small patch that fixes this.

Brian


Index: lib/config_file.c
===================================================================
RCS file: /cvs/gnome/gftp/lib/config_file.c,v
retrieving revision 1.37
diff -u -r1.37 config_file.c
--- lib/config_file.c	3 Feb 2004 02:27:57 -0000	1.37
+++ lib/config_file.c	17 Mar 2004 12:58:54 -0000
@@ -1448,11 +1448,13 @@
 void
 gftp_copy_local_options (gftp_config_vars ** new_options_vars, 
                          GHashTable ** new_options_hash,
+                         int *new_num_local_options_vars,
                          gftp_config_vars * orig_options,
                          int num_local_options_vars)
 {
   int i;
 
+  *new_num_local_options_vars = num_local_options_vars;
   if (orig_options == NULL || num_local_options_vars == 0)
     {
       *new_options_vars = NULL;
Index: lib/gftp.h
===================================================================
RCS file: /cvs/gnome/gftp/lib/gftp.h,v
retrieving revision 1.83
diff -u -r1.83 gftp.h
--- lib/gftp.h	16 Mar 2004 14:50:09 -0000	1.83
+++ lib/gftp.h	17 Mar 2004 12:58:56 -0000
@@ -668,6 +668,7 @@
 
 void gftp_copy_local_options 		( gftp_config_vars ** new_options_vars, 
 					  GHashTable ** new_options_hash,
+					  int *new_num_local_options_vars,
 					  gftp_config_vars * orig_options,
 					  int num_local_options_vars );
 
Index: lib/misc.c
===================================================================
RCS file: /cvs/gnome/gftp/lib/misc.c,v
retrieving revision 1.64
diff -u -r1.64 misc.c
--- lib/misc.c	15 Mar 2004 18:07:06 -0000	1.64
+++ lib/misc.c	17 Mar 2004 12:58:59 -0000
@@ -611,6 +611,7 @@
 
   gftp_copy_local_options (&newreq->local_options_vars, 
                            &newreq->local_options_hash,
+                           &newreq->num_local_options_vars,
                            req->local_options_vars,
                            req->num_local_options_vars);
 
Index: lib/protocols.c
===================================================================
RCS file: /cvs/gnome/gftp/lib/protocols.c,v
retrieving revision 1.83
diff -u -r1.83 protocols.c
--- lib/protocols.c	16 Mar 2004 02:11:56 -0000	1.83
+++ lib/protocols.c	17 Mar 2004 12:59:03 -0000
@@ -626,6 +626,7 @@
 
   gftp_copy_local_options (&request->local_options_vars,
                            &request->local_options_hash,
+                           &request->num_local_options_vars,
                            tempentry->local_options_vars,
                            tempentry->num_local_options_vars);
 
Index: src/gtk/bookmarks.c
===================================================================
RCS file: /cvs/gnome/gftp/src/gtk/bookmarks.c,v
retrieving revision 1.25
diff -u -r1.25 bookmarks.c
--- src/gtk/bookmarks.c	15 Mar 2004 18:07:08 -0000	1.25
+++ src/gtk/bookmarks.c	17 Mar 2004 12:59:06 -0000
@@ -229,6 +229,7 @@
 
       gftp_copy_local_options (&newentry->local_options_vars,
                                &newentry->local_options_hash,
+                               &newentry->num_local_options_vars,
                                tempentry->local_options_vars,
                                tempentry->num_local_options_vars);
       newentry->num_local_options_vars = tempentry->num_local_options_vars;