From be3fa535ba33ac1c894d44f5b60060c5ed0470f7 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 24 Oct 2003 20:08:38 +0000 Subject: [PATCH] * ftpfs.c: Remove the rest of source routing code. * xdirentry.h: Likewise. --- vfs/ChangeLog | 3 +++ vfs/ftpfs.c | 7 +------ vfs/xdirentry.h | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/vfs/ChangeLog b/vfs/ChangeLog index a8df34b23..158d2437e 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,5 +1,8 @@ 2003-10-24 Pavel Roskin + * ftpfs.c: Remove the rest of source routing code. + * xdirentry.h: Likewise. + * ftpfs.c (setup_source_route): Remove. It's a badly implemented hack that was never enabled. diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c index de282ba49..114dc639a 100644 --- a/vfs/ftpfs.c +++ b/vfs/ftpfs.c @@ -125,9 +125,6 @@ char *ftpfs_proxy_host = NULL; /* wether we have to use proxy by default? */ int ftpfs_always_use_proxy; -/* source routing host */ -extern int source_route; - #ifdef FIXME_LATER_ALIGATOR static struct linklist *connections_list; #endif @@ -760,8 +757,7 @@ open_archive (struct vfs_class *me, struct vfs_s_super *super, char *archive_nam if (ftpfs_check_proxy (host)) SUP.proxy = ftpfs_proxy_host; SUP.password = password; - SUP.use_passive_connection = ftpfs_use_passive_connections | source_route; - SUP.use_source_route = source_route; + SUP.use_passive_connection = ftpfs_use_passive_connections; SUP.strict = ftpfs_use_unix_list_options ? RFC_AUTODETECT : RFC_STRICT; SUP.isbinary = TYPE_UNKNOWN; SUP.remote_is_amiga = 0; @@ -902,7 +898,6 @@ again: if (setup_passive (me, super, data, &data_addr)) return data; - SUP.use_source_route = 0; SUP.use_passive_connection = 0; print_vfs_message (_("ftpfs: could not setup passive mode")); diff --git a/vfs/xdirentry.h b/vfs/xdirentry.h index edc91582d..c6af84680 100644 --- a/vfs/xdirentry.h +++ b/vfs/xdirentry.h @@ -48,7 +48,6 @@ struct vfs_s_super { char *proxy; /* proxy server, NULL if no proxy */ int failed_on_login; /* used to pass the failure reason to upper levels */ - int use_source_route; int use_passive_connection; int remote_is_amiga; /* No leading slash allowed for AmiTCP (Amiga) */ int isbinary;