Skip to content

Commit 889f420

Browse files
aleks-faleks-f
committed
SF# 3563057: Move NetworkInterfaceTest to NetCore suite
fix NetworkInterface name/displayName
1 parent cfba98d commit 889f420

16 files changed

Lines changed: 70 additions & 66 deletions

‎Net/Net_CE_vs90.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,8 @@
442442
RelativePath=".\include\Poco\Net\Net.h"/>
443443
<File
444444
RelativePath=".\include\Poco\Net\NetException.h"/>
445+
<File
446+
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
445447
<File
446448
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
447449
<File
@@ -457,6 +459,8 @@
457459
RelativePath=".\src\IPAddress.cpp"/>
458460
<File
459461
RelativePath=".\src\NetException.cpp"/>
462+
<File
463+
RelativePath=".\src\NetworkInterface.cpp"/>
460464
<File
461465
RelativePath=".\src\SocketAddress.cpp"/>
462466
</Filter>
@@ -473,8 +477,6 @@
473477
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
474478
<File
475479
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
476-
<File
477-
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
478480
<File
479481
RelativePath=".\include\Poco\Net\RawSocket.h"/>
480482
<File
@@ -504,8 +506,6 @@
504506
RelativePath=".\src\DialogSocket.cpp"/>
505507
<File
506508
RelativePath=".\src\MulticastSocket.cpp"/>
507-
<File
508-
RelativePath=".\src\NetworkInterface.cpp"/>
509509
<File
510510
RelativePath=".\src\RawSocket.cpp"/>
511511
<File

‎Net/Net_vs100.vcxproj.filters‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,6 @@
162162
<ClInclude Include="include\Poco\Net\MulticastSocket.h">
163163
<Filter>Sockets\Header Files</Filter>
164164
</ClInclude>
165-
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
166-
<Filter>Sockets\Header Files</Filter>
167-
</ClInclude>
168165
<ClInclude Include="include\Poco\Net\RawSocket.h">
169166
<Filter>Sockets\Header Files</Filter>
170167
</ClInclude>
@@ -411,6 +408,9 @@
411408
<ClInclude Include="include\Poco\Net\WebSocketImpl.h">
412409
<Filter>WebSocket\Header Files</Filter>
413410
</ClInclude>
411+
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
412+
<Filter>NetCore\Header Files</Filter>
413+
</ClInclude>
414414
</ItemGroup>
415415
<ItemGroup>
416416
<ClCompile Include="src\DNS.cpp">
@@ -440,9 +440,6 @@
440440
<ClCompile Include="src\MulticastSocket.cpp">
441441
<Filter>Sockets\Source Files</Filter>
442442
</ClCompile>
443-
<ClCompile Include="src\NetworkInterface.cpp">
444-
<Filter>Sockets\Source Files</Filter>
445-
</ClCompile>
446443
<ClCompile Include="src\RawSocket.cpp">
447444
<Filter>Sockets\Source Files</Filter>
448445
</ClCompile>
@@ -680,6 +677,9 @@
680677
<ClCompile Include="src\WebSocketImpl.cpp">
681678
<Filter>WebSocket\Source Files</Filter>
682679
</ClCompile>
680+
<ClCompile Include="src\NetworkInterface.cpp">
681+
<Filter>NetCore\Source Files</Filter>
682+
</ClCompile>
683683
</ItemGroup>
684684
<ItemGroup>
685685
<ResourceCompile Include="..\DLLVersion.rc" />

‎Net/Net_vs71.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@
374374
RelativePath=".\include\Poco\Net\Net.h"/>
375375
<File
376376
RelativePath=".\include\Poco\Net\NetException.h"/>
377+
<File
378+
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
377379
<File
378380
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
379381
<File
@@ -389,6 +391,8 @@
389391
RelativePath=".\src\IPAddress.cpp"/>
390392
<File
391393
RelativePath=".\src\NetException.cpp"/>
394+
<File
395+
RelativePath=".\src\NetworkInterface.cpp"/>
392396
<File
393397
RelativePath=".\src\SocketAddress.cpp"/>
394398
</Filter>
@@ -405,8 +409,6 @@
405409
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
406410
<File
407411
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
408-
<File
409-
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
410412
<File
411413
RelativePath=".\include\Poco\Net\RawSocket.h"/>
412414
<File
@@ -436,8 +438,6 @@
436438
RelativePath=".\src\DialogSocket.cpp"/>
437439
<File
438440
RelativePath=".\src\MulticastSocket.cpp"/>
439-
<File
440-
RelativePath=".\src\NetworkInterface.cpp"/>
441441
<File
442442
RelativePath=".\src\RawSocket.cpp"/>
443443
<File

‎Net/Net_vs80.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@
395395
RelativePath=".\include\Poco\Net\Net.h"/>
396396
<File
397397
RelativePath=".\include\Poco\Net\NetException.h"/>
398+
<File
399+
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
398400
<File
399401
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
400402
<File
@@ -410,6 +412,8 @@
410412
RelativePath=".\src\IPAddress.cpp"/>
411413
<File
412414
RelativePath=".\src\NetException.cpp"/>
415+
<File
416+
RelativePath=".\src\NetworkInterface.cpp"/>
413417
<File
414418
RelativePath=".\src\SocketAddress.cpp"/>
415419
</Filter>
@@ -426,8 +430,6 @@
426430
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
427431
<File
428432
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
429-
<File
430-
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
431433
<File
432434
RelativePath=".\include\Poco\Net\RawSocket.h"/>
433435
<File
@@ -457,8 +459,6 @@
457459
RelativePath=".\src\DialogSocket.cpp"/>
458460
<File
459461
RelativePath=".\src\MulticastSocket.cpp"/>
460-
<File
461-
RelativePath=".\src\NetworkInterface.cpp"/>
462462
<File
463463
RelativePath=".\src\RawSocket.cpp"/>
464464
<File

‎Net/Net_vs90.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@
394394
RelativePath=".\include\Poco\Net\Net.h"/>
395395
<File
396396
RelativePath=".\include\Poco\Net\NetException.h"/>
397+
<File
398+
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
397399
<File
398400
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
399401
<File
@@ -409,6 +411,8 @@
409411
RelativePath=".\src\IPAddress.cpp"/>
410412
<File
411413
RelativePath=".\src\NetException.cpp"/>
414+
<File
415+
RelativePath=".\src\NetworkInterface.cpp"/>
412416
<File
413417
RelativePath=".\src\SocketAddress.cpp"/>
414418
</Filter>
@@ -425,8 +429,6 @@
425429
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
426430
<File
427431
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
428-
<File
429-
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
430432
<File
431433
RelativePath=".\include\Poco\Net\RawSocket.h"/>
432434
<File
@@ -456,8 +458,6 @@
456458
RelativePath=".\src\DialogSocket.cpp"/>
457459
<File
458460
RelativePath=".\src\MulticastSocket.cpp"/>
459-
<File
460-
RelativePath=".\src\NetworkInterface.cpp"/>
461461
<File
462462
RelativePath=".\src\RawSocket.cpp"/>
463463
<File

‎Net/Net_x64_vs100.vcxproj.filters‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,6 @@
162162
<ClInclude Include="include\Poco\Net\MulticastSocket.h">
163163
<Filter>Sockets\Header Files</Filter>
164164
</ClInclude>
165-
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
166-
<Filter>Sockets\Header Files</Filter>
167-
</ClInclude>
168165
<ClInclude Include="include\Poco\Net\RawSocket.h">
169166
<Filter>Sockets\Header Files</Filter>
170167
</ClInclude>
@@ -411,6 +408,9 @@
411408
<ClInclude Include="include\Poco\Net\WebSocketImpl.h">
412409
<Filter>WebSocket\Header Files</Filter>
413410
</ClInclude>
411+
<ClInclude Include="include\Poco\Net\NetworkInterface.h">
412+
<Filter>NetCore\Header Files</Filter>
413+
</ClInclude>
414414
</ItemGroup>
415415
<ItemGroup>
416416
<ClCompile Include="src\DNS.cpp">
@@ -440,9 +440,6 @@
440440
<ClCompile Include="src\MulticastSocket.cpp">
441441
<Filter>Sockets\Source Files</Filter>
442442
</ClCompile>
443-
<ClCompile Include="src\NetworkInterface.cpp">
444-
<Filter>Sockets\Source Files</Filter>
445-
</ClCompile>
446443
<ClCompile Include="src\RawSocket.cpp">
447444
<Filter>Sockets\Source Files</Filter>
448445
</ClCompile>
@@ -680,6 +677,9 @@
680677
<ClCompile Include="src\WebSocketImpl.cpp">
681678
<Filter>WebSocket\Source Files</Filter>
682679
</ClCompile>
680+
<ClCompile Include="src\NetworkInterface.cpp">
681+
<Filter>NetCore\Source Files</Filter>
682+
</ClCompile>
683683
</ItemGroup>
684684
<ItemGroup>
685685
<ResourceCompile Include="..\DLLVersion.rc" />

‎Net/Net_x64_vs90.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@
399399
RelativePath=".\include\Poco\Net\Net.h"/>
400400
<File
401401
RelativePath=".\include\Poco\Net\NetException.h"/>
402+
<File
403+
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
402404
<File
403405
RelativePath=".\include\Poco\Net\SocketAddress.h"/>
404406
<File
@@ -414,6 +416,8 @@
414416
RelativePath=".\src\IPAddress.cpp"/>
415417
<File
416418
RelativePath=".\src\NetException.cpp"/>
419+
<File
420+
RelativePath=".\src\NetworkInterface.cpp"/>
417421
<File
418422
RelativePath=".\src\SocketAddress.cpp"/>
419423
</Filter>
@@ -430,8 +434,6 @@
430434
RelativePath=".\include\Poco\Net\DialogSocket.h"/>
431435
<File
432436
RelativePath=".\include\Poco\Net\MulticastSocket.h"/>
433-
<File
434-
RelativePath=".\include\Poco\Net\NetworkInterface.h"/>
435437
<File
436438
RelativePath=".\include\Poco\Net\RawSocket.h"/>
437439
<File
@@ -461,8 +463,6 @@
461463
RelativePath=".\src\DialogSocket.cpp"/>
462464
<File
463465
RelativePath=".\src\MulticastSocket.cpp"/>
464-
<File
465-
RelativePath=".\src\NetworkInterface.cpp"/>
466466
<File
467467
RelativePath=".\src\RawSocket.cpp"/>
468468
<File

‎Net/src/NetworkInterface.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// $Id: //poco/1.4/Net/src/NetworkInterface.cpp#9 $
55
//
66
// Library: Net
7-
// Package: Sockets
7+
// Package: NetCore
88
// Module: NetworkInterface
99
//
1010
// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
@@ -970,13 +970,17 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
970970
#endif
971971
if (pAddress->Flags & IP_ADAPTER_IPV4_ENABLED) ifIndex = pAddress->IfIndex;
972972

973-
std::string name(pAddress->AdapterName);
973+
std::string name;
974974
std::string displayName;
975975
#ifdef POCO_WIN32_UTF8
976-
Poco::UnicodeConverter::toUTF8(pAddress->FriendlyName, displayName);
976+
Poco::UnicodeConverter::toUTF8(pAddress->FriendlyName, name);
977+
Poco::UnicodeConverter::toUTF8(pAddress->Description, displayName);
977978
#else
979+
char nameBuffer[1024];
980+
rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, nameBuffer, sizeof(nameBuffer), NULL, NULL);
981+
if (rc) name = nameBuffer;
978982
char displayNameBuffer[1024];
979-
int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
983+
int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->Description, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
980984
if (rc) displayName = displayNameBuffer;
981985
#endif
982986

‎Net/testsuite/TestSuite_CE_vs90.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@
466466
RelativePath=".\src\IPAddressTest.h"/>
467467
<File
468468
RelativePath=".\src\NetCoreTestSuite.h"/>
469+
<File
470+
RelativePath=".\src\NetworkInterfaceTest.h"/>
469471
<File
470472
RelativePath=".\src\SocketAddressTest.h"/>
471473
</Filter>
@@ -477,6 +479,8 @@
477479
RelativePath=".\src\IPAddressTest.cpp"/>
478480
<File
479481
RelativePath=".\src\NetCoreTestSuite.cpp"/>
482+
<File
483+
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
480484
<File
481485
RelativePath=".\src\SocketAddressTest.cpp"/>
482486
</Filter>
@@ -518,8 +522,6 @@
518522
RelativePath=".\src\MulticastEchoServer.h"/>
519523
<File
520524
RelativePath=".\src\MulticastSocketTest.h"/>
521-
<File
522-
RelativePath=".\src\NetworkInterfaceTest.h"/>
523525
<File
524526
RelativePath=".\src\RawSocketTest.h"/>
525527
<File
@@ -545,8 +547,6 @@
545547
RelativePath=".\src\MulticastEchoServer.cpp"/>
546548
<File
547549
RelativePath=".\src\MulticastSocketTest.cpp"/>
548-
<File
549-
RelativePath=".\src\NetworkInterfaceTest.cpp"/>
550550
<File
551551
RelativePath=".\src\RawSocketTest.cpp"/>
552552
<File

‎Net/testsuite/TestSuite_vs100.vcxproj.filters‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@
177177
<ClInclude Include="src\MulticastSocketTest.h">
178178
<Filter>Sockets\Header Files</Filter>
179179
</ClInclude>
180-
<ClInclude Include="src\NetworkInterfaceTest.h">
181-
<Filter>Sockets\Header Files</Filter>
182-
</ClInclude>
183180
<ClInclude Include="src\RawSocketTest.h">
184181
<Filter>Sockets\Header Files</Filter>
185182
</ClInclude>
@@ -309,6 +306,9 @@
309306
<ClInclude Include="src\WebSocketTestSuite.h">
310307
<Filter>WebSocket\Header Files</Filter>
311308
</ClInclude>
309+
<ClInclude Include="src\NetworkInterfaceTest.h">
310+
<Filter>NetCore\Header Files</Filter>
311+
</ClInclude>
312312
</ItemGroup>
313313
<ItemGroup>
314314
<ClCompile Include="src\DNSTest.cpp">
@@ -347,9 +347,6 @@
347347
<ClCompile Include="src\MulticastSocketTest.cpp">
348348
<Filter>Sockets\Source Files</Filter>
349349
</ClCompile>
350-
<ClCompile Include="src\NetworkInterfaceTest.cpp">
351-
<Filter>Sockets\Source Files</Filter>
352-
</ClCompile>
353350
<ClCompile Include="src\RawSocketTest.cpp">
354351
<Filter>Sockets\Source Files</Filter>
355352
</ClCompile>
@@ -479,5 +476,8 @@
479476
<ClCompile Include="src\WebSocketTestSuite.cpp">
480477
<Filter>WebSocket\Source Files</Filter>
481478
</ClCompile>
479+
<ClCompile Include="src\NetworkInterfaceTest.cpp">
480+
<Filter>NetCore\Source Files</Filter>
481+
</ClCompile>
482482
</ItemGroup>
483483
</Project>

0 commit comments

Comments
 (0)