initial attempt at more rfc2553 cleanup

bk: 4000b083_ra6Y8F1LkMcclbxqePZew

diff --git a/configure.in b/configure.in
index a7f74fc2a27a16826e8030610134936f421ed72c..7215ecc821f7fed5242a708aae27a7c197fe6f89 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -550,6 +550,21 @@ if test $ac_cv_struct_sockaddr_has_sa_len = yes; then
     AC_DEFINE(HAVE_SA_LEN_IN_STRUCT_SOCKADDR, 1, [Should be obvious...])
 fi
 
+AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_struct_sockaddr_storage,
+[AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+],[
+extern struct sockaddr_storage *ss;
+return 0;],
+       ac_cv_struct_sockaddr_storage=yes,
+       ac_cv_struct_sockaddr_storage=no)
+])
+if test $ac_cv_struct_sockaddr_storage = yes; then
+    AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Does a system header define struct sockaddr_storage?])
+fi
+
 AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
                ac_cv_have_ss_family_in_struct_ss, [
        AC_TRY_COMPILE(
@@ -3579,6 +3594,16 @@ if test $ac_cv_struct_sockaddr_has_sa_len = yes; then
     AC_DEFINE(ISC_PLATFORM_HAVESALEN, ,[ISC: struct sockaddr as sa_len?])
 fi
 
+AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--enable-ipv6], [use IPv6?]))
+
+case "$enable_ipv6" in
+       yes|''|autodetect)
+               AC_DEFINE(WANT_IPV6, ,[ISC: Want IPv6?])
+               ;;
+       no)
+               ;;
+esac
+
 AC_MSG_CHECKING(for IPv6 structures)
 AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -3590,6 +3615,66 @@ AC_TRY_COMPILE([
        [AC_MSG_RESULT(no)
         found_ipv6=no])
 
+#
+# See whether IPv6 support is provided via a Kame add-on.
+# This is done before other IPv6 linking tests so LIBS is properly set.
+#
+AC_MSG_CHECKING(for Kame IPv6 support)
+AC_ARG_WITH(kame,
+       [  --with-kame[=PATH]   use Kame IPv6 [default path /usr/local/v6]],
+       use_kame="$withval", use_kame="no")
+
+case "$use_kame" in
+       no)
+               ;;
+       yes)
+               kame_path=/usr/local/v6
+               ;;
+       *)
+               kame_path="$use_kame"
+               ;;
+esac
+
+case "$use_kame" in
+       no)
+               AC_MSG_RESULT(no)
+               ;;
+       *)
+               if test -f $kame_path/lib/libinet6.a; then
+                       AC_MSG_RESULT($kame_path/lib/libinet6.a)
+                       LIBS="-L$kame_path/lib -linet6 $LIBS"
+               else
+                       AC_MSG_ERROR([$kame_path/lib/libinet6.a not found.
+
+Please choose the proper path with the following command:
+
+    configure --with-kame=PATH
+])
+               fi
+               ;;
+esac
+
+#
+# Whether netinet6/in6.h is needed has to be defined in isc/platform.h.
+# Including it on Kame-using platforms is very bad, though, because
+# Kame uses #error against direct inclusion.   So include it on only
+# the platform that is otherwise broken without it -- BSD/OS 4.0 through 4.1.
+# This is done before the in6_pktinfo check because that's what
+# netinet6/in6.h is needed for.
+#
+case "$host" in
+*-bsdi4.[[01]]*)
+       ISC_PLATFORM_NEEDNETINET6IN6H="#define ISC_PLATFORM_NEEDNETINET6IN6H 1"
+       LWRES_PLATFORM_NEEDNETINET6IN6H="#define LWRES_PLATFORM_NEEDNETINET6IN6H 1"
+       isc_netinet6in6_hack="#include <netinet6/in6.h>"
+       ;;
+*)
+       ISC_PLATFORM_NEEDNETINET6IN6H="#undef ISC_PLATFORM_NEEDNETINET6IN6H"
+       LWRES_PLATFORM_NEEDNETINET6IN6H="#undef LWRES_PLATFORM_NEEDNETINET6IN6H"
+       isc_netinet6in6_hack=""
+       ;;
+esac
+
 AC_MSG_CHECKING([for struct if_laddrconf])
 AC_TRY_LINK([
 #include <sys/types.h>
@@ -3613,7 +3698,6 @@ AC_TRY_LINK([
 case "$found_ipv6" in
  yes)
     AC_DEFINE(ISC_PLATFORM_HAVEIPV6, ,[ISC: Have IPv6?])
-    AC_DEFINE(WANT_IPV6, ,[ISC: Want IPv6?])
 
     AC_MSG_CHECKING(for in6_pktinfo)
     AC_TRY_COMPILE([
@@ -3663,6 +3747,8 @@ found_rt_iflist
          AC_DEFINE(HAVE_IFLIST_SYSCTL,1,[ISC: Use iflist_sysctl?])],
         [AC_MSG_RESULT(no)])
 
+###
+
 case "$build" in
  $host)
     ;;

diff --git a/include/ntp_rfc2553.h b/include/ntp_rfc2553.h
index 20c732f14b4c7ec3ec301ad024eba6ab33d2ddec..674a08a504f97de19807c8f38ee69762fce93210 100644 (file)
--- a/include/ntp_rfc2553.h
+++ b/include/ntp_rfc2553.h
@@ -178,6 +178,7 @@ struct sockaddr_in6 {
                                _SS_PAD1SIZE - _SS_ALIGNSIZE)
 #endif /* HAVE_SA_LEN_IN_STRUCT_SOCKADDR */
 
+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
 struct sockaddr_storage {
 #ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
        u_int8_t        ss_len;         /* address length */
@@ -189,6 +190,7 @@ struct sockaddr_storage {
        u_int64_t       __ss_align;     /* force desired structure storage alignment */
        char            __ss_pad2[_SS_PAD2SIZE];
 };
+#endif /* not HAVE_STRUCT_SOCKADDR_STORAGE */
 
 struct addrinfo {
        int     ai_flags;       /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */