[cpp-sp COMMIT] /branches/REL_2/shibsp/remoting/impl/TCPListener.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 15 08:08:11 2011
New Revision: 3549

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3549&view=rev
Log:
Debian doesn't support sockaddr len in userspace.

Modified:
    branches/REL_2/shibsp/remoting/impl/TCPListener.cpp

Modified: branches/REL_2/shibsp/remoting/impl/TCPListener.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/remoting/impl/TCPListener.cpp?rev=3549&r1=3548&r2=3549&view=diff
==============================================================================
--- branches/REL_2/shibsp/remoting/impl/TCPListener.cpp (original)
+++ branches/REL_2/shibsp/remoting/impl/TCPListener.cpp Thu Dec 15 08:08:11 2011
@@ -211,12 +211,7 @@
         return false;
     }
 #else
-# ifdef HAVE_STRUCT_SOCKADDR_STORAGE
-    if (::bind(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.ss_len) < 0)
-# else
-    if (::bind(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.sin_len) < 0)
-# endif
-    {
+    if (::bind(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)) < 0) {
         log_error("bind");
         close(s);
         return false;
@@ -232,11 +227,7 @@
     if(SOCKET_ERROR==::connect(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)))
         return log_error("connect");
 #else
-# ifdef HAVE_STRUCT_SOCKADDR_STORAGE
-    if (::connect(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.ss_len) < 0)
-# else
-    if (::connect(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.sin_len) < 0)
-# endif
+    if (::connect(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)) < 0)
         return log_error("connect");
 #endif
     return true;