From 59ed1ed60064239d7f469e3d4dc653588e28ef05 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 18 Apr 2008 22:16:28 +0000 Subject: Using SOCKS 4/5 proxy is no easy task: - a machine may well be able to reach the proxy, even if it is not on the same sub-net(s) as the machine itself (absolutely legitimate) - tsocks.conf needs a list of so-called 'local' networks that can be reached without the need for a SOCKS connection - SOCKS proxies are expected to be in 'local' networks - there is absolutely NO way to tell what networks are local, besides the sub-net(s) the machine is in Therefore, appropriate configuration of SOCKS 4/5 configuration is really complex, and attempts to correctly overcome this issue are doomed. /trunk/scripts/crosstool.sh | 52 46 6 0 ++++++++++++++++++++++++++++++++++---- /trunk/config/global/download_extract.in | 39 31 8 0 +++++++++++++++++++++++------ 2 files changed, 77 insertions(+), 14 deletions(-) --- config/global/download_extract.in | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) (limited to 'config/global') diff --git a/config/global/download_extract.in b/config/global/download_extract.in index db39e25c..0b4855d8 100644 --- a/config/global/download_extract.in +++ b/config/global/download_extract.in @@ -74,7 +74,8 @@ endif # USE_HTTP_PROXY config PROXY_TYPE_SOCKS bool - prompt "SOCKS 4/5 proxy" + prompt "SOCKS 4/5 proxy (EXPERIMENTAL)" + depends on EXPERIMENTAL help Use a Socks 4/5 proxy to connect to the internet. All protocols can get tunneled through this kind of proxy (depending @@ -100,18 +101,36 @@ if PROXY_TYPE_SOCKS choice bool prompt "type" - default PROXY_TYPE_SOCKS_5 + default PROXY_TYPE_SOCKS_SYS -config PROXY_TYPE_SOCKS_5 +config PROXY_TYPE_SOCKS_SYS bool - prompt "SOCKS 5" + prompt "Use system settings" + help + Use that if your system is already configured to + connect to SOCKS 4/5 proxies. + +config PROXY_TYPE_SOCKS_AUTO + bool + prompt "Auto" + help + crosstool-NG will attempt to guess what type of + SOCKS version the proxy speaks. config PROXY_TYPE_SOCKS_4 bool prompt "SOCKS 4" +config PROXY_TYPE_SOCKS_5 + bool + prompt "SOCKS 5" + endchoice +if ! PROXY_TYPE_SOCKS_SYS + +comment "THIS IS HIGHLY EXPERIMENTAL!!!" + config PROXY_HOST string prompt "hostname/IP" @@ -129,16 +148,20 @@ config PROXY_PASS string prompt "password" +endif # ! PROXY_TYPE_SOCKS_SYS + endif # USE_SOCKS_PROXY endchoice config PROXY_TYPE string - default "none" if PROXY_TYPE_NONE - default "http" if PROXY_TYPE_HTTP - default "socks5" if PROXY_TYPE_SOCKS_5 - default "socks4" if PROXY_TYPE_SOCKS_4 + default "none" if PROXY_TYPE_NONE + default "http" if PROXY_TYPE_HTTP + default "sockssys" if PROXY_TYPE_SOCKS_SYS + default "socksauto" if PROXY_TYPE_SOCKS_AUTO + default "socks4" if PROXY_TYPE_SOCKS_4 + default "socks5" if PROXY_TYPE_SOCKS_5 # Force restore indentation config BREAK_INDENT -- cgit v1.2.3