From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 22 Jun 2011 11:57:59 +0000 (-0600)
Subject: Fix BSD build issues
X-Git-Tag: take08~55^2~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d553ad9091a61a0e6b6c6c13348f7132ff45d43;p=thirdparty%2Fsquid.git

Fix BSD build issues
---

diff --git a/configure.ac b/configure.ac
index befe83fe68..36e7dcffbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2608,9 +2608,9 @@ SQUID_DEFINE_BOOL(USE_IPV6,$enable_ipv6,[Enable support for IPv6 ])
 
 if test "x$enable_ipv6" = "xyes" ; then
   SQUID_CHECK_SIN6_LEN_IN_SAI
-  SQUID_CHECK_SS_LEN_IN_SOCKADDR_STORAGE
-  SQUID_CHECK_SIN_LEN_IN_SOCKADDR_IN
 fi
+SQUID_CHECK_SS_LEN_IN_SOCKADDR_STORAGE
+SQUID_CHECK_SIN_LEN_IN_SOCKADDR_IN
 
 
 dnl Check for libcrypt
diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc
index da9bb683aa..7b56f1189d 100644
--- a/src/ip/testAddress.cc
+++ b/src/ip/testAddress.cc
@@ -659,14 +659,17 @@ testIpAddress::testAddrInfo()
     CPPUNIT_ASSERT_EQUAL( expect->ai_addrlen, ipval->ai_addrlen );
 
 #if 0
+    printf("sizeof IN(%d), IN6(%d), STORAGE(%d), \n",
+           sizeof(struct sockaddr_in), sizeof(struct sockaddr_in6), sizeof(struct sockaddr_storage));
+
     p = (unsigned int*)(expect->ai_addr);
-    printf("\nSYS-ADDR: (%d)  %x %x %x %x %x %x %x %x ...",
-           expect->ai_addrlen,
+    printf("\nSYS-ADDR: (%d) {%d} %x %x %x %x %x %x %x %x ...",
+           expect->ai_addrlen, sizeof(*p),
            p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7] );
 
     p = (unsigned int*)(ipval->ai_addr);
-    printf("\nSQD-ADDR: (%d) %x %x %x %x %x %x %x %x ...",
-           ipval->ai_addrlen,
+    printf("\nSQD-ADDR: (%d) {%d} %x %x %x %x %x %x %x %x ...",
+           ipval->ai_addrlen, sizeof(*p),
            p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7] );
     printf("\n");
 #if HAVE_SS_LEN_IN_SS
@@ -690,10 +693,23 @@ testIpAddress::testAddrInfo()
                           ((struct sockaddr_in*)ipval->ai_addr)->sin_len );
     CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_in*)ipval->ai_addr)->sin_len, ipval->ai_addrlen );
 #endif
-    CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_family,
-                          ((struct sockaddr_in6*)ipval->ai_addr)->sin6_family );
-    CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_port,
-                          ((struct sockaddr_in6*)ipval->ai_addr)->sin6_port );
+
+    if (expect->ai_addrlen == sizeof(struct sockaddr_in)) {
+//printf("FAMILY %d %d\n", ((struct sockaddr_in*)expect->ai_addr)->sin_family, ((struct sockaddr_in*)ipval->ai_addr)->sin_family);
+        CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_family,
+                              ((struct sockaddr_in*)ipval->ai_addr)->sin_family );
+//printf("PORT %d %d\n", ((struct sockaddr_in*)expect->ai_addr)->sin_port, ((struct sockaddr_in*)ipval->ai_addr)->sin_port);
+        CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_port,
+                              ((struct sockaddr_in*)ipval->ai_addr)->sin_port );
+    }
+    if (expect->ai_addrlen == sizeof(struct sockaddr_in6)) {
+//printf("FAMILY %d %d\n", ((struct sockaddr_in6*)expect->ai_addr)->sin6_family, ((struct sockaddr_in6*)ipval->ai_addr)->sin6_family);
+        CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_family,
+                              ((struct sockaddr_in6*)ipval->ai_addr)->sin6_family );
+//printf("PORT %d %d\n", ((struct sockaddr_in6*)expect->ai_addr)->sin6_port, ((struct sockaddr_in6*)ipval->ai_addr)->sin6_port);
+        CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_port,
+                              ((struct sockaddr_in6*)ipval->ai_addr)->sin6_port );
+    }
 
     CPPUNIT_ASSERT( memcmp( expect->ai_addr, ipval->ai_addr, expect->ai_addrlen ) == 0 );