generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 09:12:28 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

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