From 55fb037b48621697684ec60055cdb3839307ecde Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Fri, 4 Dec 2015 01:23:19 +0300 Subject: [PATCH] Avoid overflow in external Use sockaddr_in6 for extsa if compiled with IPv6 support to be uniform and avoid overflows. --- src/structures.h | 5 +++-- src/version.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/structures.h b/src/structures.h index 864b1c6..536b03c 100644 --- a/src/structures.h +++ b/src/structures.h @@ -376,10 +376,11 @@ struct srvparam { #ifndef NOIPV6 struct sockaddr_in6 intsa; struct sockaddr_in6 extsa6; + struct sockaddr_in6 extsa; #else struct sockaddr_in intsa; -#endif struct sockaddr_in extsa; +#endif pthread_mutex_t counter_mutex; struct pollfd fds; FILE *stdlog; @@ -499,7 +500,7 @@ struct extparam { #ifndef NOIPV6 struct sockaddr_in6 intsa; struct sockaddr_in6 extsa6; - struct sockaddr_in extsa; + struct sockaddr_in6 extsa; #else struct sockaddr_in intsa; struct sockaddr_in extsa; diff --git a/src/version.h b/src/version.h index 6582d2d..f09b34a 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ #define VERSION "3proxy-0.8b-devel" -#define BUILDDATE "151203020751" +#define BUILDDATE "151204012035"