generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-20 14:24:35 +01:00
Code Issues Projects Releases Wiki Activity

SF# 3563057: Move NetworkInterfaceTest to NetCore suite

Browse Source 
fix NetworkInterface name/displayName
This commit is contained in:
Aleksandar Fabijanic 2012-09-08 02:08:58 +00:00
parent cfba98dd50
commit 889f420a0b
16 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Net/Net_CE_vs90.vcproj
View File

@ -442,6 +442,8 @@
RelativePath=".\include\Poco\Net\Net.h"/>
<File
RelativePath=".\include\Poco\Net\NetException.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
<File
@ -457,6 +459,8 @@
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\SocketAddress.cpp"/>
</Filter>
@ -473,8 +477,6 @@
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
<File
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\RawSocket.h"/>
<File
@ -504,8 +506,6 @@
RelativePath=".\src\DialogSocket.cpp"/>
<File
RelativePath=".\src\MulticastSocket.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\RawSocket.cpp"/>
<File

12
Net/Net_vs100.vcxproj.filters
View File

@ -162,9 +162,6 @@
<ClInclude Include="include\Poco\Net\MulticastSocket.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Net\RawSocket.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
@ -411,6 +408,9 @@
<ClInclude Include="include\Poco\Net\WebSocketImpl.h">
<Filter>WebSocket\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
<Filter>NetCore\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\DNS.cpp">
@ -440,9 +440,6 @@
<ClCompile Include="src\MulticastSocket.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterface.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\RawSocket.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
@ -680,6 +677,9 @@
<ClCompile Include="src\WebSocketImpl.cpp">
<Filter>WebSocket\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterface.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\DLLVersion.rc" />

8
Net/Net_vs71.vcproj
View File

@ -374,6 +374,8 @@
RelativePath=".\include\Poco\Net\Net.h"/>
<File
RelativePath=".\include\Poco\Net\NetException.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
<File
@ -389,6 +391,8 @@
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\SocketAddress.cpp"/>
</Filter>
@ -405,8 +409,6 @@
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
<File
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\RawSocket.h"/>
<File
@ -436,8 +438,6 @@
RelativePath=".\src\DialogSocket.cpp"/>
<File
RelativePath=".\src\MulticastSocket.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\RawSocket.cpp"/>
<File

8
Net/Net_vs80.vcproj
View File

@ -395,6 +395,8 @@
RelativePath=".\include\Poco\Net\Net.h"/>
<File
RelativePath=".\include\Poco\Net\NetException.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
<File
@ -410,6 +412,8 @@
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\SocketAddress.cpp"/>
</Filter>
@ -426,8 +430,6 @@
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
<File
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\RawSocket.h"/>
<File
@ -457,8 +459,6 @@
RelativePath=".\src\DialogSocket.cpp"/>
<File
RelativePath=".\src\MulticastSocket.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\RawSocket.cpp"/>
<File

8
Net/Net_vs90.vcproj
View File

@ -394,6 +394,8 @@
RelativePath=".\include\Poco\Net\Net.h"/>
<File
RelativePath=".\include\Poco\Net\NetException.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
<File
@ -409,6 +411,8 @@
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\SocketAddress.cpp"/>
</Filter>
@ -425,8 +429,6 @@
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
<File
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\RawSocket.h"/>
<File
@ -456,8 +458,6 @@
RelativePath=".\src\DialogSocket.cpp"/>
<File
RelativePath=".\src\MulticastSocket.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\RawSocket.cpp"/>
<File

12
Net/Net_x64_vs100.vcxproj.filters
View File

@ -162,9 +162,6 @@
<ClInclude Include="include\Poco\Net\MulticastSocket.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Net\RawSocket.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
@ -411,6 +408,9 @@
<ClInclude Include="include\Poco\Net\WebSocketImpl.h">
<Filter>WebSocket\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
<Filter>NetCore\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\DNS.cpp">
@ -440,9 +440,6 @@
<ClCompile Include="src\MulticastSocket.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterface.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\RawSocket.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
@ -680,6 +677,9 @@
<ClCompile Include="src\WebSocketImpl.cpp">
<Filter>WebSocket\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterface.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\DLLVersion.rc" />

8
Net/Net_x64_vs90.vcproj
View File

@ -399,6 +399,8 @@
RelativePath=".\include\Poco\Net\Net.h"/>
<File
RelativePath=".\include\Poco\Net\NetException.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
<File
@ -414,6 +416,8 @@
RelativePath=".\src\IPAddress.cpp"/>
<File
RelativePath=".\src\NetException.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\SocketAddress.cpp"/>
</Filter>
@ -430,8 +434,6 @@
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
<File
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
<File
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
<File
RelativePath=".\include\Poco\Net\RawSocket.h"/>
<File
@ -461,8 +463,6 @@
RelativePath=".\src\DialogSocket.cpp"/>
<File
RelativePath=".\src\MulticastSocket.cpp"/>
<File
RelativePath=".\src\NetworkInterface.cpp"/>
<File
RelativePath=".\src\RawSocket.cpp"/>
<File

12
Net/src/NetworkInterface.cpp
View File

@ -4,7 +4,7 @@
// $Id: //poco/1.4/Net/src/NetworkInterface.cpp#9 $
//
// Library: Net
// Package: Sockets
// Package: NetCore
// Module: NetworkInterface
//
// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
@ -970,13 +970,17 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
#endif
if (pAddress->Flags & IP_ADAPTER_IPV4_ENABLED) ifIndex = pAddress->IfIndex;
std::string name(pAddress->AdapterName);
std::string name;
std::string displayName;
#ifdef POCO_WIN32_UTF8
Poco::UnicodeConverter::toUTF8(pAddress->FriendlyName, displayName);
Poco::UnicodeConverter::toUTF8(pAddress->FriendlyName, name);
Poco::UnicodeConverter::toUTF8(pAddress->Description, displayName);
#else
char nameBuffer[1024];
rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, nameBuffer, sizeof(nameBuffer), NULL, NULL);
if (rc) name = nameBuffer;
char displayNameBuffer[1024];
int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->Description, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
if (rc) displayName = displayNameBuffer;
#endif

8
Net/testsuite/TestSuite_CE_vs90.vcproj
View File

@ -466,6 +466,8 @@
RelativePath=".\src\IPAddressTest.h"/>
<File
RelativePath=".\src\NetCoreTestSuite.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\SocketAddressTest.h"/>
</Filter>
@ -477,6 +479,8 @@
RelativePath=".\src\IPAddressTest.cpp"/>
<File
RelativePath=".\src\NetCoreTestSuite.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\SocketAddressTest.cpp"/>
</Filter>
@ -518,8 +522,6 @@
RelativePath=".\src\MulticastEchoServer.h"/>
<File
RelativePath=".\src\MulticastSocketTest.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\RawSocketTest.h"/>
<File
@ -545,8 +547,6 @@
RelativePath=".\src\MulticastEchoServer.cpp"/>
<File
RelativePath=".\src\MulticastSocketTest.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\RawSocketTest.cpp"/>
<File

12
Net/testsuite/TestSuite_vs100.vcxproj.filters
View File

@ -177,9 +177,6 @@
<ClInclude Include="src\MulticastSocketTest.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="src\NetworkInterfaceTest.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="src\RawSocketTest.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
@ -309,6 +306,9 @@
<ClInclude Include="src\WebSocketTestSuite.h">
<Filter>WebSocket\Header Files</Filter>
</ClInclude>
<ClInclude Include="src\NetworkInterfaceTest.h">
<Filter>NetCore\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\DNSTest.cpp">
@ -347,9 +347,6 @@
<ClCompile Include="src\MulticastSocketTest.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterfaceTest.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\RawSocketTest.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
@ -479,5 +476,8 @@
<ClCompile Include="src\WebSocketTestSuite.cpp">
<Filter>WebSocket\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterfaceTest.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

8
Net/testsuite/TestSuite_vs71.vcproj
View File

@ -401,6 +401,8 @@
RelativePath=".\src\IPAddressTest.h"/>
<File
RelativePath=".\src\NetCoreTestSuite.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\SocketAddressTest.h"/>
</Filter>
@ -412,6 +414,8 @@
RelativePath=".\src\IPAddressTest.cpp"/>
<File
RelativePath=".\src\NetCoreTestSuite.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\SocketAddressTest.cpp"/>
</Filter>
@ -453,8 +457,6 @@
RelativePath=".\src\MulticastEchoServer.h"/>
<File
RelativePath=".\src\MulticastSocketTest.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\RawSocketTest.h"/>
<File
@ -480,8 +482,6 @@
RelativePath=".\src\MulticastEchoServer.cpp"/>
<File
RelativePath=".\src\MulticastSocketTest.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\RawSocketTest.cpp"/>
<File

8
Net/testsuite/TestSuite_vs80.vcproj
View File

@ -441,6 +441,8 @@
RelativePath=".\src\IPAddressTest.h"/>
<File
RelativePath=".\src\NetCoreTestSuite.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\SocketAddressTest.h"/>
</Filter>
@ -452,6 +454,8 @@
RelativePath=".\src\IPAddressTest.cpp"/>
<File
RelativePath=".\src\NetCoreTestSuite.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\SocketAddressTest.cpp"/>
</Filter>
@ -493,8 +497,6 @@
RelativePath=".\src\MulticastEchoServer.h"/>
<File
RelativePath=".\src\MulticastSocketTest.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\RawSocketTest.h"/>
<File
@ -520,8 +522,6 @@
RelativePath=".\src\MulticastEchoServer.cpp"/>
<File
RelativePath=".\src\MulticastSocketTest.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\RawSocketTest.cpp"/>
<File

8
Net/testsuite/TestSuite_vs90.vcproj
View File

@ -441,6 +441,8 @@
RelativePath=".\src\IPAddressTest.h"/>
<File
RelativePath=".\src\NetCoreTestSuite.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\SocketAddressTest.h"/>
</Filter>
@ -452,6 +454,8 @@
RelativePath=".\src\IPAddressTest.cpp"/>
<File
RelativePath=".\src\NetCoreTestSuite.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\SocketAddressTest.cpp"/>
</Filter>
@ -493,8 +497,6 @@
RelativePath=".\src\MulticastEchoServer.h"/>
<File
RelativePath=".\src\MulticastSocketTest.h"/>
<File
RelativePath=".\src\NetworkInterfaceTest.h"/>
<File
RelativePath=".\src\RawSocketTest.h"/>
<File
@ -520,8 +522,6 @@
RelativePath=".\src\MulticastEchoServer.cpp"/>
<File
RelativePath=".\src\MulticastSocketTest.cpp"/>
<File
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
<File
RelativePath=".\src\RawSocketTest.cpp"/>
<File

12
Net/testsuite/TestSuite_x64_vs100.vcxproj.filters
View File

@ -177,9 +177,6 @@
<ClInclude Include="src\MulticastSocketTest.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="src\NetworkInterfaceTest.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
<ClInclude Include="src\RawSocketTest.h">
<Filter>Sockets\Header Files</Filter>
</ClInclude>
@ -309,6 +306,9 @@
<ClInclude Include="src\WebSocketTestSuite.h">
<Filter>WebSocket\Header Files</Filter>
</ClInclude>
<ClInclude Include="src\NetworkInterfaceTest.h">
<Filter>NetCore\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\DNSTest.cpp">
@ -347,9 +347,6 @@
<ClCompile Include="src\MulticastSocketTest.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterfaceTest.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\RawSocketTest.cpp">
<Filter>Sockets\Source Files</Filter>
</ClCompile>
@ -479,5 +476,8 @@
<ClCompile Include="src\WebSocketTestSuite.cpp">
<Filter>WebSocket\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NetworkInterfaceTest.cpp">
<Filter>NetCore\Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

2
Net/testsuite/src/NetCoreTestSuite.cpp
View File

@ -34,6 +34,7 @@
#include "IPAddressTest.h"
#include "SocketAddressTest.h"
#include "DNSTest.h"
#include "NetworkInterfaceTest.h"
CppUnit::Test* NetCoreTestSuite::suite()
@ -43,6 +44,7 @@ CppUnit::Test* NetCoreTestSuite::suite()
pSuite->addTest(IPAddressTest::suite());
pSuite->addTest(SocketAddressTest::suite());
pSuite->addTest(DNSTest::suite());
pSuite->addTest(NetworkInterfaceTest::suite());
return pSuite;
}

2
Net/testsuite/src/SocketsTestSuite.cpp
View File

@ -34,7 +34,6 @@
#include "SocketTest.h"
#include "SocketStreamTest.h"
#include "DatagramSocketTest.h"
#include "NetworkInterfaceTest.h"
#include "MulticastSocketTest.h"
#include "DialogSocketTest.h"
#include "RawSocketTest.h"
@ -47,7 +46,6 @@ CppUnit::Test* SocketsTestSuite::suite()
pSuite->addTest(SocketTest::suite());
pSuite->addTest(SocketStreamTest::suite());
pSuite->addTest(DatagramSocketTest::suite());
pSuite->addTest(NetworkInterfaceTest::suite());
pSuite->addTest(MulticastSocketTest::suite());
pSuite->addTest(DialogSocketTest::suite());
pSuite->addTest(RawSocketTest::suite());