diff --git a/src/3proxy.c b/src/3proxy.c index af1bb44..5c88298 100644 --- a/src/3proxy.c +++ b/src/3proxy.c @@ -9,6 +9,7 @@ #include "proxy.h" #ifndef _WIN32 +#include #ifndef NOPLUGINS #include #endif @@ -644,7 +645,7 @@ static int h_proxy(int argc, unsigned char ** argv){ childdef.isudp = 0; childdef.service = S_PROXY; childdef.helpmessage = " -n - no NTLM support\n"; - if(!resolvfunc || (resolvfunc == myresolver && !dns_table->hashsize)){ + if(!resolvfunc || (resolvfunc == myresolver && !dns_table.hashsize)){ fprintf(stderr, "[line %d] Warning: no nserver/nscache configured, proxy may run very slow\n", linenum); } } @@ -675,7 +676,7 @@ static int h_proxy(int argc, unsigned char ** argv){ childdef.isudp = 0; childdef.service = S_SOCKS; childdef.helpmessage = " -n - no NTLM support\n"; - if(!resolvfunc || (resolvfunc == myresolver && !dns_table->hashsize)){ + if(!resolvfunc || (resolvfunc == myresolver && !dns_table.hashsize)){ fprintf(stderr, "[line %d] Warning: no nserver/nscache configured, socks may run very slow\n", linenum); } } @@ -718,7 +719,7 @@ static int h_proxy(int argc, unsigned char ** argv){ childdef.port = 53; childdef.isudp = 1; childdef.service = S_DNSPR; - if(!resolvfunc || (resolvfunc == myresolver && !dns_table->hashsize) || resolvfunc == fake_resolver){ + if(!resolvfunc || (resolvfunc == myresolver && !dns_table.hashsize) || resolvfunc == fakeresolver){ fprintf(stderr, "[line %d] Warning: no nserver/nscache configured, dnspr will not work as expected\n", linenum); } } diff --git a/src/auth.c b/src/auth.c index 93b24f5..9ccb124 100644 --- a/src/auth.c +++ b/src/auth.c @@ -865,19 +865,6 @@ struct auth authfuncs[] = { }; -struct hashentry { - unsigned char hash[sizeof(unsigned)*4]; - unsigned long value; - time_t expires; - struct hashentry *next; -}; - -struct hashtable { - unsigned hashsize; - struct hashentry ** hashtable; - struct hashentry * hashvalues; - struct hashentry * hashempty; -}; struct hashtable dns_table = {0, NULL, NULL, NULL}; diff --git a/src/structures.h b/src/structures.h index 40f6268..b0058d3 100644 --- a/src/structures.h +++ b/src/structures.h @@ -530,6 +530,22 @@ struct child { unsigned char **argv; }; +struct hashentry { + unsigned char hash[sizeof(unsigned)*4]; + unsigned long value; + time_t expires; + struct hashentry *next; +}; + +struct hashtable { + unsigned hashsize; + struct hashentry ** hashtable; + struct hashentry * hashvalues; + struct hashentry * hashempty; +}; + +extern struct hashtable dns_table; + struct sockfuncs { #ifdef _WIN32 SOCKET (WINAPI *_socket)(int domain, int type, int protocol);