Re: [PATCH] Re: [bug #8135] Ftp connection to proxy uses always active mode

[Leonard den Ottolander <leonard den ottolander nl>]

Hi,

On Wed, 2005-05-18 at 15:18, Leonard den Ottolander wrote:
> Maybe I get more response if I also send this patch to the list
> directly...

I forgot to fix the indexes of the referenced items in the dialog. This
version should fix that.

Leonard.

-- 
mount -t life -o ro /dev/dna /genetic/research

--- src/boxes.c.000	2004-09-25 15:46:23.000000000 +0200
+++ src/boxes.c	2005-05-18 15:59:37.000000000 +0200
@@ -689,7 +689,7 @@ tree_box (const char *current_dir)
 #ifdef USE_VFS
 
 #if defined(USE_NETCODE)
-#define VFSY 16
+#define VFSY 17
 #define VFS_WIDGETBASE 9
 #else
 #define VFSY 8
@@ -706,6 +706,7 @@ static char *ret_directory_timeout;
 static char *ret_ftp_proxy;
 static int ret_use_netrc;
 static int ret_ftpfs_use_passive_connections;
+static int ret_ftpfs_use_passive_connections_over_proxy;
 #endif
 
 static QuickWidget confvfs_widgets [] = {
@@ -714,6 +715,8 @@ static QuickWidget confvfs_widgets [] = 
 { quick_button,   12, VFSX,    VFSY - 3, VFSY, N_("&OK"),
       0, B_ENTER, 0, 0, "button-ok" },
 #if defined(USE_NETCODE)
+{ quick_checkbox,  4, VFSX, 12, VFSY, N_("Use passive mode over pro&xy"), 0, 0,
+      &ret_ftpfs_use_passive_connections_over_proxy, 0, "check-use-passive-mode-proxy" },
 { quick_checkbox,  4, VFSX, 11, VFSY, N_("Use &passive mode"), 0, 0,
       &ret_ftpfs_use_passive_connections, 0, "check-use-passive-mode" },
 { quick_checkbox,  4, VFSX, 10, VFSY, N_("&Use ~/.netrc"), 0, 0,
@@ -755,13 +758,14 @@ configure_vfs (void)
 
     ret_use_netrc = use_netrc;
     ret_ftpfs_use_passive_connections = ftpfs_use_passive_connections;
+    ret_ftpfs_use_passive_connections_over_proxy = ftpfs_use_passive_connections_over_proxy;
     g_snprintf(buffer3, sizeof (buffer3), "%i", ftpfs_directory_timeout);
-    confvfs_widgets[7].text = buffer3;
-    confvfs_widgets[9].text = ftpfs_anonymous_passwd;
-    confvfs_widgets[4].text = ftpfs_proxy_host;
+    confvfs_widgets[8].text = buffer3;
+    confvfs_widgets[10].text = ftpfs_anonymous_passwd;
+    confvfs_widgets[5].text = ftpfs_proxy_host;
 #endif
     g_snprintf (buffer2, sizeof (buffer2), "%i", vfs_timeout);
-    confvfs_widgets [3 + VFS_WIDGETBASE].text = buffer2;
+    confvfs_widgets [4 + VFS_WIDGETBASE].text = buffer2;
 
     if (quick_dialog (&confvfs_dlg) != B_CANCEL) {
         vfs_timeout = atoi (ret_timeout);
@@ -776,6 +780,7 @@ configure_vfs (void)
 	ftpfs_directory_timeout = atoi(ret_directory_timeout);
 	use_netrc = ret_use_netrc;
 	ftpfs_use_passive_connections = ret_ftpfs_use_passive_connections;
+	ftpfs_use_passive_connections_over_proxy = ret_ftpfs_use_passive_connections_over_proxy;
 	g_free (ret_directory_timeout);
 #endif
     }
--- vfs/ftpfs.h.000	2004-08-17 11:17:43.000000000 +0200
+++ vfs/ftpfs.h	2005-05-18 14:34:49.000000000 +0200
@@ -10,6 +10,7 @@ extern int ftpfs_always_use_proxy;
 
 extern int ftpfs_retry_seconds;
 extern int ftpfs_use_passive_connections;
+extern int ftpfs_use_passive_connections_over_proxy;
 extern int ftpfs_use_unix_list_options;
 extern int ftpfs_first_cd_then_ls;
 
--- vfs/ftpfs.c.000	2005-01-20 18:47:10.000000000 +0100
+++ vfs/ftpfs.c	2005-05-18 14:38:32.000000000 +0200
@@ -105,6 +105,7 @@ int ftpfs_retry_seconds = 30;
 
 /* Method to use to connect to ftp sites */
 int ftpfs_use_passive_connections = 1;
+int ftpfs_use_passive_connections_over_proxy = 0;
 
 /* Method used to get directory listings:
  * 1: try 'LIST -la <path>', if it fails
@@ -698,8 +699,8 @@ ftpfs_open_archive_int (struct vfs_class
 
     /* We do not want to use the passive if we are using proxies */
     if (SUP.proxy)
-	SUP.use_passive_connection = 0;
-    
+	SUP.use_passive_connection = ftpfs_use_passive_connections_over_proxy;
+
     retry_seconds = 0;
     do { 
 	SUP.failed_on_login = 0;