github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ipv6 bug to solaris

Browse Source
This commit is contained in:
brenosilva
2011-04-01 16:56:10 +00:00
parent 463b0df78a
commit f0d6a06a95
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apache2/re_operators.c
View File

@@ -208,7 +208,7 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
#ifdef LINUX #ifdef LINUX
mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0xff; mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0xff;
#elif SOLARIS2 #elif SOLARIS2
mask6.sin6_addr.u6_addr.u6_addr8[j++] = 0xff; mask6.sin6_addr._S6_un._S6_u8[j++] = 0xff;
#else #else
mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0xff; mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0xff;
#endif #endif
@@ -220,8 +220,8 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
mask6.sin6_addr.__in6_u.__u6_addr8[j] >>= 1; mask6.sin6_addr.__in6_u.__u6_addr8[j] >>= 1;
mask6.sin6_addr.__in6_u.__u6_addr8[j] |= 0x80; mask6.sin6_addr.__in6_u.__u6_addr8[j] |= 0x80;
#elif SOLARIS2 #elif SOLARIS2
mask6.sin6_addr.u_addr.u6_addr8[j] >>= 1; mask6.sin6_addr._S6_un._S6_u8[j] >>= 1;
mask6.sin6_addr.u_addr.u6_addr8[j] |= 0x80; mask6.sin6_addr._S6_un._S6_u8[j] |= 0x80;
#else #else
mask6.sin6_addr.__u6_addr.__u6_addr8[j] >>= 1; mask6.sin6_addr.__u6_addr.__u6_addr8[j] >>= 1;
mask6.sin6_addr.__u6_addr.__u6_addr8[j] |= 0x80; mask6.sin6_addr.__u6_addr.__u6_addr8[j] |= 0x80;
@@ -234,7 +234,7 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
#ifdef LINUX #ifdef LINUX
mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0; mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0;
#elif SOLARIS2 #elif SOLARIS2
mask6.sin6_addr.u_addr.u6_addr8[j++] = 0; mask6.sin6_addr._S6_un._S6_u8[j++] = 0;
#else #else
mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0; mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0;
#endif #endif
@@ -244,7 +244,7 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
#ifdef LINUX #ifdef LINUX
sa.sin6_addr.__in6_u.__u6_addr32[j] &= mask6.sin6_addr.__in6_u.__u6_addr32[j]; sa.sin6_addr.__in6_u.__u6_addr32[j] &= mask6.sin6_addr.__in6_u.__u6_addr32[j];
#elif SOLARIS2 #elif SOLARIS2
sa.sin6_addr.u6_addr.u6_addr32[j] &= mask6.sin6_addr.u6_addr.u6_addr32[j]; sa.sin6_addr._S6_un.u6__S6_u32[j] &= mask6.sin6_addr._S6_un._S6_u32[j];
#else #else
sa.sin6_addr.__u6_addr.__u6_addr32[j] &= mask6.sin6_addr.__u6_addr.__u6_addr32[j]; sa.sin6_addr.__u6_addr.__u6_addr32[j] &= mask6.sin6_addr.__u6_addr.__u6_addr32[j];
#endif #endif
@@ -287,7 +287,7 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
#ifdef LINUX #ifdef LINUX
mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0xff; mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0xff;
#elif SOLARIS2 #elif SOLARIS2
mask6.sin6_addr.u6_addr.u6_addr8[j++] = 0xff; mask6.sin6_addr._S6_un._S6_u8[j++] = 0xff;
#else #else
mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0xff; mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0xff;
#endif #endif
@@ -298,8 +298,8 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
mask6.sin6_addr.__in6_u.__u6_addr8[j] >>= 1; mask6.sin6_addr.__in6_u.__u6_addr8[j] >>= 1;
mask6.sin6_addr.__in6_u.__u6_addr8[j] |= 0x80; mask6.sin6_addr.__in6_u.__u6_addr8[j] |= 0x80;
#elif SOLARIS2 #elif SOLARIS2
mask6.sin6_addr.u6_addr.u6_addr8[j] >>= 1; mask6.sin6_addr._S6_un._S6_u8[j] >>= 1;
mask6.sin6_addr.u6_addr.u6_addr8[j] |= 0x80; mask6.sin6_addr._S6_un._S6_u8[j] |= 0x80;
#else #else
mask6.sin6_addr.__u6_addr.__u6_addr8[j] >>= 1; mask6.sin6_addr.__u6_addr.__u6_addr8[j] >>= 1;
mask6.sin6_addr.__u6_addr.__u6_addr8[j] |= 0x80; mask6.sin6_addr.__u6_addr.__u6_addr8[j] |= 0x80;
@@ -312,7 +312,7 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
#ifdef LINUX #ifdef LINUX
mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0; mask6.sin6_addr.__in6_u.__u6_addr8[j++] = 0;
#elif SOLARIS2 #elif SOLARIS2
mask6.sin6_addr.u6_addr.u6_addr8[j++] = 0; mask6.sin6_addr._S6_un._S6_u8[j++] = 0;
#else #else
mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0; mask6.sin6_addr.__u6_addr.__u6_addr8[j++] = 0;
#endif #endif
@@ -323,7 +323,7 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
#ifdef LINUX #ifdef LINUX
sa.sin6_addr.__in6_u.__u6_addr32[j] &= mask6.sin6_addr.__in6_u.__u6_addr32[j]; sa.sin6_addr.__in6_u.__u6_addr32[j] &= mask6.sin6_addr.__in6_u.__u6_addr32[j];
#elif SOLARIS2 #elif SOLARIS2
sa.sin6_addr.u6_addr.u6_addr32[j] &= mask6.sin6_addr.u6_addr.u6_addr32[j]; sa.sin6_addr._S6_un._S6_u32[j] &= mask6.sin6_addr._S6_un._S6_u32[j];
#else #else
sa.sin6_addr.__u6_addr.__u6_addr32[j] &= mask6.sin6_addr.__u6_addr.__u6_addr32[j]; sa.sin6_addr.__u6_addr.__u6_addr32[j] &= mask6.sin6_addr.__u6_addr.__u6_addr32[j];
#endif #endif
@@ -473,8 +473,8 @@ static int msre_op_ipmatch_execute(modsec_rec *msr, msre_rule *rule, msre_var *v
if (((sa.sin6_addr.__in6_u.__u6_addr8[i] ^ ipdata->netaddr->sin6_addr.__in6_u.__u6_addr8[i]) & if (((sa.sin6_addr.__in6_u.__u6_addr8[i] ^ ipdata->netaddr->sin6_addr.__in6_u.__u6_addr8[i]) &
ipdata->netaddr->sin6_addr.__in6_u.__u6_addr8[i]) == 0) ipdata->netaddr->sin6_addr.__in6_u.__u6_addr8[i]) == 0)
#elif SOLARIS2 #elif SOLARIS2
if (((sa.sin6_addr.u6_addr.u6_addr8[i] ^ ipdata->netaddr->sin6_addr.u6_addr.u6_addr8[i]) & if (((sa.sin6_addr._S6_un._S6_u8[i] ^ ipdata->netaddr->sin6_addr._S6_un._S6_u8[i]) &
ipdata->netaddr->sin6_addr.__u6_addr.__u6_addr8[i]) == 0) ipdata->netaddr->sin6_addr._S6_un._S6_u8[i]) == 0)
#else #else
if (((sa.sin6_addr.__u6_addr.__u6_addr8[i] ^ ipdata->netaddr->sin6_addr.__u6_addr.__u6_addr8[i]) & if (((sa.sin6_addr.__u6_addr.__u6_addr8[i] ^ ipdata->netaddr->sin6_addr.__u6_addr.__u6_addr8[i]) &
ipdata->netaddr->sin6_addr.__u6_addr.__u6_addr8[i]) == 0) ipdata->netaddr->sin6_addr.__u6_addr.__u6_addr8[i]) == 0)