[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-498-g5bf75db

[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  5bf75dba31068d0f78c844a58a7dee3f58a4a134 (commit)
      from  3854aeb2e017e042f210ba7a5aa1be62bd690499 (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 5bf75dba31068d0f78c844a58a7dee3f58a4a134
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun May 29 15:23:34 2011 +0200

    Use safe gnulib version for `getnameinfo' and `getaddrinfo'.

diff --git a/myserver/src/base/socket/socket.cpp 
b/myserver/src/base/socket/socket.cpp
index af0743d..f68093a 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -260,7 +260,8 @@ void Socket::getLocalIPsList (string &out)
   addrinfo aiHints = {0}, *pHostInfo = NULL, *pCrtHostInfo = NULL;
   aiHints.ai_socktype = SOCK_STREAM;
 
-  checked::checkError (getaddrinfo (serverName, NULL, &aiHints, &pHostInfo));
+  checked::checkError (gnulib::getaddrinfo (serverName, NULL, &aiHints,
+                                            &pHostInfo));
   if (pHostInfo != NULL)
     {
       sockaddr_storage *pCurrentSockAddr = NULL;
@@ -415,9 +416,9 @@ int Socket::connect (const char* host, u_short port)
   gnulib::snprintf (szPort, 10, "%d", port);
 
   if (aiHints.ai_family != 0)
-    nGetaddrinfoRet = getaddrinfo (host, NULL, &aiHints, &pHostInfo);
+    nGetaddrinfoRet = gnulib::getaddrinfo (host, NULL, &aiHints, &pHostInfo);
   else
-    nGetaddrinfoRet = getaddrinfo (host, NULL, NULL, &pHostInfo);
+    nGetaddrinfoRet = gnulib::getaddrinfo (host, NULL, NULL, &pHostInfo);
   if (nGetaddrinfoRet != 0 || pHostInfo == NULL )
     return -1;
 
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 551b631..51f901f 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -1039,13 +1039,13 @@ int Server::addConnection (Socket *s, 
MYSERVER_SOCKADDRIN *asockIn)
 #if ( HAVE_IPV6 )
   int ret;
   if ( asockIn->ss_family == AF_INET )
-    ret = getnameinfo (reinterpret_cast<const sockaddr *>(asockIn),
-                       sizeof (sockaddr_in),
-                       ip, MAX_IP_STRING_LEN, NULL, 0, NI_NUMERICHOST);
+    ret = gnulib::getnameinfo (reinterpret_cast<const sockaddr *>(asockIn),
+                               sizeof (sockaddr_in),
+                               ip, MAX_IP_STRING_LEN, NULL, 0, NI_NUMERICHOST);
   else
-    ret = getnameinfo (reinterpret_cast<const sockaddr *>(asockIn),
-                       sizeof (sockaddr_in6),  ip, MAX_IP_STRING_LEN,
-                       NULL, 0, NI_NUMERICHOST);
+    ret = gnulib::getnameinfo (reinterpret_cast<const sockaddr *>(asockIn),
+                               sizeof (sockaddr_in6),  ip, MAX_IP_STRING_LEN,
+                               NULL, 0, NI_NUMERICHOST);
   if (ret)
     return -1;
 
@@ -1056,13 +1056,13 @@ int Server::addConnection (Socket *s, 
MYSERVER_SOCKADDRIN *asockIn)
   s->getsockname ((MYSERVER_SOCKADDR*)&localSockIn, &dim);
 
   if ( asockIn->ss_family == AF_INET )
-    ret = getnameinfo (reinterpret_cast<const sockaddr *>(&localSockIn),
-                       sizeof (sockaddr_in), localIp, MAX_IP_STRING_LEN,
-                       NULL, 0, NI_NUMERICHOST);
+    ret = gnulib::getnameinfo (reinterpret_cast<const sockaddr 
*>(&localSockIn),
+                               sizeof (sockaddr_in), localIp, 
MAX_IP_STRING_LEN,
+                               NULL, 0, NI_NUMERICHOST);
   else
-    ret = getnameinfo (reinterpret_cast<const sockaddr *>(&localSockIn),
-                       sizeof (sockaddr_in6), localIp, MAX_IP_STRING_LEN,
-                       NULL, 0, NI_NUMERICHOST);
+    ret = gnulib::getnameinfo (reinterpret_cast<const sockaddr 
*>(&localSockIn),
+                               sizeof (sockaddr_in6), localIp, 
MAX_IP_STRING_LEN,
+                               NULL, 0, NI_NUMERICHOST);
   if (ret)
     return -1;
 #else

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

Summary of changes:
 myserver/src/base/socket/socket.cpp |    7 ++++---
 myserver/src/server/server.cpp      |   24 ++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU MyServer