[svn] commit: r237 - in /branches/f2f200910: configure.ac src/bin/parkinglot/Makefile.am src/lib/cc/cpp/session.cc

[BIND 10 source code commits]

Author: each
Date: Fri Oct 30 17:47:35 2009
New Revision: 237

Log:
add configure test for sockaddr_in.sin_len member

Modified:
    branches/f2f200910/configure.ac
    branches/f2f200910/src/bin/parkinglot/Makefile.am
    branches/f2f200910/src/lib/cc/cpp/session.cc

Modified: branches/f2f200910/configure.ac
==============================================================================
--- branches/f2f200910/configure.ac (original)
+++ branches/f2f200910/configure.ac Fri Oct 30 17:47:35 2009
@@ -19,6 +19,15 @@
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 AC_TYPE_SIZE_T
+
+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)
+        AC_DEFINE(HAVE_SIN_LEN, 1, Define to 1 if sockaddr_in has a sin_len member)],
+        AC_MSG_RESULT(no))
 
 #
 # Check availablity of gtest, which might be used for unit tests.

Modified: branches/f2f200910/src/bin/parkinglot/Makefile.am
==============================================================================
--- branches/f2f200910/src/bin/parkinglot/Makefile.am (original)
+++ branches/f2f200910/src/bin/parkinglot/Makefile.am Fri Oct 30 17:47:35 2009
@@ -2,4 +2,4 @@
 
 bin_PROGRAMS = parkinglot
 parkinglot_SOURCES = common.cc main.cc
-parkinglot_LDADD = $(top_srcdir)/src/lib/dns/libdns.a
+parkinglot_LDADD = $(top_srcdir)/src/lib/dns/libdns.a $(top_srcdir)/src/lib/cc/cpp/libcc.a

Modified: branches/f2f200910/src/lib/cc/cpp/session.cc
==============================================================================
--- branches/f2f200910/src/lib/cc/cpp/session.cc (original)
+++ branches/f2f200910/src/lib/cc/cpp/session.cc Fri Oct 30 17:47:35 2009
@@ -36,10 +36,14 @@
     if (sock < -1)
         throw SessionError("socket() failed");
 
-    sin.sin_len = sizeof(struct sockaddr_in);
     sin.sin_family = AF_INET;
     sin.sin_port = htons(9912);
     sin.sin_addr.s_addr = INADDR_ANY;
+
+#ifdef HAVE_SIN_LEN
+    sin.sin_len = sizeof(struct sockaddr_in);
+#endif
+
     ret = connect(sock, (struct sockaddr *)&sin, sizeof(sin));
     if (ret < 0)
         throw SessionError("connect() failed");