3 files changed, 42 insertions, 18 deletions
diff --git a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
index 484c5e3..a122686 100644..100755
--- a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <string>
 
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
@@ -69,28 +70,38 @@ class BoostConnectionTest : public CppUnit::TestFixture {
 		}
 
 		void testWrite() {
+			using namespace boost::posix_time;
+
 			BoostConnection::ref testling(BoostConnection::create(boostIOServiceThread_->getIOService(), eventLoop_));
 			testling->onConnectFinished.connect(boost::bind(&BoostConnectionTest::doWrite, this, testling.get()));
 			testling->onDataRead.connect(boost::bind(&BoostConnectionTest::handleDataRead, this, _1));
 			testling->onDisconnected.connect(boost::bind(&BoostConnectionTest::handleDisconnected, this));
 			testling->connect(HostAddressPort(HostAddress(getenv("SWIFT_NETWORK_TEST_IPV4")), 5222));
-			while (receivedData_.empty()) {
+			
+			boost::posix_time::ptime start = second_clock::local_time();
+			while (receivedData_.empty() && ((second_clock::local_time() - start) < seconds(60)))  {
 				Swift::sleep(10);
 				eventLoop_->processEvents();
 			}
+			CPPUNIT_ASSERT_EQUAL(false, receivedData_.empty());
 			testling->disconnect();
 		}
 
 		void testWrite_IPv6() {
+			using namespace boost::posix_time;
+
 			BoostConnection::ref testling(BoostConnection::create(boostIOServiceThread_->getIOService(), eventLoop_));
 			testling->onConnectFinished.connect(boost::bind(&BoostConnectionTest::doWrite, this, testling.get()));
 			testling->onDataRead.connect(boost::bind(&BoostConnectionTest::handleDataRead, this, _1));
 			testling->onDisconnected.connect(boost::bind(&BoostConnectionTest::handleDisconnected, this));
-			testling->connect(HostAddressPort(HostAddress(getenv("SWIFT_NETWORK_TEST_IPV6")), 80));
-			while (receivedData_.empty()) {
+			testling->connect(HostAddressPort(HostAddress(getenv("SWIFT_NETWORK_TEST_IPV6")), 5222));
+			
+			boost::posix_time::ptime start = second_clock::local_time();
+			while (receivedData_.empty() && ((second_clock::local_time() - start) < seconds(60)))  {
 				Swift::sleep(10);
 				eventLoop_->processEvents();
 			}
+			CPPUNIT_ASSERT_EQUAL(false, receivedData_.empty());
 			testling->disconnect();
 		}
 
diff --git a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
index 09e6e66..baa42f9 100644
--- a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
+++ b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
@@ -1,30 +1,33 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
+#include <algorithm>
+#include <string>
+
+#include <boost/bind.hpp>
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/bind.hpp>
 
-#include <algorithm>
-#include <Swiften/Base/sleep.h>
-#include <string>
 #include <Swiften/Base/ByteArray.h>
+#include <Swiften/Base/Platform.h>
+#include <Swiften/Base/sleep.h>
+#include <Swiften/EventLoop/DummyEventLoop.h>
+#include <Swiften/IDN/IDNConverter.h>
+#include <Swiften/IDN/PlatformIDNConverter.h>
+#include <Swiften/Network/BoostIOServiceThread.h>
+#include <Swiften/Network/BoostTimerFactory.h>
+#include <Swiften/Network/DomainNameAddressQuery.h>
+#include <Swiften/Network/DomainNameServiceQuery.h>
+#include <Swiften/Network/NetworkFactories.h>
 #ifdef USE_UNBOUND
 #include <Swiften/Network/UnboundDomainNameResolver.h>
 #else
 #include <Swiften/Network/PlatformDomainNameResolver.h>
 #endif
-#include <Swiften/Network/BoostTimerFactory.h>
-#include <Swiften/Network/NetworkFactories.h>
-#include <Swiften/Network/BoostIOServiceThread.h>
-#include <Swiften/Network/DomainNameAddressQuery.h>
-#include <Swiften/Network/DomainNameServiceQuery.h>
-#include <Swiften/EventLoop/DummyEventLoop.h>
-#include <Swiften/IDN/IDNConverter.h>
-#include <Swiften/IDN/PlatformIDNConverter.h>
 
 using namespace Swift;
 
@@ -39,8 +42,17 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testResolveAddress);
 		CPPUNIT_TEST(testResolveAddress_Error);
 #ifndef USE_UNBOUND
+		/**
+		 * The native DNS resolver of Windows behaves oddly if the system has no global IPv6
+		 * routed address and no IPv6 reachability. It will not return IPv6 records from DNS 
+		 * requests for an unspecified protocol (IPv6 or IPv4).
+		 * The following tests are only enabled on Windows if scons is run with the 'test_ipv6=1'
+		 * argument, indicating working IPv6 on the test machine.
+		 */
+#if !defined(SWIFTEN_PLATFORM_WINDOWS) || defined(TEST_IPV6)
 		CPPUNIT_TEST(testResolveAddress_IPv6);
 		CPPUNIT_TEST(testResolveAddress_IPv4and6);
+#endif
 		CPPUNIT_TEST(testResolveAddress_International);
 #endif
 		CPPUNIT_TEST(testResolveAddress_Localhost);
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 97dc39c..e017376 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -77,7 +77,8 @@ if env["SCONS_STAGE"] == "flags" :
 			}
 
 	if env["PLATFORM"] == "win32" :
-		env.Append(CPPDEFINES = [("_WIN32_WINNT","_WIN32_WINNT_VISTA") , ("NTDDI_VERSION","NTDDI_VISTA")])
+		# 0x0600 = _WIN32_WINNT_VISTA, 0x06000000 = NTDDI_VISTA
+		env.Append(CPPDEFINES = [("_WIN32_WINNT","0x0600") , ("NTDDI_VERSION","0x06000000")])
 
 ################################################################################
 # Build