[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-258-g3bc226c

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  3bc226cb84df485ebc5d14db26a5f2c1f75ceb92 (commit)
       via  bce46e8e06ca3db5c36f9e2cb3a0ca56f9eff1e3 (commit)
       via  24ac2a8932d6cb1bcd874bc5c5e2cc5bdfa35e7b (commit)
      from  c113da3f88c4f45c9e297c3150fc400c36e5560e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 3bc226cb84df485ebc5d14db26a5f2c1f75ceb92
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Jun 20 21:53:40 2010 +0200

    Use gnulib macro's to detect IPv6.

diff --git a/myserver/configure.ac b/myserver/configure.ac
index af0fc26..11b8468 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -80,9 +80,6 @@ else
    MAKE_DOC=yes
 fi
 
-AC_ARG_ENABLE([ipv6], [--enable-ipv6 Build with IPv6 support],
-                     enable_ipv6="yes", enable_ipv6="")
-
 AC_ARG_ENABLE([tests], [--disable-tests Disable the tests suite],
                        enable_tests="$enableval", enable_tests="yes")
 
@@ -244,37 +241,6 @@ fi
 AC_SUBST(ZLIB_LIB)
 AC_SUBST(SSL_LIB)
 
-if test x$enable_ipv6 = xyes; then
-    dnl Check for IPv6
-    AC_MSG_CHECKING([for IPv6])
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */
-    #include <sys/types.h>
-    #include <sys/socket.h>
-    main()
-    {
-     if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-       exit(1);
-     else
-       exit(0);
-    }
-    ]])],[ AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_IPV6, 1, [Enable IPv6 support])
-    ],[ AC_MSG_RESULT(no)
-      AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
-      AC_MSG_ERROR([
-*** Cannot enable IPv6 support
-])
-    ],[ AC_MSG_RESULT(no)
-      AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
-      AC_MSG_ERROR([
-*** Cannot enable IPv6 support
-])
-    
-    ])
-else
-    AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
-fi
-
 if test "x$enable_tests" = xyes; then
   dnl Looking for cppunit
   AM_PATH_CPPUNIT(1.12.0, have_cppunit=yes)



commit bce46e8e06ca3db5c36f9e2cb3a0ca56f9eff1e3
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Jun 20 21:52:52 2010 +0200

    Fix some build errors when using IPv6

diff --git a/myserver/src/base/socket/socket.cpp 
b/myserver/src/base/socket/socket.cpp
index 57eb5c9..80c67b4 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -255,32 +255,30 @@ int Socket::getLocalIPsList (string &out)
 
   Socket::gethostname (serverName, HOST_NAME_MAX);
 #if HAVE_IPV6
-  addrinfo aiHints = { 0 }, *pHostInfo = NULL, *pCrtHostInfo = NULL;
+  addrinfo aiHints = {0}, *pHostInfo = NULL, *pCrtHostInfo = NULL;
   aiHints.ai_socktype = SOCK_STREAM;
-  if ( getaddrinfo (serverName, NULL, &aiHints, &pHostInfo) == 0 &&
-       pHostInfo != NULL )
+  if (getaddrinfo (serverName, NULL, &aiHints, &pHostInfo) == 0
+      && pHostInfo != NULL)
     {
       sockaddr_storage *pCurrentSockAddr = NULL;
       char straddr[NI_MAXHOST] = "";
       memset (straddr, 0, NI_MAXHOST);
       ostringstream stream;
-      for ( pCrtHostInfo = pHostInfo; pCrtHostInfo != NULL;
-            pCrtHostInfo = pCrtHostInfo->ai_next )
+      for (pCrtHostInfo = pHostInfo; pCrtHostInfo != NULL;
+           pCrtHostInfo = pCrtHostInfo->ai_next)
         {
-          pCurrentSockAddr =
-            reinterpret_cast<sockaddr_storage *>(pCrtHostInfo->ai_addr);
+          pCurrentSockAddr = (sockaddr_storage *)(pCrtHostInfo->ai_addr);
           if ( pCurrentSockAddr == NULL )
             continue;
 
-          if ( !getnameinfo (reinterpret_cast<sockaddr *>(pCurrentSockAddr),
-                             sizeof (sockaddr_storage), straddr, NI_MAXHOST,
-                             NULL, 0, NI_NUMERICHOST) )
-            {
-              stream << ( !stream.str ().empty () ? ", " : "" ) << straddr;
-            }
-          else
+          if (getnameinfo (pCrtHostInfo->ai_addr,
+                           sizeof (sockaddr_storage), straddr, NI_MAXHOST,
+                           NULL, 0, NI_NUMERICHOST))
             return -1;
+
+          stream << ( !stream.str ().empty () ? ", " : "" ) << straddr;
         }
+
       out.assign (stream.str ());
       freeaddrinfo (pHostInfo);
     }
@@ -289,12 +287,10 @@ int Socket::getLocalIPsList (string &out)
   MYSERVER_HOSTENT *localhe;
   in_addr ia;
   localhe = Socket::gethostbyname (serverName);
-
   if (localhe)
     {
       ostringstream stream;
       int i;
-      /*! Print all the interfaces IPs. */
       for (i = 0; (localhe->h_addr_list[i]); i++)
         {
 # ifdef WIN32
@@ -417,7 +413,7 @@ int Socket::connect (const char* host, u_short port)
     }
 
   memset (szPort, 0, sizeof (char)*10);
-  checked::snprintf (szPort, 10, "%d", port);
+  gnulib::snprintf (szPort, 10, "%d", port);
 
   if (aiHints.ai_family != 0)
     nGetaddrinfoRet = getaddrinfo (host, NULL, &aiHints, &pHostInfo);
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 79a4e07..710d5c3 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -1037,6 +1037,7 @@ int Server::addConnection (Socket *s, MYSERVER_SOCKADDRIN 
*asockIn)
     return -1;
 
 #if ( HAVE_IPV6 )
+  int ret;
   if ( asockIn->ss_family == AF_INET )
     ret = getnameinfo (reinterpret_cast<const sockaddr *>(asockIn),
                        sizeof (sockaddr_in),



commit 24ac2a8932d6cb1bcd874bc5c5e2cc5bdfa35e7b
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Jun 20 21:29:09 2010 +0200

    Add new module `getaddrinfo'.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 630df4d..3bb098f 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -34,6 +34,7 @@ crypto/sha1
 connect
 c++defs
 fsync
+getaddrinfo
 getcwd
 getopt-gnu
 getpeername

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap.conf             |    1 +
 myserver/configure.ac               |   34 ----------------------------------
 myserver/src/base/socket/socket.cpp |   30 +++++++++++++-----------------
 myserver/src/server/server.cpp      |    1 +
 4 files changed, 15 insertions(+), 51 deletions(-)


hooks/post-receive
-- 
GNU MyServer