Browse Source

resolving compilation issues

Vladimir Dubrovin 11 years ago
parent
commit
17835c4d66
3 changed files with 20 additions and 16 deletions
  1. 4 3
      src/3proxy.c
  2. 0 13
      src/auth.c
  3. 16 0
      src/structures.h

+ 4 - 3
src/3proxy.c

@@ -9,6 +9,7 @@
 
 #include "proxy.h"
 #ifndef _WIN32
+#include <sys/resource.h>
 #ifndef NOPLUGINS
 #include <dlfcn.h>
 #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);
 		}
 	}

+ 0 - 13
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};
 

+ 16 - 0
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);