diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index ee4f118c5..96630e3c6 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -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::IPAddress& ipAddress); #endif // POCO_NET_HAS_INTERFACE diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index e8140afec..e6c2cbb28 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -56,6 +56,13 @@ std::ostream& operator<<(std::ostream& os, const Poco::Net::NetworkInterface::MA return os; } +std::ostream& operator<<(std::ostream& os, const Poco::Net::IPAddress& ipAddress) +{ + os << ipAddress.toString(); + + return os; +} + namespace Poco { namespace Net { diff --git a/Net/testsuite/src/NetworkInterfaceTest.cpp b/Net/testsuite/src/NetworkInterfaceTest.cpp index 840d8d0d2..2214396b7 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.cpp +++ b/Net/testsuite/src/NetworkInterfaceTest.cpp @@ -65,11 +65,11 @@ void NetworkInterfaceTest::testMap() std::cout << std::endl << "----------" << std::endl; std::cout << "Address " << counter << std::endl; std::cout << "----------" << std::endl; - std::cout << "Address: " << ipIt->get().toString() << std::endl; + std::cout << "Address: " << ipIt->get() << std::endl; IPAddress addr = ipIt->get(); - 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(); - 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; @@ -100,11 +100,11 @@ void NetworkInterfaceTest::testList() List::const_iterator ipEnd = ipList.end(); for (int counter = 0; ipIt != ipEnd; ++ipIt, ++counter) { - std::cout << "IP Address: " << ipIt->get().toString() << std::endl; + std::cout << "IP Address: " << ipIt->get() << std::endl; IPAddress addr = ipIt->get(); - if (!addr.isWildcard()) std::cout << "Subnet: " << ipIt->get().toString() << " (/" << ipIt->get().prefixLength() << ")" << std::endl; + if (!addr.isWildcard()) std::cout << "Subnet: " << ipIt->get() << " (/" << ipIt->get().prefixLength() << ")" << std::endl; addr = ipIt->get(); - if (!addr.isWildcard()) std::cout << "Broadcast: " << ipIt->get().toString() << std::endl; + if (!addr.isWildcard()) std::cout << "Broadcast: " << ipIt->get() << std::endl; } std::cout << "==============" << std::endl << std::endl; @@ -180,7 +180,7 @@ void NetworkInterfaceTest::testMapIpOnly() { assert(it->second.supportsIPv4() || it->second.supportsIPv6()); 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()); if (!mac.empty() && (it->second.type() != NetworkInterface::NI_TYPE_SOFTWARE_LOOPBACK)) std::cout << "MAC Address:" << mac << std::endl;