Răsfoiți Sursa

resolving compilation issues for *nix

z3APA3A 11 ani în urmă
părinte
comite
7bae6c4525
3 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 1 1
      src/proxy.h
  2. 1 1
      src/proxymain.c
  3. 1 1
      src/structures.h

+ 1 - 1
src/proxy.h

@@ -183,7 +183,7 @@ unsigned bandlimitfunc(struct clientparam *param, unsigned nbytesin, unsigned nb
 
 
 int scanaddr(const unsigned char *s, unsigned long * ip, unsigned long * mask);
-int myinet_ntop(int af, const void *src, char *dst, socklen_t size);
+int myinet_ntop(int af, void *src, char *dst, socklen_t size);
 extern unsigned long nservers[MAXNSERVERS];
 extern unsigned long authnserver;
 unsigned long getip(unsigned char *name);

+ 1 - 1
src/proxymain.c

@@ -192,7 +192,7 @@ int MODULEMAINFUNC (int argc, char** argv){
 		 case 'I':
 			size = sizeof(defparam.sincl);
 			if(so._getsockname(0, (struct sockaddr*)&defparam.sincl, &size) ||
-				defparam.sincl.sin_family != AF_INET) error = 1;
+				SAFAMILY(&defparam.sincl) != AF_INET) error = 1;
 
 			else inetd = 1;
 			break;

+ 1 - 1
src/structures.h

@@ -637,7 +637,7 @@ struct pluginlink {
 	int (*sockgetcharcli)(struct clientparam * param, int timeosec, int timeousec);
 	int (*sockgetcharsrv)(struct clientparam * param, int timeosec, int timeousec);
 	int (*sockgetlinebuf)(struct clientparam * param, DIRECTION which, unsigned char * buf, int bufsize, int delim, int to);
-	int (*myinet_ntop)(int af, const void *src, char *dst, socklen_t size);
+	int (*myinet_ntop)(int af, void *src, char *dst, socklen_t size);
 	int (*dobuf)(struct clientparam * param, unsigned char * buf, const unsigned char *s, const unsigned char * doublec);
 	int (*dobuf2)(struct clientparam * param, unsigned char * buf, const unsigned char *s, const unsigned char * doublec, struct tm* tm, char * format);
 	int (*scanaddr)(const unsigned char *s, unsigned long * ip, unsigned long * mask);