Răsfoiți Sursa

Avoid overflow in external

Use sockaddr_in6 for extsa if compiled with IPv6 support to be uniform
and avoid overflows.
z3APA3A 10 ani în urmă
părinte
comite
55fb037b48
2 a modificat fișierele cu 4 adăugiri și 3 ștergeri
  1. 3 2
      src/structures.h
  2. 1 1
      src/version.h

+ 3 - 2
src/structures.h

@@ -376,10 +376,11 @@ struct srvparam {
 #ifndef NOIPV6
 #ifndef NOIPV6
 	struct sockaddr_in6 intsa;
 	struct sockaddr_in6 intsa;
 	struct sockaddr_in6 extsa6;
 	struct sockaddr_in6 extsa6;
+	struct sockaddr_in6 extsa;
 #else
 #else
 	struct sockaddr_in intsa;
 	struct sockaddr_in intsa;
-#endif
 	struct sockaddr_in extsa;
 	struct sockaddr_in extsa;
+#endif
 	pthread_mutex_t counter_mutex;
 	pthread_mutex_t counter_mutex;
 	struct pollfd fds;
 	struct pollfd fds;
 	FILE *stdlog;
 	FILE *stdlog;
@@ -499,7 +500,7 @@ struct extparam {
 #ifndef NOIPV6
 #ifndef NOIPV6
 	struct sockaddr_in6 intsa;
 	struct sockaddr_in6 intsa;
 	struct sockaddr_in6 extsa6;
 	struct sockaddr_in6 extsa6;
-	struct sockaddr_in extsa;
+	struct sockaddr_in6 extsa;
 #else
 #else
 	struct sockaddr_in intsa;
 	struct sockaddr_in intsa;
 	struct sockaddr_in extsa;
 	struct sockaddr_in extsa;

+ 1 - 1
src/version.h

@@ -1,2 +1,2 @@
 #define VERSION "3proxy-0.8b-devel"
 #define VERSION "3proxy-0.8b-devel"
-#define BUILDDATE "151203020751"
+#define BUILDDATE "151204012035"