BUILD : 1.7.8 (606) BUGS : NOTES : Removed proxy detector code from the core, threads stuff still there. Needs good testing

git-svn-id: svn://svn.anope.org/anope/trunk@606 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@454 5417fbe8-f217-4b02-8779-1006273d7864

33 files changed, 179 insertions, 1878 deletions

diff --git a/Changes b/Changes
index 651281c85..992857298 100644
--- a/Changes
+++ b/Changes
@@ -30,6 +30,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005
 01/30 F ChanServ help to reflect the avaiable commands.                   [ #00]
 01/30 F ChanServ used some commands that were not valid on all ircds.     [ #00]
 01/30 F Compiling modules under Mac OSX.                                  [#285]
+03/07 R Removed Proxy Detector from core.                                 [ #00]
 
 Provided by crazytoon <da.crew@gmx.net> - 2005
 02/05 A Updated German language file.                                     [ #00]
diff --git a/Changes.conf b/Changes.conf
index 39a272caa..97a27b05e 100644
--- a/Changes.conf
+++ b/Changes.conf
@@ -27,6 +27,138 @@ Anope Version S V N
 
 ** DELETED  CONFIGURATION DIRECTIVES ** 
 
+###########################################################################
+#
+# Proxy detection
+#
+###########################################################################
+
+# Note: if ProxyDetect is not set, all parameters after it in this section
+# are optional.
+
+# ProxyDetect [OPTIONAL]
+#
+# Enables insecure proxy detection. Services will automatically
+# scan each incoming user and akill those that use insecure proxy.
+#
+# Anope currently supports detection of Wingate (port 23), SOCKS4/5
+# (port 1080), and HTTP proxy (ports 3128 and 8080). It uses the
+# protocol of each proxy type to connect to an IRC server, it does
+# not only check if the port is open (so your users may still have
+# an open telnet server on their port 23 for example).
+#
+# WARNING: You should get the authorization of the administrator of
+# the computer which runs the proxy detector before enabling it; not
+# all administrators will accept it. Also note that in certain
+# countries, port scanning is prohibited.
+#
+# This feature requires threading support to be compiled into Anope.
+
+#ProxyDetect
+
+# ProxyThreads <number> [REQUIRED]
+#
+# Sets the number of threads Services will launch when starting. Each
+# thread will have the responsibility to scan queued hostname for
+# proxies.
+#
+# This value must be set depending of the number of users you have
+# on your network. The more threads are used, the more simultaneous
+# checks can be done. Remember however, that threads are
+# resource-consuming.
+#
+# WARNING: On Linux, each thread takes a background process, and there
+# is an additional process used for thread management; this is a problem
+# if you are limited in the number of background process you can use
+# (on a paid shell for example).
+
+ProxyThreads 5
+
+# ProxyMessage... <message> [RECOMMENDED]
+#
+# Sets the notices that will be sent out to users before Services
+# scan them for proxy. You may not use all of them, but just as much as
+# necessary.
+
+ProxyMessage1 "I will now detect if you're using an insecure proxy."
+ProxyMessage2 "If you see a connection on port 23, 1080, 3128 or 8080 from"
+ProxyMessage3 "my.box.net, please disregard it, as it is the detector in action."
+ProxyMessage4 "See http://proxy.myirc.net/ for information about our proxy policy."
+#ProxyMessage5 "Enter"
+#ProxyMessage6 "whatever"
+#ProxyMessage7 "you want"
+#ProxyMessage8 "here."
+
+# ProxyCheck... [OPTIONAL]
+#
+# Determines what types of proxy Anope will try to find (respectively
+# Wingate on port 23, SOCKS4 on port 1080, SOCKS5 on port 1080, HTTP
+# proxy on port 3128, HTTP proxy on port 8080 and HTTP proxy on port
+# 80).
+
+ProxyCheckWingate
+ProxyCheckSocks4
+ProxyCheckSocks5
+ProxyCheckHTTP1
+ProxyCheckHTTP2
+ProxyCheckHTTP3
+
+# ProxyTimeout <time> [REQUIRED]
+
+# Sets the maximum length of time we allow a connect/read operation to
+# take. If you set this value too high, your threads may hang on a single
+# check for a very long time. The best is to try different values
+# and see which one is the more efficient for your network.
+
+ProxyTimeout 15s
+
+# ProxyTestServer <ip> <port> [REQUIRED]
+#
+# Sets the *IP* and port of the IRC server to use as a target when
+# testing users for proxy.
+
+ProxyTestServer "1.2.3.4" 6667
+
+# ProxyExpire <time> [RECOMMENDED]
+#
+# Sets the length of time before a proxy host cache entry expires, if
+# not used. If this is not set the default time is 2 days.
+
+ProxyExpire 30d
+
+# ProxyCacheExpire <time> [REQUIRED]
+#
+# Sets the length of time before a normal host cache entry expires, if
+# not used. This cannot be set to 0d.
+#
+# Every non-proxy hosts will be stored in cache (to avoid too many scans
+# to the same host), so you should set this enough low to not fill your
+# memory, especially on large networks.
+
+ProxyCacheExpire 1d
+
+# ProxyAkillReason <reason> [REQUIRED]
+#
+# Sets the reason that will be used to AKILL an user from the network
+# if a proxy is detected.
+
+ProxyAkillReason "You're using an insecure proxy. See http://proxy.myirc.net/config.html for information about how to config your proxy in a safe manner."
+
+# WallProxy [OPTIONAL]
+#
+# Sends a WALLOPS/GLOBOPS when an user using an insecure proxy is being
+# AKILLed.
+
+WallProxy
+
+# ProxyMax <number> [REQUIRED]
+#
+# Sets the maximum proxy cache entries that can be displayed in a single
+# call to OperServ CACHE.
+
+ProxyMax 50
+
+
 Anope Version 1.7.8
 -------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
diff --git a/Changes.lang b/Changes.lang
index 3518ff057..7126e880e 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -10,6 +10,22 @@ Anope Version S V N
 
 *** Del Strings:
 	CHAN_HELP_ULTIMATE
+	OPER_STATS_PROXY_MEM
+	OPER_CACHE_SYNTAX
+	OPER_CACHE_DISABLED
+	OPER_CACHE_NOT_FOUND
+	OPER_CACHE_REMOVED
+	OPER_CACHE_HEADER
+	OPER_CACHE_LIST
+	OPER_CACHE_FOOTER
+	OPER_CACHE_QUEUED
+	OPER_CACHE_PROGRESS
+	OPER_CACHE_NORMAL
+	OPER_CACHE_WINGATE
+	OPER_CACHE_SOCKS4
+	OPER_CACHE_SOCKS5
+	OPER_CACHE_HTTP
+	OPER_HELP_CACHE
 
 Anope Version 1.7.8
 -------------------
diff --git a/data/example.conf b/data/example.conf
index f25f274f6..69d82370a 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -560,137 +560,6 @@ MailDelay 5m
 
 ###########################################################################
 #
-# Proxy detection
-#
-###########################################################################
-
-# Note: if ProxyDetect is not set, all parameters after it in this section
-# are optional.
-
-# ProxyDetect [OPTIONAL]
-#    
-# Enables insecure proxy detection. Services will automatically
-# scan each incoming user and akill those that use insecure proxy.
-#
-# Anope currently supports detection of Wingate (port 23), SOCKS4/5
-# (port 1080), and HTTP proxy (ports 3128 and 8080). It uses the
-# protocol of each proxy type to connect to an IRC server, it does
-# not only check if the port is open (so your users may still have
-# an open telnet server on their port 23 for example).
-#
-# WARNING: You should get the authorization of the administrator of
-# the computer which runs the proxy detector before enabling it; not
-# all administrators will accept it. Also note that in certain 
-# countries, port scanning is prohibited. 
-#
-# This feature requires threading support to be compiled into Anope.
-
-#ProxyDetect
-
-# ProxyThreads <number> [REQUIRED]
-#
-# Sets the number of threads Services will launch when starting. Each
-# thread will have the responsibility to scan queued hostname for 
-# proxies.
-#
-# This value must be set depending of the number of users you have
-# on your network. The more threads are used, the more simultaneous
-# checks can be done. Remember however, that threads are 
-# resource-consuming. 
-# 
-# WARNING: On Linux, each thread takes a background process, and there
-# is an additional process used for thread management; this is a problem
-# if you are limited in the number of background process you can use 
-# (on a paid shell for example).
-
-ProxyThreads 5
-
-# ProxyMessage... <message> [RECOMMENDED]
-#
-# Sets the notices that will be sent out to users before Services
-# scan them for proxy. You may not use all of them, but just as much as 
-# necessary.
-
-ProxyMessage1 "I will now detect if you're using an insecure proxy."
-ProxyMessage2 "If you see a connection on port 23, 1080, 3128 or 8080 from"
-ProxyMessage3 "my.box.net, please disregard it, as it is the detector in action."
-ProxyMessage4 "See http://proxy.myirc.net/ for information about our proxy policy."
-#ProxyMessage5 "Enter"
-#ProxyMessage6 "whatever"
-#ProxyMessage7 "you want"
-#ProxyMessage8 "here."
-
-# ProxyCheck... [OPTIONAL]
-#
-# Determines what types of proxy Anope will try to find (respectively 
-# Wingate on port 23, SOCKS4 on port 1080, SOCKS5 on port 1080, HTTP 
-# proxy on port 3128, HTTP proxy on port 8080 and HTTP proxy on port
-# 80).
-
-ProxyCheckWingate
-ProxyCheckSocks4
-ProxyCheckSocks5
-ProxyCheckHTTP1
-ProxyCheckHTTP2
-ProxyCheckHTTP3
-
-# ProxyTimeout <time> [REQUIRED]
-
-# Sets the maximum length of time we allow a connect/read operation to
-# take. If you set this value too high, your threads may hang on a single
-# check for a very long time. The best is to try different values
-# and see which one is the more efficient for your network.
-
-ProxyTimeout 15s
-
-# ProxyTestServer <ip> <port> [REQUIRED]
-#
-# Sets the *IP* and port of the IRC server to use as a target when 
-# testing users for proxy.
-
-ProxyTestServer "1.2.3.4" 6667
-
-# ProxyExpire <time> [RECOMMENDED]
-#
-# Sets the length of time before a proxy host cache entry expires, if
-# not used. If this is not set the default time is 2 days.
-
-ProxyExpire 30d
-
-# ProxyCacheExpire <time> [REQUIRED]
-#
-# Sets the length of time before a normal host cache entry expires, if
-# not used. This cannot be set to 0d.
-#
-# Every non-proxy hosts will be stored in cache (to avoid too many scans
-# to the same host), so you should set this enough low to not fill your
-# memory, especially on large networks.
-
-ProxyCacheExpire 1d
-
-# ProxyAkillReason <reason> [REQUIRED]
-#
-# Sets the reason that will be used to AKILL an user from the network
-# if a proxy is detected.
-
-ProxyAkillReason "You're using an insecure proxy. See http://proxy.myirc.net/config.html for information about how to config your proxy in a safe manner."
-
-# WallProxy [OPTIONAL]
-#
-# Sends a WALLOPS/GLOBOPS when an user using an insecure proxy is being
-# AKILLed.
-
-WallProxy
-
-# ProxyMax <number> [REQUIRED]
-#
-# Sets the maximum proxy cache entries that can be displayed in a single
-# call to OperServ CACHE.
-
-ProxyMax 50
-
-###########################################################################
-#
 # NickServ configuration
 #
 ###########################################################################
diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index d743be716..3d09bef97 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -52,31 +52,26 @@ Anope for Windows
            path one of two ways, either with \ or /. If you use \ you must
            add a secondary \; so c:\mysql would be c:\\mysql.
 
-        C) To use Anope's built in Proxy scanner you need to change
-           PROXY_SCANNER to be equal to 1 (i.e. PROXY_SCANNER=1). Please note
-           that the Anope's built in proxy scanner is not the best available,
-           and that it's recommended to use another third party scanner.
-
-        D) Do you want to use the MD5 message-digest algorithm to encrypt
+        C) Do you want to use the MD5 message-digest algorithm to encrypt
            passwords? Selecting "yes" protects your passwords from being
            stolen if someone gains access to the Services databases, but
            makes it impossible to recover forgotten passwords. There is no
            way to reverse this operation, so make sure you really want to
            enable it. Change DB_ENCRYPTION to be equal to 1 to enable it.
 
-        E) If you are using Visual Studio 6, this next line can be very
+        D) If you are using Visual Studio 6, this next line can be very
            important. If you are getting an error during compile about
            "unresolved external symbol __ftol2", remove the # in front of
            VC6=/QIfist and attempt to compile again.
 
-        F) If you get an error about "Cannot find wsock32.lib" or
+        E) If you get an error about "Cannot find wsock32.lib" or
            "Cannot find msvcrt.lib" when compiling, you need to define the
            libpath, in the LIBPATH directive. You can define the path in one
            of two ways: either with \ or /. If you use \ you must add a
            secondary \; so c:\sdk\lib would be c:\\sdk\\lib. Be sure to
            remove the # in front of LFLAGS.
 
-        G) Most import is to set the DATDEST to be the folder name where the
+        F) Most import is to set the DATDEST to be the folder name where the
            database will be stored. This does not need to be the full path,
            just the folder under the main executable in which data will
            exist. In our example we will use "data"
diff --git a/include/extern.h b/include/extern.h
index 66cd043ce..1ddf6ecf6 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -326,24 +326,6 @@ E int   RestrictMail;
 E int   MailDelay;
 E int  DontQuoteAddresses;
 
-E int   ProxyDetect;
-E int   ProxyThreads;
-E char *ProxyMessage[8];
-E int   ProxyCheckWingate;
-E int   ProxyCheckSocks4;
-E int   ProxyCheckSocks5;
-E int   ProxyCheckHTTP1;
-E int   ProxyCheckHTTP2;
-E int   ProxyCheckHTTP3;
-E int   ProxyTimeout;
-E char *ProxyTestServer;
-E int   ProxyTestPort;
-E int   ProxyExpire;
-E int   ProxyCacheExpire;
-E char *ProxyAkillReason;
-E int   WallProxy;
-E int   ProxyMax;
-
 E int   NSDefFlags;
 E int   NSDefLanguage;
 E int   NSRegDelay;
@@ -485,8 +467,7 @@ E void rdb_save_bs_core(BotInfo * bi);
 E void rdb_save_bs_rdb_core(BotInfo * bi);
 E void rdb_save_hs_core(HostCore * hc);
 E void rdb_save_os_db(unsigned int maxucnt, unsigned int maxutime,
-                    SList * ak, SList * sgl, SList * sql, SList * szl,
-                    HostCache * hc);
+                    SList * ak, SList * sgl, SList * sql, SList * szl);
 E void rdb_save_news(NewsItem * ni);
 E void rdb_save_exceptions(Exception * e);
 E void rdb_load_bs_dbase(void);
@@ -693,6 +674,8 @@ E u_int32_t getrandom32(void);
 
 E char *str_signed(unsigned char *str);
 
+E void ntoa(struct in_addr addr, char *ipaddr, int len);
+
 /**** modules.c ****/
 E void moduleCallBackRun(void);
 E void moduleCleanStruct(ModuleData **moduleData);
@@ -804,19 +787,6 @@ E IgnoreData *get_ignore(const char *nick);
 E int split_buf(char *buf, char ***argv, int colon_special);
 E void process(void);
 
-/**** proxy.c ****/
-
-E HostCache *hcache[1024];
-
-E HostCache *proxy_cache_add(char *host);
-E void get_proxy_stats(long *nrec, long *memuse);
-E void ntoa(struct in_addr addr, char *ipaddr, int len);
-E int proxy_check(char *nick, char *host, uint32 ip);
-E void proxy_expire();
-E int proxy_init(void);
-
-E int do_cache(User *u);
-
 /**** send.c ****/
 
 E void send_cmd(const char *source, const char *fmt, ...)
@@ -966,7 +936,7 @@ E void db_mysql_save_ns_req(NickRequest * nr);
 E void db_mysql_save_cs_info(ChannelInfo * ci);
 E void db_mysql_save_os_db(unsigned int maxucnt, unsigned int maxutime,
                            SList * ak, SList * sgl, SList * sql,
-                           SList * szl, HostCache * hc);
+                           SList * szl);
 E void db_mysql_save_news(NewsItem * ni);
 E void db_mysql_save_exceptions(Exception * e);
 E void db_mysql_save_hs_core(HostCore * hc);
diff --git a/include/services.h b/include/services.h
index 9eaab1f47..51b9d3075 100644
--- a/include/services.h
+++ b/include/services.h
@@ -198,7 +198,6 @@ typedef struct akill_ Akill;
 typedef struct sxline_ SXLine;
 typedef struct hostcore_ HostCore;
 typedef struct newsitem_ NewsItem;
-typedef struct hostcache_ HostCache;
 typedef struct exception_ Exception;
 typedef struct cbmode_ CBMode;
 typedef struct cbmodeinfo_ CBModeInfo;
@@ -1024,32 +1023,6 @@ struct session_ {
 
 /*************************************************************************/
 
-/* Proxy stuff */
-
-
-
-struct hostcache_ {
-	HostCache *prev, *next;
-
-	char *host;							/* The hostname */
-	uint32 ip;							/* The IP address */
-
-	int16 status;						/* HC_* below */
-	time_t used;						/* When was this entry last used? */
-};
-
-/* We assume that values < 0 are in-progress values, and values > 0 are
- * proxy value. 0 is the normal value.
- */
-
-#define HC_QUEUED		-2				/* Waiting to be scanned */
-#define HC_PROGRESS		-1				/* Currently being scanned */
-#define HC_NORMAL		 0				/* No proxy found on this host */
-#define HC_WINGATE		 1				/* Wingate found */
-#define HC_SOCKS4		 2				/* Socks4 found */
-#define HC_SOCKS5		 3				/* Socks5 found */
-#define HC_HTTP			 4				/* HTTP proxy found */
-
 /**
  * DEFCON Defines
  **/
diff --git a/lang/cat.l b/lang/cat.l
index eae947a61..abceb125d 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2305,8 +2305,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ     : %6d registres, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessions     : %6d registres, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies      : ^B%6d^B registres, ^B%5d^B kB
 OPER_STATS_AKILL_COUNT
 	Numero actual de AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2787,42 +2785,6 @@ OPER_USERLIST_END
 	Fi de la llista d'usuaris.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | patró} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Detecció de Proxy deshabilitada.
-OPER_CACHE_NOT_FOUND
-	%s no trobat al cau.
-OPER_CACHE_REMOVED
-	%s ha estat esborrat del cau.
-OPER_CACHE_HEADER
-	Hostname                                         Estatus
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Fi de la llista - %d/%d instàncies mostrades.
-OPER_CACHE_QUEUED
-	Encuat
-OPER_CACHE_PROGRESS
-	En progrès
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	Proxy HTTP
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
-# EXCEPTION responses
 OPER_SUPER_ADMIN_ON
 	You are now a SuperAdmin
 OPER_SUPER_ADMIN_OFF
@@ -5821,26 +5783,6 @@ OPER_HELP_USERLIST
 	
 	Limitat a administradors de serveis.
 
-OPER_HELP_CACHE
-	Sintàxi: CACHE DEL hostname
-	          CACHE LIST patró [QUEUED | ALL]
-	
-	La comanda CACHE DEL esborra el host especificat del cau.
-	Això nomès esta indicat per a propòsits de debug.
-	
-	La comanda CACHE LIST llista tots els proxies trobats que
-	concordin amb el patró especificat. Si s'especifica l'opció QUEUED,
-	llistara tots els processos encuats o en progres, i si s'especifica
-	l'opció ALL, llistara tots els hostnames a cau.
-	
-	Limitat a administradors de serveis.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/de.l b/lang/de.l
index a2d9672cf..266ee571f 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2297,8 +2297,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ          : %6d Einträge, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Verbindungen      : %6d Einträge, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d records, %5d kB
 OPER_STATS_AKILL_COUNT
 	Aktuelle Anzahl von AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2781,34 +2779,6 @@ OPER_USERLIST_END
 ###########################################################################
 
 # EXCEPTION responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {Hostname | Muster} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Proxy Detektor ist deaktiviert.
-OPER_CACHE_NOT_FOUND
-	%s wurde nicht im Cache gefunden.
-OPER_CACHE_REMOVED
-	%s wurde aus dem Cache gelöscht.
-OPER_CACHE_HEADER
-	Hostname                                         Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Ende der Liste - %d/%d passende Einträge angezeigt.
-OPER_CACHE_QUEUED
-	in der Warteschlange
-OPER_CACHE_PROGRESS
-	in Bearbeitung
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	Du bist jetzt ein Super-Admin.
 OPER_SUPER_ADMIN_OFF
@@ -6024,27 +5994,6 @@ OPER_HELP_USERLIST
 #
 ###########################################################################
 	
-OPER_HELP_CACHE
-	Syntax: CACHE DEL Hostname
-	        CACHE LIST Muster [QUEUED | ALL]
-	
-	Der CACHE DEL Befehl löscht den angegeben Hostnamen aus dem
-	Cache. Dieser Befehl ist ausschließlich für DEBUG Zwecke.
-
-	Der CACHE LIST Befehl listet alle Proxies auf, die dem
-	angegebenen Muster entsprechen. Falls die QUEUED Option
-	mitangegeben wird, werden alle Scans in der Warteschlange und
-	alle Scans die gerade laufen angezeigt. Wenn die ALL Option 
-	mitangegeben wird, werden alle Hostnamen aufgelistet.
-	
-	Beschränkt auf Services Administratoren.
-
-###########################################################################
-#
-# BotServ help messages   ## 19.10.2004 ##
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD Modul-Name
 
diff --git a/lang/en_us.l b/lang/en_us.l
index 75d29ec8a..1772e4d43 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2234,8 +2234,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d records, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sessions      : %6d records, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d records, %5d kB
 OPER_STATS_AKILL_COUNT
 	Current number of AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2705,35 +2703,6 @@ OPER_USERLIST_RECORD
 OPER_USERLIST_END
 	End of users list.
 
-# CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | pattern} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Proxy detection is disabled.
-OPER_CACHE_NOT_FOUND
-	%s was not found in the cache.
-OPER_CACHE_REMOVED
-	%s has been removed from the cache.
-OPER_CACHE_HEADER
-	Hostname                                         Status
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	End of list - %d/%d matches shown.
-OPER_CACHE_QUEUED
-	Queued
-OPER_CACHE_PROGRESS
-	In progress
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	HTTP proxy
 OPER_SUPER_ADMIN_ON
 	You are now a SuperAdmin
 OPER_SUPER_ADMIN_OFF
@@ -4975,7 +4944,6 @@ OPER_HELP_ADMIN_CMD
 	    OPERNEWS    Define messages to be shown to users who oper
 	    SESSION     View the list of host sessions
 	    EXCEPTION   Modify the session-limit exception list
-	    CACHE       Lists hostname cache used by the proxy detector
 	    NOOP        Temporarily remove all O:lines of a server 
 	                    remotely
 	    JUPE        "Jupiter" a server
@@ -5580,20 +5548,6 @@ OPER_HELP_USERLIST
 	
 	Limited to Services admins.
 
-OPER_HELP_CACHE
-	Syntax: CACHE DEL hostname
-	        CACHE LIST pattern [QUEUED | ALL]
-	
-	The CACHE DEL command deletes the specified hostname from 
-	the cache. This is meant for debug purpose only.
-
-	The CACHE LIST command lists all found proxies that match the
-	given pattern. If the QUEUED option is given, it will list
-	the queued or in progress scans instead, and if the ALL option 
-	is given, it will list all cached hostnames.
-	
-	Limited to Services admins.
-
 OPER_HELP_MODLOAD
 	Syntax: MODLOAD FileName
 
diff --git a/lang/es.l b/lang/es.l
index 7ca7b44ef..04282ff97 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2276,8 +2276,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ     : %6d records, %5d kB
 OPER_STATS_SESSIONS_MEM
 	Sesiones     : %6d records, %5d kB
-OPER_STATS_PROXY_MEM
-	Proxies      : ^B%6d^B records, ^B%5d^B kB
 OPER_STATS_AKILL_COUNT
 	Numero actual de AKILLs: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2759,42 +2757,6 @@ OPER_USERLIST_END
 	Fin de la lista de usuarios.
 
 # CACHE responses
-OPER_CACHE_SYNTAX
-	CACHE {DEL | LIST} {hostname | patron} [QUEUED | ALL]
-OPER_CACHE_DISABLED
-	Deteccion de Proxy deshabilitada.
-OPER_CACHE_NOT_FOUND
-	%s no encontrado en el cache.
-OPER_CACHE_REMOVED
-	%s ha sido removido del cache.
-OPER_CACHE_HEADER
-	Hostname                                         Estatus
-OPER_CACHE_LIST
-	%-48s %s
-OPER_CACHE_FOOTER
-	Fin de la lista - %d/%d instancias mostradas.
-OPER_CACHE_QUEUED
-	Encolado
-OPER_CACHE_PROGRESS
-	En progreso
-OPER_CACHE_NORMAL
-	Normal
-OPER_CACHE_WINGATE
-	Wingate
-OPER_CACHE_SOCKS4
-	SOCKS 4
-OPER_CACHE_SOCKS5
-	SOCKS 5
-OPER_CACHE_HTTP
-	Proxy HTTP
-
-###########################################################################
-#
-# Session Limiting and Exception messages
-#
-###########################################################################
-
-# EXCEPTION responses
 OPER_SUPER_ADMIN_ON
 	Ahora eres un SuperAdmin.
 OPER_SUPER_ADMIN_OFF
@@ -5800,26 +5762,6 @@ OPER_HELP_USERLIST
 	
 	Limitado a administradores de Servicios.
 
-OPER_HELP_CACHE
-	Sintaxis: CACHE DEL hostname
-	          CACHE LIST patron [QUEUED | ALL]
-	
-	El comando CACHE DEL borra el host especificado del cache.
-	Esto esta dispuesto solo para propositos de debug.
-	
-	El comando CACHE LIST lista todos los proxies encontrados que
-	concuerden con el patron dado. Si la opcion QUEUED es dada,
-	listara los procesos encolados o en progreso en vez, y si la
-	opcion ALL es dada, listara todos los hostnames en cache.
-	
-	Limitado a administradores de Servicios.
-
-###########################################################################
-#
-# BotServ help messages
-#
-###########################################################################
-	
 OPER_HELP_MODLOAD
 	Sintaxis: MODLOAD NombreArchivo
 
diff --git a/lang/fr.l b/lang/fr.l
index c567bb021..692283d42 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2316,8 +2316,6 @@ OPER_STATS_OPERSERV_MEM
 	OperServ      : %6d enregistrements, %5d ko
 OPER_STATS_SESSIONS_MEM
 	Sessions      : %6d enregistrements, %5d ko
-OPER_STATS_PROXY_MEM
-	Proxies       : %6d enregistrements, %5d ko
 OPER_STATS_AKILL_COUNT
 	Nombre d'AKILLs actuel: %d
 OPER_STATS_AKILL_EXPIRE_DAYS
@@ -2800,42 +2798,6 @@ OPER_USERLIST_END
 	Fin de la liste des utilisateurs.
 
 # CACHE responses
-