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

Merge pull request #751 from rklabs/add_operator_ostream_ipaddress

Browse Source 
Adding ostream operator for Poco::Net::IPAddress
This commit is contained in:
Aleksandar Fabijanic 2015-03-18 11:54:29 -05:00
commit c89cab6d6d
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,6 +343,7 @@ inline bool NetworkInterface::operator == (const NetworkInterface& other) const
Net_API std::ostream& operator<<(std::ostream& os, const Poco::Net::NetworkInterface::MACAddress& mac); Net_API std::ostream& operator<<(std::ostream& os, const Poco::Net::NetworkInterface::MACAddress& mac);
Net_API std::ostream& operator<<(std::ostream& os, const Poco::Net::IPAddress& ipAddress);
#endif // POCO_NET_HAS_INTERFACE #endif // POCO_NET_HAS_INTERFACE

7
Net/src/NetworkInterface.cpp
View File

@ -56,6 +56,13 @@ std::ostream& operator<<(std::ostream& os, const Poco::Net::NetworkInterface::MA
return os; return os;
} }
std::ostream& operator<<(std::ostream& os, const Poco::Net::IPAddress& ipAddress)
{
os << ipAddress.toString();
return os;
}
namespace Poco { namespace Poco {
namespace Net { namespace Net {

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

@ -65,11 +65,11 @@ void NetworkInterfaceTest::testMap()
std::cout << std::endl << "----------" << std::endl; std::cout << std::endl << "----------" << std::endl;
std::cout << "Address " << counter << std::endl; std::cout << "Address " << counter << std::endl;
std::cout << "----------" << std::endl; std::cout << "----------" << std::endl;
std::cout << "Address: " << ipIt->get<NetworkInterface::IP_ADDRESS>().toString() << std::endl; std::cout << "Address: " << ipIt->get<NetworkInterface::IP_ADDRESS>() << std::endl;
IPAddress addr = ipIt->get<NetworkInterface::SUBNET_MASK>(); IPAddress addr = ipIt->get<NetworkInterface::SUBNET_MASK>();
if (!addr.isWildcard()) std::cout << "Subnet: " << addr.toString() << " (/" << addr.prefixLength() << ")" << std::endl; if (!addr.isWildcard()) std::cout << "Subnet: " << addr << " (/" << addr.prefixLength() << ")" << std::endl;
addr = ipIt->get<NetworkInterface::BROADCAST_ADDRESS>(); addr = ipIt->get<NetworkInterface::BROADCAST_ADDRESS>();
if (!addr.isWildcard()) std::cout << "Broadcast: " << addr.toString() << std::endl; if (!addr.isWildcard()) std::cout << "Broadcast: " << addr << std::endl;
} }
std::cout << "=============" << std::endl << std::endl; std::cout << "=============" << std::endl << std::endl;
@ -100,11 +100,11 @@ void NetworkInterfaceTest::testList()
List::const_iterator ipEnd = ipList.end(); List::const_iterator ipEnd = ipList.end();
for (int counter = 0; ipIt != ipEnd; ++ipIt, ++counter) for (int counter = 0; ipIt != ipEnd; ++ipIt, ++counter)
{ {
std::cout << "IP Address: " << ipIt->get<NetworkInterface::IP_ADDRESS>().toString() << std::endl; std::cout << "IP Address: " << ipIt->get<NetworkInterface::IP_ADDRESS>() << std::endl;
IPAddress addr = ipIt->get<NetworkInterface::SUBNET_MASK>(); IPAddress addr = ipIt->get<NetworkInterface::SUBNET_MASK>();
if (!addr.isWildcard()) std::cout << "Subnet: " << ipIt->get<NetworkInterface::SUBNET_MASK>().toString() << " (/" << ipIt->get<NetworkInterface::SUBNET_MASK>().prefixLength() << ")" << std::endl; if (!addr.isWildcard()) std::cout << "Subnet: " << ipIt->get<NetworkInterface::SUBNET_MASK>() << " (/" << ipIt->get<NetworkInterface::SUBNET_MASK>().prefixLength() << ")" << std::endl;
addr = ipIt->get<NetworkInterface::BROADCAST_ADDRESS>(); addr = ipIt->get<NetworkInterface::BROADCAST_ADDRESS>();
if (!addr.isWildcard()) std::cout << "Broadcast: " << ipIt->get<NetworkInterface::BROADCAST_ADDRESS>().toString() << std::endl; if (!addr.isWildcard()) std::cout << "Broadcast: " << ipIt->get<NetworkInterface::BROADCAST_ADDRESS>() << std::endl;
} }
std::cout << "==============" << std::endl << std::endl; std::cout << "==============" << std::endl << std::endl;
@ -180,7 +180,7 @@ void NetworkInterfaceTest::testMapIpOnly()
{ {
assert(it->second.supportsIPv4() || it->second.supportsIPv6()); assert(it->second.supportsIPv4() || it->second.supportsIPv6());
std::cout << "Interface: (" << it->second.index() << ")" << std::endl; std::cout << "Interface: (" << it->second.index() << ")" << std::endl;
std::cout << "Address: " << it->second.address().toString() << std::endl; std::cout << "Address: " << it->second.address() << std::endl;
NetworkInterface::MACAddress mac(it->second.macAddress()); NetworkInterface::MACAddress mac(it->second.macAddress());
if (!mac.empty() && (it->second.type() != NetworkInterface::NI_TYPE_SOFTWARE_LOOPBACK)) if (!mac.empty() && (it->second.type() != NetworkInterface::NI_TYPE_SOFTWARE_LOOPBACK))
std::cout << "MAC Address:" << mac << std::endl; std::cout << "MAC Address:" << mac << std::endl;