diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/extern.h | 38 | ||||
| -rw-r--r-- | include/services.h | 27 |
2 files changed, 4 insertions, 61 deletions
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 **/ |