diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2007-07-17 13:59:51 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2007-07-17 13:59:51 +0000 |
| commit | 3ee9e1f1f13ddd3371f75891ad91b45a90910ac1 (patch) | |
| tree | 32f692667fd0dfa1cf02431d40909af4efc3d092 | |
| parent | 1c8026af55a33748cd039f8285b3b55b2d475fc8 (diff) | |
| download | rsyslog-3ee9e1f1f13ddd3371f75891ad91b45a90910ac1.tar.gz rsyslog-3ee9e1f1f13ddd3371f75891ad91b45a90910ac1.tar.xz rsyslog-3ee9e1f1f13ddd3371f75891ad91b45a90910ac1.zip | |
improved AllowedSender code and portability - thanks to mildew@gmail.com
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | syslogd.c | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 66bb95d3..25b15f89 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,14 @@ AC_HEADER_TIME AC_STRUCT_TM AC_C_VOLATILE +sa_includes="\ +$ac_includes_default +#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif +" +AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,[$sa_includes]) + # Checks for library functions. AC_FUNC_FORK AC_PROG_GCC_TRADITIONAL @@ -991,6 +991,9 @@ static rsRetVal AddAllowedSender(struct AllowedSenders **ppRoot, struct AllowedS return RS_RET_OUT_OF_MEMORY; } SIN(allowIP.addr.NetAddr)->sin_family = AF_INET; +#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN + SIN(allowIP.addr.NetAddr)->sin_len = sizeof (struct sockaddr_in); +#endif SIN(allowIP.addr.NetAddr)->sin_port = 0; memcpy(&(SIN(allowIP.addr.NetAddr)->sin_addr.s_addr), &(SIN6(res->ai_addr)->sin6_addr.s6_addr32[3]), @@ -1040,6 +1043,9 @@ static rsRetVal AddAllowedSender(struct AllowedSenders **ppRoot, struct AllowedS * rgerhards, 2005-09-27 */ +#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN +#define SALEN(sa) ((sa)->sa_len) +#else static inline size_t SALEN(struct sockaddr *sa) { switch (sa->sa_family) { case AF_INET: return (sizeof (struct sockaddr_in)); @@ -1047,6 +1053,7 @@ static inline size_t SALEN(struct sockaddr *sa) { default: return 0; } } +#endif static void PrintAllowedSenders(int iListToPrint) { @@ -1131,7 +1138,8 @@ static inline int MaskCmp(struct NetAddr *pAllow, uint8_t bits, struct sockaddr for (; i < (sizeof ip.s6_addr32)/4; i++) ip.s6_addr32[i] = 0; - return (memcmp (ip.s6_addr, net.s6_addr, sizeof ip.s6_addr) == 0); + return (memcmp (ip.s6_addr, net.s6_addr, sizeof ip.s6_addr) == 0 && + SIN6(pFrom)->sin6_scope_id == SIN6(pAllow->addr.NetAddr)->sin6_scope_id); } case AF_INET: { struct in6_addr *ip6 = &(SIN6(pFrom))->sin6_addr; |