Ignore sockaddr_{sin,sin6,sun}.{sin,sin6,sun}_len even on systems that define it

diff --git a/configure b/configure
index ea02de09a0bd776f0f0acc3e3085bcfca5dbe2f4..a854aed4c48395cdd332e6ca66b013eaa68d1d93 100755 (executable)
--- a/configure
+++ b/configure
@@ -739,7 +739,6 @@ ISC_IRS_GETNAMEINFOSOCKLEN
 ISC_IRS_NEEDADDRINFO
 ISC_PLATFORM_HAVETFO
 ISC_PLATFORM_NEEDPORTT
-ISC_PLATFORM_HAVESALEN
 ISC_PLATFORM_HAVEIF_LADDRCONF
 ISC_PLATFORM_HAVEIF_LADDRREQ
 BIND9_CO_RULE
@@ -17917,33 +17916,6 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_len in struct sockaddr" >&5
-$as_echo_n "checking for sa_len in struct sockaddr... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-int
-main ()
-{
-struct sockaddr sa; sa.sa_len = 0; return (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       ISC_PLATFORM_HAVESALEN="#undef ISC_PLATFORM_HAVESALEN"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
 #
 # Look for in_port_t.
 #

diff --git a/configure.in b/configure.in
index b419d1fcecc6f7b6e70804983f58b5e3a6be45c3..b919987e8e1a6f0e273adcc14e473f758bb3cb25 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1977,17 +1977,6 @@ AC_TRY_LINK([
        ISC_PLATFORM_HAVEIF_LADDRCONF="#undef ISC_PLATFORM_HAVEIF_LADDRCONF"])
 AC_SUBST(ISC_PLATFORM_HAVEIF_LADDRCONF)
 
-AC_MSG_CHECKING(for sa_len in struct sockaddr)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>],
-[struct sockaddr sa; sa.sa_len = 0; return (0);],
-       [AC_MSG_RESULT(yes)
-       ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1"],
-       [AC_MSG_RESULT(no)
-       ISC_PLATFORM_HAVESALEN="#undef ISC_PLATFORM_HAVESALEN"])
-AC_SUBST(ISC_PLATFORM_HAVESALEN)
-
 #
 # Look for in_port_t.
 #

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 985e08b53d76d2ded62798426d1e2ff82d52fbf6..deb4efad407c315c17de889af31a0af674d1c647 100644 (file)
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -30,12 +30,6 @@
  *** Network.
  ***/
 
-/*! \brief
- * If sockaddrs on this system have an sa_len field, ISC_PLATFORM_HAVESALEN
- * will be defined.
- */
-@ISC_PLATFORM_HAVESALEN@
-
 /*! \brief
  * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined.
  */

diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index fcbd0ec743671bbfeebd1dd950245b0d7ebd6297..2fe1a5ba64fd7b7443b4e5091e7df60bc3d882d0 100644 (file)
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -242,9 +242,6 @@ isc_sockaddr_any(isc_sockaddr_t *sockaddr)
 {
        memset(sockaddr, 0, sizeof(*sockaddr));
        sockaddr->type.sin.sin_family = AF_INET;
-#ifdef ISC_PLATFORM_HAVESALEN
-       sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
-#endif
        sockaddr->type.sin.sin_addr.s_addr = INADDR_ANY;
        sockaddr->type.sin.sin_port = 0;
        sockaddr->length = sizeof(sockaddr->type.sin);
@@ -256,9 +253,6 @@ isc_sockaddr_any6(isc_sockaddr_t *sockaddr)
 {
        memset(sockaddr, 0, sizeof(*sockaddr));
        sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_PLATFORM_HAVESALEN
-       sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
        sockaddr->type.sin6.sin6_addr = in6addr_any;
        sockaddr->type.sin6.sin6_port = 0;
        sockaddr->length = sizeof(sockaddr->type.sin6);
@@ -271,9 +265,6 @@ isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
 {
        memset(sockaddr, 0, sizeof(*sockaddr));
        sockaddr->type.sin.sin_family = AF_INET;
-#ifdef ISC_PLATFORM_HAVESALEN
-       sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
-#endif
        sockaddr->type.sin.sin_addr = *ina;
        sockaddr->type.sin.sin_port = htons(port);
        sockaddr->length = sizeof(sockaddr->type.sin);
@@ -300,9 +291,6 @@ isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6,
 {
        memset(sockaddr, 0, sizeof(*sockaddr));
        sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_PLATFORM_HAVESALEN
-       sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
        sockaddr->type.sin6.sin6_addr = *ina6;
        sockaddr->type.sin6.sin6_port = htons(port);
        sockaddr->length = sizeof(sockaddr->type.sin6);
@@ -315,9 +303,6 @@ isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
 {
        memset(sockaddr, 0, sizeof(*sockaddr));
        sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_PLATFORM_HAVESALEN
-       sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
        sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff;
        sockaddr->type.sin6.sin6_addr.s6_addr[11] = 0xff;
        memmove(&sockaddr->type.sin6.sin6_addr.s6_addr[12], ina, 4);
@@ -363,17 +348,11 @@ isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na,
        switch (na->family) {
        case AF_INET:
                sockaddr->length = sizeof(sockaddr->type.sin);
-#ifdef ISC_PLATFORM_HAVESALEN
-               sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
-#endif
                sockaddr->type.sin.sin_addr = na->type.in;
                sockaddr->type.sin.sin_port = htons(port);
                break;
        case AF_INET6:
                sockaddr->length = sizeof(sockaddr->type.sin6);
-#ifdef ISC_PLATFORM_HAVESALEN
-               sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
                memmove(&sockaddr->type.sin6.sin6_addr, &na->type.in6, 16);
                sockaddr->type.sin6.sin6_scope_id = isc_netaddr_getzone(na);
                sockaddr->type.sin6.sin6_port = htons(port);
@@ -488,10 +467,6 @@ isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path) {
        memset(sockaddr, 0, sizeof(*sockaddr));
        sockaddr->length = sizeof(sockaddr->type.sunix);
        sockaddr->type.sunix.sun_family = AF_UNIX;
-#ifdef ISC_PLATFORM_HAVESALEN
-       sockaddr->type.sunix.sun_len =
-                       (unsigned char)sizeof(sockaddr->type.sunix);
-#endif
        strlcpy(sockaddr->type.sunix.sun_path, path,
                sizeof(sockaddr->type.sunix.sun_path));
        return (ISC_R_SUCCESS);

diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index fcccb7946d3ba24b05d31164e6fb059d552d3a8d..3fa64537ac81949805d5f0e8e729a8853f030abf 100644 (file)
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -738,19 +738,8 @@ internal_current(isc_interfaceiter_t *iter) {
  */
 static isc_result_t
 internal_next4(isc_interfaceiter_t *iter) {
-#ifdef ISC_PLATFORM_HAVESALEN
-       struct ifreq *ifrp;
-#endif
 
        if (iter->pos < (unsigned int) iter->ifc.ifc_len) {
-#ifdef ISC_PLATFORM_HAVESALEN
-               ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
-
-               if (ifrp->ifr_addr.sa_len > sizeof(struct sockaddr))
-                       iter->pos += sizeof(ifrp->ifr_name) +
-                                    ifrp->ifr_addr.sa_len;
-               else
-#endif
                        iter->pos += sizeof(struct ifreq);
 
        } else {
@@ -767,23 +756,13 @@ internal_next4(isc_interfaceiter_t *iter) {
 #if defined(SIOCGLIFCONF) && defined(SIOCGLIFADDR)
 static isc_result_t
 internal_next6(isc_interfaceiter_t *iter) {
-#ifdef ISC_PLATFORM_HAVESALEN
-       struct LIFREQ *ifrp;
-#endif
 
        if (iter->result6 != ISC_R_SUCCESS && iter->result6 != ISC_R_IGNORE)
                return (iter->result6);
 
        REQUIRE(iter->pos6 < (unsigned int) iter->lifc.lifc_len);
 
-#ifdef ISC_PLATFORM_HAVESALEN
-       ifrp = (struct LIFREQ *)((char *) iter->lifc.lifc_req + iter->pos6);
-
-       if (ifrp->lifr_addr.sa_len > sizeof(struct sockaddr))
-               iter->pos6 += sizeof(ifrp->lifr_name) + ifrp->lifr_addr.sa_len;
-       else
-#endif
-               iter->pos6 += sizeof(struct LIFREQ);
+       iter->pos6 += sizeof(struct LIFREQ);
 
        if (iter->pos6 >= (unsigned int) iter->lifc.lifc_len)
                return (ISC_R_NOMORE);

diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index f13065623f559e3d9240fc444d2e672efa33b14c..feb275e0f78f68d34319d44d2588677ba4723180 100644 (file)
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -209,14 +209,8 @@ internal_current(isc_interfaceiter_t *iter) {
                                dst_sa = sa;
                                break;
                        }
-#ifdef ISC_PLATFORM_HAVESALEN
-                       sa = (struct sockaddr *)((char*)(sa)
-                                        + ROUNDUP(sa->sa_len));
-#else
-                       /* XXX untested. */
                        sa = (struct sockaddr *)((char*)(sa)
                                         + ROUNDUP(sizeof(struct sockaddr)));
-#endif
                }
 
                if (addr_sa == NULL)