[cpp-sp COMMIT] in /branches/REL_2: Shibboleth.sln configs/console.logger configs/native.logger.in configs/shibd.logg...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 17 18:35:42 2011
New Revision: 3531

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3531&view=rev
Log:
Windows fixes for IPv6 and CIDR support.

Modified:
    branches/REL_2/Shibboleth.sln
    branches/REL_2/configs/console.logger
    branches/REL_2/configs/native.logger.in
    branches/REL_2/configs/shibd.logger.in
    branches/REL_2/shibsp/remoting/impl/SocketListener.h
    branches/REL_2/shibsp/remoting/impl/TCPListener.cpp
    branches/REL_2/shibsp/shibsp-lite.vcxproj
    branches/REL_2/shibsp/shibsp.vcxproj
    branches/REL_2/shibsp/util/IPRange.cpp
    branches/REL_2/shibsp/util/IPRange.h

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3531&r1=3530&r2=3531&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Mon Oct 17 18:35:42 2011
@@ -72,7 +72,6 @@
 	ProjectSection(SolutionItems) = preProject
 		m4\acinclude.m4 = m4\acinclude.m4
 		m4\acx_pthread.m4 = m4\acx_pthread.m4
-		config_win32.h = config_win32.h
 		configure.ac = configure.ac
 		doxygen.am = doxygen.am
 		doxygen.cfg = doxygen.cfg

Modified: branches/REL_2/configs/console.logger
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/console.logger?rev=3531&r1=3530&r2=3531&view=diff
==============================================================================
--- branches/REL_2/configs/console.logger (original)
+++ branches/REL_2/configs/console.logger Mon Oct 17 18:35:42 2011
@@ -3,6 +3,7 @@
 # fairly verbose for DEBUG, so generally leave at INFO
 log4j.category.XMLTooling.XMLObject=INFO
 log4j.category.XMLTooling.KeyInfoResolver=INFO
+log4j.category.Shibboleth.IPRange=INFO
 log4j.category.Shibboleth.PropertySet=INFO
 
 # raise for low-level tracing of SOAP client HTTP/SSL behavior

Modified: branches/REL_2/configs/native.logger.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/native.logger.in?rev=3531&r1=3530&r2=3531&view=diff
==============================================================================
--- branches/REL_2/configs/native.logger.in (original)
+++ branches/REL_2/configs/native.logger.in Mon Oct 17 18:35:42 2011
@@ -4,6 +4,7 @@
 # fairly verbose for DEBUG, so generally leave at INFO
 log4j.category.XMLTooling.XMLObject=INFO
 log4j.category.XMLTooling.KeyInfoResolver=INFO
+log4j.category.Shibboleth.IPRange=INFO
 log4j.category.Shibboleth.PropertySet=INFO
 
 # raise for low-level tracing of SOAP client HTTP/SSL behavior

Modified: branches/REL_2/configs/shibd.logger.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd.logger.in?rev=3531&r1=3530&r2=3531&view=diff
==============================================================================
--- branches/REL_2/configs/shibd.logger.in (original)
+++ branches/REL_2/configs/shibd.logger.in Mon Oct 17 18:35:42 2011
@@ -4,6 +4,7 @@
 # fairly verbose for DEBUG, so generally leave at INFO
 log4j.category.XMLTooling.XMLObject=INFO
 log4j.category.XMLTooling.KeyInfoResolver=INFO
+log4j.category.Shibboleth.IPRange=INFO
 log4j.category.Shibboleth.PropertySet=INFO
 
 # raise for low-level tracing of SOAP client HTTP/SSL behavior

Modified: branches/REL_2/shibsp/remoting/impl/SocketListener.h
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/remoting/impl/SocketListener.h?rev=3531&r1=3530&r2=3531&view=diff
==============================================================================
--- branches/REL_2/shibsp/remoting/impl/SocketListener.h (original)
+++ branches/REL_2/shibsp/remoting/impl/SocketListener.h Mon Oct 17 18:35:42 2011
@@ -38,7 +38,7 @@
 #include <xmltooling/util/Threads.h>
 
 #ifdef WIN32
-# include <winsock.h>
+# include <winsock2.h>
 #endif
 
 namespace shibsp {

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=3531&r1=3530&r2=3531&view=diff
==============================================================================
--- branches/REL_2/shibsp/remoting/impl/TCPListener.cpp (original)
+++ branches/REL_2/shibsp/remoting/impl/TCPListener.cpp Mon Oct 17 18:35:42 2011
@@ -205,7 +205,7 @@
     ::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
 
 #ifdef WIN32
-    if (SOCKET_ERROR==::bind(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.ss_len) || SOCKET_ERROR==::listen(s, 3)) {
+    if (SOCKET_ERROR==::bind(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)) || SOCKET_ERROR==::listen(s, 3)) {
         log_error("bind");
         close(s);
         return false;
@@ -229,7 +229,7 @@
 bool TCPListener::connect(ShibSocket& s) const
 {
 #ifdef WIN32
-    if(SOCKET_ERROR==::connect(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.ss_len))
+    if(SOCKET_ERROR==::connect(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)))
         return log_error("connect");
 #else
 # ifdef HAVE_STRUCT_SOCKADDR_STORAGE

Modified: branches/REL_2/shibsp/shibsp-lite.vcxproj

[... 128 lines stripped ...]