Net Windows automatic (un)initialize

automatic network (un)initialization on windows
NumericString 64-bit compile/warning fixes

Net/src/DNS.cpp

@@ -49,32 +49,12 @@ using Poco::NumberFormatter;
 using Poco::IOException;
 
 
-namespace
-{
-	class NetworkInitializer
-	{
-	public:
-		NetworkInitializer()
-		{
-			Poco::Net::initializeNetwork();
-		}
-		
-		~NetworkInitializer()
-		{
-			Poco::Net::uninitializeNetwork();
-		}		
-	};
-}
-
-
 namespace Poco {
 namespace Net {
 
 
 HostEntry DNS::hostByName(const std::string& hostname)
 {
-	NetworkInitializer networkInitializer;
-	
 #if defined(POCO_HAVE_IPv6) || defined(POCO_HAVE_ADDRINFO)
 	struct addrinfo* pAI;
 	struct addrinfo hints;
@@ -111,8 +91,6 @@ HostEntry DNS::hostByName(const std::string& hostname)
 
 HostEntry DNS::hostByAddress(const IPAddress& address)
 {
-	NetworkInitializer networkInitializer;
-
 #if defined(POCO_HAVE_IPv6) || defined(POCO_HAVE_ADDRINFO)
 	SocketAddress sa(address, 0);
 	static char fqname[1024];
@@ -160,8 +138,6 @@ HostEntry DNS::hostByAddress(const IPAddress& address)
 
 HostEntry DNS::resolve(const std::string& address)
 {
-	NetworkInitializer networkInitializer;
-
 	IPAddress ip;
 	if (IPAddress::tryParse(address, ip))
 		return hostByAddress(ip);
@@ -172,8 +148,6 @@ HostEntry DNS::resolve(const std::string& address)
 
 IPAddress DNS::resolveOne(const std::string& address)
 {
-	NetworkInitializer networkInitializer;
-
 	const HostEntry& entry = resolve(address);
 	if (!entry.addresses().empty())
 		return entry.addresses()[0];
@@ -195,8 +169,6 @@ void DNS::flushCache()
 
 std::string DNS::hostName()
 {
-	NetworkInitializer networkInitializer;
-
 	char buffer[256];
 	int rc = gethostname(buffer, sizeof(buffer));
 	if (rc == 0)

Net/src/IPAddress.cpp

@@ -116,16 +116,10 @@ public:
 protected:
 	IPAddressImpl()
 	{
-#if defined(_WIN32)
-		Poco::Net::initializeNetwork();
-#endif
 	}
 	
 	virtual ~IPAddressImpl()
 	{
-#if defined(_WIN32)
-		Poco::Net::uninitializeNetwork();
-#endif
 	}
 
 private:

Net/src/Net.cpp

@@ -0,0 +1,117 @@
+//
+// Net.cpp
+//
+// $Id: //poco/1.4/Net/src/Net.cpp#10 $
+//
+// Library: Net
+// Package: NetCore
+// Module:  NetCore
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/Net.h"
+
+
+#if defined(POCO_OS_FAMILY_WINDOWS)
+
+
+#include "Poco/Net/SocketDefs.h"
+#include "Poco/Net/NetException.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+void Net_API initializeNetwork()
+{
+	WORD    version = MAKEWORD(2, 2);
+	WSADATA data;
+	if (WSAStartup(version, &data) != 0)
+		throw NetException("Failed to initialize network subsystem");
+}
+
+
+void Net_API uninitializeNetwork()
+{
+	WSACleanup();
+}
+
+
+} } // namespace Poco::Net
+
+
+#if !defined(POCO_NET_NO_WINDOWS_INIT)
+	#if defined (POCO_DLL)
+		BOOL APIENTRY DllMain(HANDLE, DWORD reasonForCall, LPVOID)
+		{
+			switch(reasonForCall)
+			{
+			case DLL_PROCESS_ATTACH:
+				Poco::Net::initializeNetwork();
+				break;
+			case DLL_PROCESS_DETACH:
+				Poco::Net::uninitializeNetwork();
+			}
+			return TRUE;
+		}
+	#else // POCO_STATIC
+		struct NetworkInitializer
+			/// Network initializer for windows statically
+			/// linked library.
+		{
+			NetworkInitializer()
+				/// Calls Poco::Net::initializeNetwork();
+			{
+				Poco::Net::initializeNetwork();
+			}
+
+			~NetworkInitializer()
+				/// Calls Poco::Net::uninitializeNetwork();
+			{
+				Poco::Net::uninitializeNetwork();
+			}
+		};
+
+		const NetworkInitializer pocoNetworkInitializer;
+	#endif // POCO_DLL/POCO_STATIC
+
+#endif // POCO_NET_NO_WINDOWS_INIT
+
+
+#else // POCO_OS_FAMILY_WINDOWS
+
+void Net_API initializeNetwork()
+{
+}
+
+void Net_API uninitializeNetwork()
+{
+}
+
+#endif // POCO_OS_FAMILY_WINDOWS

Net/src/SocketAddress.cpp

@@ -82,16 +82,10 @@ public:
 protected:
 	SocketAddressImpl()
 	{
-#if defined(_WIN32)
-		Poco::Net::initializeNetwork();
-#endif
 	}
 
 	virtual ~SocketAddressImpl()
 	{
-#if defined(_WIN32)
-		Poco::Net::uninitializeNetwork();
-#endif
 	}
 
 private:

Net/src/SocketImpl.cpp

@@ -67,9 +67,6 @@ SocketImpl::SocketImpl():
 	_sockfd(POCO_INVALID_SOCKET),
 	_blocking(true)
 {
-#if defined(_WIN32)
-	Poco::Net::initializeNetwork();
-#endif
 }
 
 
@@ -77,18 +74,12 @@ SocketImpl::SocketImpl(poco_socket_t sockfd):
 	_sockfd(sockfd),
 	_blocking(true)
 {
-#if defined(_WIN32)
-	Poco::Net::initializeNetwork();
-#endif
 }
 
 
 SocketImpl::~SocketImpl()
 {
 	close();
-#if defined(_WIN32)
-	Poco::Net::uninitializeNetwork();
-#endif
 }