Net Windows automatic (un)initialize

automatic network (un)initialization on windows
NumericString 64-bit compile/warning fixes
This commit is contained in:
aleks-f
2012-12-19 00:38:18 -06:00
parent b38e5bf3df
commit 8fe3a398af
23 changed files with 207 additions and 107 deletions

View File

@@ -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)