fix ipv6 unused warning, add os check for crl monitor

This commit is contained in:
toddouska
2012-11-16 10:47:13 -08:00
parent 4a7e56442a
commit 9ac2eaa3d6
4 changed files with 13 additions and 3 deletions

View File

@ -612,7 +612,12 @@ AC_ARG_ENABLE(crl-monitor,
if test "$ENABLED_CRL_MONITOR" = "yes" if test "$ENABLED_CRL_MONITOR" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_MONITOR" case $host_os in
*linux* | *darwin*)
AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_MONITOR" ;;
*)
AC_MSG_ERROR([crl monitor only allowed on linux or OS X]) ;;
esac
fi fi
AM_CONDITIONAL([BUILD_CRL_MONITOR], [test "x$ENABLED_CRL_MONITOR" = "xyes"]) AM_CONDITIONAL([BUILD_CRL_MONITOR], [test "x$ENABLED_CRL_MONITOR" = "xyes"])

View File

@ -338,6 +338,7 @@ static INLINE void build_addr(SOCKADDR_IN_T* addr,
else else
addr->sin_addr.s_addr = inet_addr(host); addr->sin_addr.s_addr = inet_addr(host);
#else #else
(void)peer;
addr->sin6_family = AF_INET_V; addr->sin6_family = AF_INET_V;
addr->sin6_port = htons(port); addr->sin6_port = htons(port);
addr->sin6_addr = in6addr_loopback; addr->sin6_addr = in6addr_loopback;

View File

@ -397,7 +397,7 @@ static void* DoMonitor(void* arg)
} }
#elif __linux__ #elif defined(__linux__)
#include <sys/types.h> #include <sys/types.h>
#include <sys/inotify.h> #include <sys/inotify.h>
@ -456,6 +456,9 @@ static void* DoMonitor(void* arg)
} }
#else
#error "CRL monitor only currently supported on linux or mach"
#endif /* MACH or linux */ #endif /* MACH or linux */

View File

@ -10,4 +10,5 @@ int SuiteTest(void);
int HashTest(void); int HashTest(void);
#endif /* CyaSSL_UNIT_H */ #endif /* CyaSSL_UNIT_H */