generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-18 00:15:27 +01:00
Code Issues Projects Releases Wiki Activity

Net Windows automatic (un)initialize

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Foundation/include/Poco/NumericString.h
View File

@ -221,7 +221,7 @@ namespace Impl {
/// Class ensures increment/decrement remain within boundaries.
{
public:
Ptr(char* ptr, unsigned offset): _beg(ptr), _cur(ptr), _end(ptr + offset)
Ptr(char* ptr, std::size_t offset): _beg(ptr), _cur(ptr), _end(ptr + offset)
{
}
@ -268,7 +268,7 @@ namespace Impl {
return _cur;
}
unsigned span() const
std::size_t span() const
{
return _end - _beg;
}
@ -291,7 +291,7 @@ template <typename T>
bool intToStr(T value,
unsigned short base,
char* result,
unsigned& size,
std::size_t& size,
bool prefix = false,
int width = -1,
char fill = ' ',
@ -369,7 +369,7 @@ template <typename T>
bool uIntToStr(T value,
unsigned short base,
char* result,
unsigned& size,
std::size_t& size,
bool prefix = false,
int width = -1,
char fill = ' ',
@ -446,7 +446,7 @@ bool intToStr (T number, unsigned short base, std::string& result, bool prefix =
/// bool intToStr(T, unsigned short, char*, int, int, char, char) implementation.
{
char res[POCO_MAX_INT_STRING_LEN] = {0};
unsigned size = POCO_MAX_INT_STRING_LEN;
std::size_t size = POCO_MAX_INT_STRING_LEN;
bool ret = intToStr(number, base, res, size, prefix, width, fill, thSep);
result.assign(res, size);
return ret;
@ -459,7 +459,7 @@ bool uIntToStr (T number, unsigned short base, std::string& result, bool prefix
/// bool uIntToStr(T, unsigned short, char*, int, int, char, char) implementation.
{
char res[POCO_MAX_INT_STRING_LEN] = {0};
unsigned size = POCO_MAX_INT_STRING_LEN;
std::size_t size = POCO_MAX_INT_STRING_LEN;
bool ret = uIntToStr(number, base, res, size, prefix, width, fill, thSep);
result.assign(res, size);
return ret;

60
Foundation/src/NumberFormatter.cpp
View File

@ -79,7 +79,7 @@ std::string NumberFormatter::format(bool value, BoolFormat format)
void NumberFormatter::append(std::string& str, int value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz);
str.append(result, sz);
}
@ -88,7 +88,7 @@ void NumberFormatter::append(std::string& str, int value)
void NumberFormatter::append(std::string& str, int value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz, false, width);
str.append(result, sz);
}
@ -97,7 +97,7 @@ void NumberFormatter::append(std::string& str, int value, int width)
void NumberFormatter::append0(std::string& str, int value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -106,7 +106,7 @@ void NumberFormatter::append0(std::string& str, int value, int width)
void NumberFormatter::appendHex(std::string& str, int value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(static_cast<unsigned int>(value), 0x10, result, sz);
str.append(result, sz);
}
@ -115,7 +115,7 @@ void NumberFormatter::appendHex(std::string& str, int value)
void NumberFormatter::appendHex(std::string& str, int value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(static_cast<unsigned int>(value), 0x10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -124,7 +124,7 @@ void NumberFormatter::appendHex(std::string& str, int value, int width)
void NumberFormatter::append(std::string& str, unsigned value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz);
str.append(result, sz);
}
@ -133,7 +133,7 @@ void NumberFormatter::append(std::string& str, unsigned value)
void NumberFormatter::append(std::string& str, unsigned value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz, false, width);
str.append(result, sz);
}
@ -142,7 +142,7 @@ void NumberFormatter::append(std::string& str, unsigned value, int width)
void NumberFormatter::append0(std::string& str, unsigned int value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -151,7 +151,7 @@ void NumberFormatter::append0(std::string& str, unsigned int value, int width)
void NumberFormatter::appendHex(std::string& str, unsigned value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 0x10, result, sz);
str.append(result, sz);
}
@ -160,7 +160,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned value)
void NumberFormatter::appendHex(std::string& str, unsigned value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 0x10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -169,7 +169,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned value, int width)
void NumberFormatter::append(std::string& str, long value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz);
str.append(result, sz);
}
@ -178,7 +178,7 @@ void NumberFormatter::append(std::string& str, long value)
void NumberFormatter::append(std::string& str, long value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz, false, width);
str.append(result, sz);
}
@ -187,7 +187,7 @@ void NumberFormatter::append(std::string& str, long value, int width)
void NumberFormatter::append0(std::string& str, long value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -196,7 +196,7 @@ void NumberFormatter::append0(std::string& str, long value, int width)
void NumberFormatter::appendHex(std::string& str, long value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(static_cast<unsigned long>(value), 0x10, result, sz);
str.append(result, sz);
}
@ -205,7 +205,7 @@ void NumberFormatter::appendHex(std::string& str, long value)
void NumberFormatter::appendHex(std::string& str, long value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(static_cast<unsigned long>(value), 0x10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -214,7 +214,7 @@ void NumberFormatter::appendHex(std::string& str, long value, int width)
void NumberFormatter::append(std::string& str, unsigned long value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz);
str.append(result, sz);
}
@ -223,7 +223,7 @@ void NumberFormatter::append(std::string& str, unsigned long value)
void NumberFormatter::append(std::string& str, unsigned long value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -232,7 +232,7 @@ void NumberFormatter::append(std::string& str, unsigned long value, int width)
void NumberFormatter::append0(std::string& str, unsigned long value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -241,7 +241,7 @@ void NumberFormatter::append0(std::string& str, unsigned long value, int width)
void NumberFormatter::appendHex(std::string& str, unsigned long value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 0x10, result, sz);
str.append(result, sz);
}
@ -250,7 +250,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value)
void NumberFormatter::appendHex(std::string& str, unsigned long value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 0x10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -262,7 +262,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value, int width
void NumberFormatter::append(std::string& str, Int64 value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz);
str.append(result, sz);
}
@ -271,7 +271,7 @@ void NumberFormatter::append(std::string& str, Int64 value)
void NumberFormatter::append(std::string& str, Int64 value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -280,7 +280,7 @@ void NumberFormatter::append(std::string& str, Int64 value, int width)
void NumberFormatter::append0(std::string& str, Int64 value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
intToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -289,7 +289,7 @@ void NumberFormatter::append0(std::string& str, Int64 value, int width)
void NumberFormatter::appendHex(std::string& str, Int64 value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(static_cast<UInt64>(value), 0x10, result, sz);
str.append(result, sz);
}
@ -298,7 +298,7 @@ void NumberFormatter::appendHex(std::string& str, Int64 value)
void NumberFormatter::appendHex(std::string& str, Int64 value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(static_cast<UInt64>(value), 0x10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -307,7 +307,7 @@ void NumberFormatter::appendHex(std::string& str, Int64 value, int width)
void NumberFormatter::append(std::string& str, UInt64 value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz);
str.append(result, sz);
}
@ -316,7 +316,7 @@ void NumberFormatter::append(std::string& str, UInt64 value)
void NumberFormatter::append(std::string& str, UInt64 value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -325,7 +325,7 @@ void NumberFormatter::append(std::string& str, UInt64 value, int width)
void NumberFormatter::append0(std::string& str, UInt64 value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 10, result, sz, false, width, '0');
str.append(result, sz);
}
@ -334,7 +334,7 @@ void NumberFormatter::append0(std::string& str, UInt64 value, int width)
void NumberFormatter::appendHex(std::string& str, UInt64 value)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 0x10, result, sz);
str.append(result, sz);
}
@ -343,7 +343,7 @@ void NumberFormatter::appendHex(std::string& str, UInt64 value)
void NumberFormatter::appendHex(std::string& str, UInt64 value, int width)
{
char result[NF_MAX_INT_STRING_LEN];
unsigned sz = NF_MAX_INT_STRING_LEN;
std::size_t sz = NF_MAX_INT_STRING_LEN;
uIntToStr(value, 0x10, result, sz, false, width, '0');
str.append(result, sz);
}

4
Foundation/src/NumericString.cpp
View File

@ -175,7 +175,7 @@ float strToFloat(const char* str)
int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES |
StringToDoubleConverter::ALLOW_TRAILING_SPACES;
StringToDoubleConverter converter(flags, 0.0, Single::NaN(), POCO_FLT_INF, POCO_FLT_NAN);
float result = converter.StringToFloat(str, strlen(str), &processed);
float result = converter.StringToFloat(str, static_cast<int>(strlen(str)), &processed);
return result;
}
@ -187,7 +187,7 @@ double strToDouble(const char* str)
int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES |
StringToDoubleConverter::ALLOW_TRAILING_SPACES;
StringToDoubleConverter converter(flags, 0.0, Double::NaN(), POCO_FLT_INF, POCO_FLT_NAN);
double result = converter.StringToDouble(str, strlen(str), &processed);
double result = converter.StringToDouble(str, static_cast<int>(strlen(str)), &processed);
return result;
}

2
Foundation/src/StringTokenizer.cpp
View File

@ -83,7 +83,7 @@ StringTokenizer::~StringTokenizer()
void StringTokenizer::trim (std::string& token)
{
int front = 0, back = 0, length = token.length();
std::size_t front = 0, back = 0, length = token.length();
std::string::const_iterator tIt = token.begin();
std::string::const_iterator tEnd = token.end();
for (; tIt != tEnd; ++tIt, ++front)

2
Net/Net_CE_vs90.vcproj
View File

@ -457,6 +457,8 @@
RelativePath=".\src\HostEntry.cpp"/>
<File
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\Net.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File

1
Net/Net_vs100.vcxproj
View File

@ -367,6 +367,7 @@
<ClCompile Include="src\DNS.cpp" />
<ClCompile Include="src\HostEntry.cpp" />
<ClCompile Include="src\IPAddress.cpp" />
<ClCompile Include="src\Net.cpp" />
<ClCompile Include="src\NetException.cpp" />
<ClCompile Include="src\NetworkInterface.cpp" />
<ClCompile Include="src\SocketAddress.cpp" />

3
Net/Net_vs100.vcxproj.filters
View File

@ -686,6 +686,9 @@
<ClCompile Include="src\WebSocketImpl.cpp">
<Filter>WebSocket\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Net.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\DLLVersion.rc" />

1
Net/Net_vs110.vcxproj
View File

@ -373,6 +373,7 @@
<ClCompile Include="src\DNS.cpp"/>
<ClCompile Include="src\HostEntry.cpp"/>
<ClCompile Include="src\IPAddress.cpp"/>
<ClCompile Include="src\Net.cpp"/>
<ClCompile Include="src\NetException.cpp"/>
<ClCompile Include="src\NetworkInterface.cpp"/>
<ClCompile Include="src\SocketAddress.cpp"/>

3
Net/Net_vs110.vcxproj.filters
View File

@ -425,6 +425,9 @@
<ClCompile Include="src\IPAddress.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Net.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetException.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>

2
Net/Net_vs71.vcproj
View File

@ -389,6 +389,8 @@
RelativePath=".\src\HostEntry.cpp"/>
<File
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\Net.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File

2
Net/Net_vs80.vcproj
View File

@ -410,6 +410,8 @@
RelativePath=".\src\HostEntry.cpp"/>
<File
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\Net.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File

2
Net/Net_vs90.vcproj
View File

@ -409,6 +409,8 @@
RelativePath=".\src\HostEntry.cpp"/>
<File
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\Net.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File

1
Net/Net_x64_vs100.vcxproj
View File

@ -365,6 +365,7 @@
<ClCompile Include="src\DNS.cpp"/>
<ClCompile Include="src\HostEntry.cpp"/>
<ClCompile Include="src\IPAddress.cpp"/>
<ClCompile Include="src\Net.cpp"/>
<ClCompile Include="src\NetException.cpp"/>
<ClCompile Include="src\NetworkInterface.cpp"/>
<ClCompile Include="src\SocketAddress.cpp"/>

3
Net/Net_x64_vs100.vcxproj.filters
View File

@ -425,6 +425,9 @@
<ClCompile Include="src\IPAddress.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Net.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetException.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>

1
Net/Net_x64_vs110.vcxproj
View File

@ -371,6 +371,7 @@
<ClCompile Include="src\DNS.cpp"/>
<ClCompile Include="src\HostEntry.cpp"/>
<ClCompile Include="src\IPAddress.cpp"/>
<ClCompile Include="src\Net.cpp"/>
<ClCompile Include="src\NetException.cpp"/>
<ClCompile Include="src\NetworkInterface.cpp"/>
<ClCompile Include="src\SocketAddress.cpp"/>

3
Net/Net_x64_vs110.vcxproj.filters
View File

@ -425,6 +425,9 @@
<ClCompile Include="src\IPAddress.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Net.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetException.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>

2
Net/Net_x64_vs90.vcproj
View File

@ -414,6 +414,8 @@
RelativePath=".\src\HostEntry.cpp"/>
<File
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\Net.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File

44
Net/include/Poco/Net/Net.h
View File

@ -81,25 +81,6 @@
#endif
namespace Poco {
namespace Net {
void Net_API initializeNetwork();
/// Initialize the network subsystem.
/// Calls WSAStartup() on Windows, does nothing
/// on other platforms.
void Net_API uninitializeNetwork();
/// Uninitialize the network subsystem.
/// Calls WSACleanup() on Windows, does nothing
/// on other platforms.
} } // namespace Poco::Net
// Default to enabled IPv6 support if not explicitly disabled
#if !defined(POCO_NET_NO_IPv6) && !defined (POCO_HAVE_IPv6)
#define POCO_HAVE_IPv6
@ -128,4 +109,29 @@ void Net_API uninitializeNetwork();
#endif
namespace Poco {
namespace Net {
inline void Net_API initializeNetwork();
/// Initialize the network subsystem.
inline void Net_API uninitializeNetwork();
/// Uninitialize the network subsystem.
}} // namespace Poco::Net
//
// Automate network initialization on Windows.
//
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_NET_NO_WINDOWS_INIT)
#if defined(POCO_STATIC)
extern "C" const struct NetworkInitializer pocoNetworkInitializer;
#pragma comment(linker, "/include:_pocoNetworkInitializer")
#endif // POCO_STATIC
#endif // POCO_NET_NO_WINDOWS_INIT
#endif // Net_Net_INCLUDED

28
Net/src/DNS.cpp
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)

6
Net/src/IPAddress.cpp
View File

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

117
Net/src/Net.cpp Normal file
View File

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

6
Net/src/SocketAddress.cpp
View File

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

9
Net/src/SocketImpl.cpp
View File

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