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

fix OSX NetworkInterface test

Browse Source
This commit is contained in:
Alex Fabijanic 2017-12-20 20:58:58 +01:00
parent bb044f6f95
commit 0858ff9e29
3 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Net/include/Poco/Net/NetworkInterface.h
View File

@ -279,6 +279,9 @@ public:
/// they are contained within the NetworkInterface (second)
/// member of the pair.
static std::string toString(const MACAddress& addr);
/// Returns MAC address as xx:xx:xx:xx:xx:xx formatted string.
protected:
NetworkInterface(const std::string& name, const std::string& displayName, const std::string& adapterName, const IPAddress& address, unsigned index, MACAddress* pMACAddress = 0);
/// Creates the NetworkInterface.

111
Net/src/NetworkInterface.cpp
View File

@ -170,19 +170,23 @@ NetworkInterfaceImpl::NetworkInterfaceImpl(unsigned index):
}
NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name, const std::string& displayName, const std::string& adapterName, const IPAddress& address, unsigned index, NetworkInterface::MACAddress* pMACAddress):
_name(name),
_displayName(displayName),
_adapterName(adapterName),
_index(index),
_broadcast(false),
_loopback(false),
_multicast(false),
_pointToPoint(false),
_up(false),
_running(false),
_mtu(0),
_type(NetworkInterface::NI_TYPE_OTHER)
NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name,
const std::string& displayName,
const std::string& adapterName,
const IPAddress& address,
unsigned index,
NetworkInterface::MACAddress* pMACAddress): _name(name),
_displayName(displayName),
_adapterName(adapterName),
_index(index),
_broadcast(false),
_loopback(false),
_multicast(false),
_pointToPoint(false),
_up(false),
_running(false),
_mtu(0),
_type(NetworkInterface::NI_TYPE_OTHER)
{
_addressList.push_back(AddressTuple(address, IPAddress(), IPAddress()));
setPhyParams();
@ -190,19 +194,22 @@ NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name, const std::s
}
NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name, const std::string& displayName, const std::string& adapterName, unsigned index, NetworkInterface::MACAddress* pMACAddress):
_name(name),
_displayName(displayName),
_adapterName(adapterName),
_index(index),
_broadcast(false),
_loopback(false),
_multicast(false),
_pointToPoint(false),
_up(false),
_running(false),
_mtu(0),
_type(NetworkInterface::NI_TYPE_OTHER)
NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name,
const std::string& displayName,
const std::string& adapterName,
unsigned index,
NetworkInterface::MACAddress* pMACAddress): _name(name),
_displayName(displayName),
_adapterName(adapterName),
_index(index),
_broadcast(false),
_loopback(false),
_multicast(false),
_pointToPoint(false),
_up(false),
_running(false),
_mtu(0),
_type(NetworkInterface::NI_TYPE_OTHER)
{
setPhyParams();
if (pMACAddress) setMACAddress(*pMACAddress);
@ -216,19 +223,18 @@ NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name,
const IPAddress& subnetMask,
const IPAddress& broadcastAddress,
unsigned index,
NetworkInterface::MACAddress* pMACAddress):
_name(name),
_displayName(displayName),
_adapterName(adapterName),
_index(index),
_broadcast(false),
_loopback(false),
_multicast(false),
_pointToPoint(false),
_up(false),
_running(false),
_mtu(0),
_type(NetworkInterface::NI_TYPE_OTHER)
NetworkInterface::MACAddress* pMACAddress): _name(name),
_displayName(displayName),
_adapterName(adapterName),
_index(index),
_broadcast(false),
_loopback(false),
_multicast(false),
_pointToPoint(false),
_up(false),
_running(false),
_mtu(0),
_type(NetworkInterface::NI_TYPE_OTHER)
{
_addressList.push_back(AddressTuple(address, subnetMask, broadcastAddress));
setPhyParams();
@ -320,7 +326,8 @@ const IPAddress& NetworkInterfaceImpl::firstAddress(IPAddress::Family family) co
if (addr.family() == family) return addr;
}
throw NotFoundException(format("%s family address not found.", (family == IPAddress::IPv4) ? std::string("IPv4") : std::string("IPv6")));
throw NotFoundException(format("%s family address not found.",
(family == IPAddress::IPv4) ? std::string("IPv4") : std::string("IPv6")));
}
@ -858,6 +865,23 @@ NetworkInterface NetworkInterface::forIndex(unsigned i)
}
std::string NetworkInterface::toString(const MACAddress& addr)
{
std::string ret;
if(addr.size() >= 6)
{
ret = Poco::format("%02x:%02x:%02x:%02x:%02x:%02x",
static_cast<unsigned>(addr[0]),
static_cast<unsigned>(addr[1]),
static_cast<unsigned>(addr[2]),
static_cast<unsigned>(addr[3]),
static_cast<unsigned>(addr[4]),
static_cast<unsigned>(addr[5]));
}
return ret;
}
NetworkInterface::List NetworkInterface::list(bool ipOnly, bool upOnly)
{
List list;
@ -1067,7 +1091,8 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
else if (ERROR_NO_DATA == dwRetVal) // no network interfaces found
return result;
else if (NO_ERROR != dwRetVal) // error occurred
throw SystemException(format("An error occurred while trying to obtain list of network interfaces: [%s]", Error::getMessage(dwRetVal)));
throw SystemException(format("An error occurred while trying to obtain list of network interfaces: [%s]",
Error::getMessage(dwRetVal)));
else
break;
}
@ -1463,9 +1488,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
}
}
}
catch (...)
{
}
catch (...) { }
if (ifaces) freeifaddrs(ifaces);
if (ipOnly)

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

@ -210,7 +210,6 @@ void NetworkInterfaceTest::testListMapConformance()
for (; mapIt != m.end(); ++mapIt)
{
NetworkInterface::MACAddress mac(mapIt->second.macAddress());
typedef NetworkInterface::AddressList List;
const List& ipList = mapIt->second.addressList();
if (ipList.size() > 0)
@ -226,6 +225,7 @@ void NetworkInterfaceTest::testListMapConformance()
}
else
{
++listIt;
++counter;
}
}