Route OSX compile and tests

Net/Makefile

@@ -28,7 +28,7 @@ objects = \
 	FTPClientSession FTPStreamFactory PartHandler PartSource NullPartHandler \
 	SocketReactor SocketNotifier SocketNotification AbstractHTTPRequestHandler \
 	MailRecipient MailMessage MailStream SMTPClientSession POP3ClientSession \
-	RawSocket RawSocketImpl ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \
+	RawSocket RawSocketImpl Route ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \
 	ICMPSocket ICMPSocketImpl ICMPv4PacketImpl \
 	RemoteSyslogChannel RemoteSyslogListener SMTPChannel \
 	WebSocket WebSocketImpl

Net/include/Poco/Net/Route.h

@@ -84,6 +84,12 @@ class Net_API Route
 public:
 	typedef std::list<Route> RouteList;
 
+	static const unsigned int ROUTE_METRIC_UNKNOWN = ~0;
+	static const unsigned int ROUTE_MTU_UNKNOWN = 0;
+	static const unsigned int ROUTE_HOPS_UNKNOWN = ~0;
+	static const unsigned int ROUTE_USE_UNKNOWN = ~1;
+	static const unsigned int ROUTE_CREATED_UNKNOWN = 0;
+	
 	enum RouteType
 	{
 		ROUTE_NONE = 0,
@@ -112,6 +118,18 @@ public:
 		ROUTE_PROTO_BGP = 14,
 	};
 
+	Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type);
+	/// Creates Route.
+	
+	Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type);
+	/// Creates Route.
+	
+	Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type);
+	/// Creates Route.
+	
+	Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type);
+	/// Creates Route.
+	
 	~Route();
 		/// Destroys Route.
 
@@ -194,7 +212,6 @@ public:
 	static std::string protocolName(RouteProto proto);
 		/// Returns protocol as string.
 
-protected:
 	void setMTU(unsigned mtu);
 		/// Sets the MTU to specified value.
 
@@ -214,18 +231,6 @@ protected:
 		/// Sets usage to specified value.
 
 private:
-		Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type);
-			/// Creates Route.
-
-		Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type);
-			/// Creates Route.
-
-		Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type);
-			/// Creates Route.
-
-		Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type);
-			/// Creates Route.
-
 	// portable attributes
 	IPAddress	_dst;
 	IPAddress	_netmask;
@@ -240,8 +245,6 @@ private:
 	unsigned	_use;
 	RouteProto	_proto;
 	Timestamp	_created;
-
-		friend class RouteHelper;
 };
 
 

Net/src/Route.cpp

@@ -42,10 +42,10 @@
 
 #include "Poco/Net/IPAddress.h"
 #include "Poco/Net/NetException.h"
-#include <iphlpapi.h>
 
 
 #if defined(POCO_OS_FAMILY_WINDOWS)
+	#include <iphlpapi.h>
 	#include "Route_WIN32.cpp"
 #elif defined(POCO_OS_FAMILY_BSD)
 	#include "Route_BSD.cpp"
@@ -64,13 +64,12 @@ Route::Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& ne
 	_nextHop(nextHop),
 	_ifIndex(ifIndex),
 	_type(type),
-	// attributes that might not be available on all platforms are set to sentinel values.
+	_metric(ROUTE_METRIC_UNKNOWN),
-	_metric(~0),
+	_mtu(ROUTE_MTU_UNKNOWN),
-	_hops(~0),
+	_hops(ROUTE_HOPS_UNKNOWN),
-	_mtu(0),
+	_use(~ROUTE_USE_UNKNOWN),
-	_use(~1),
 	_proto(ROUTE_PROTO_NONE),
-	_created(0)
+	_created(ROUTE_CREATED_UNKNOWN)
 {
 	if (_dst.family() != _nextHop.family())
 		throw InvalidArgumentException("Destination and nextHop have different families");
@@ -83,13 +82,12 @@ Route::Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, R
 	_nextHop(IPAddress(dst.family())),
 	_ifIndex(ifIndex),
 	_type(type),
-	// attributes that might not be available on all platforms are set to sentinel values.
+	_metric(ROUTE_METRIC_UNKNOWN),
-	_metric(~0),
+	_mtu(ROUTE_MTU_UNKNOWN),
-	_hops(~0),
+	_hops(ROUTE_HOPS_UNKNOWN),
-	_mtu(0),
+	_use(~ROUTE_USE_UNKNOWN),
-	_use(~1),
 	_proto(ROUTE_PROTO_NONE),
-	_created(0)
+	_created(ROUTE_CREATED_UNKNOWN)
 {
 	if (_dst.family() != _nextHop.family())
 		throw InvalidArgumentException("Destination and nextHop have different families");
@@ -102,31 +100,30 @@ Route::Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, un
 	_nextHop(nextHop),
 	_ifIndex(ifIndex),
 	_type(type),
-	// attributes that might not be available on all platforms are set to sentinel values.
+	_metric(ROUTE_METRIC_UNKNOWN),
-	_metric(~0),
+	_mtu(ROUTE_MTU_UNKNOWN),
-	_hops(~0),
+	_hops(ROUTE_HOPS_UNKNOWN),
-	_mtu(0),
+	_use(~ROUTE_USE_UNKNOWN),
-	_use(~1),
 	_proto(ROUTE_PROTO_NONE),
-	_created(0)
+	_created(ROUTE_CREATED_UNKNOWN)
 {
 	if (_dst.family() != _nextHop.family())
 		throw InvalidArgumentException("Destination and nextHop have different families");
 }
 
+
 Route::Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type) :
 	_dst(dst),
 	_netmask(IPAddress(prefix, dst.family())),
 	_nextHop(IPAddress(dst.family())),
 	_ifIndex(ifIndex),
 	_type(type),
-	// attributes that might not be available on all platforms are set to sentinel values.
+	_metric(ROUTE_METRIC_UNKNOWN),
-	_metric(~0),
+	_mtu(ROUTE_MTU_UNKNOWN),
-	_hops(~0),
+	_hops(ROUTE_HOPS_UNKNOWN),
-	_mtu(0),
+	_use(~ROUTE_USE_UNKNOWN),
-	_use(~1),
 	_proto(ROUTE_PROTO_NONE),
-	_created(0)
+	_created(ROUTE_CREATED_UNKNOWN)
 {
 	if (_dst.family() != _nextHop.family())
 		throw InvalidArgumentException("Destination and nextHop have different families");
@@ -167,16 +164,17 @@ void Route::setProto(RouteProto proto)
 Route::RouteList Route::defaults(IPAddress::Family family)
 {
 	Route::RouteList defaults, routes = Route::list(family);
-
+	RouteList::const_iterator it = routes.begin();
-	for (Route::RouteList::const_iterator it = routes.begin();
+	RouteList::const_iterator end = routes.end();
-		 it != routes.end(); it++) {
+	for (; it != end; ++it)
+	{
 		if (it->getPrefix() != 0) continue;
 
 		// look for insertion point
 		Route::RouteList::iterator it2 = defaults.begin();
 		Route::RouteList::const_iterator end = defaults.end();
 		while (it2 != end && it2->getMetric() <= it->getMetric())
-			it2++;
+			++it2;
 		defaults.insert(it2, *it);
 	}
 
@@ -187,17 +185,21 @@ Route::RouteList Route::defaults(IPAddress::Family family)
 Route::RouteList Route::match(IPAddress target)
 {
 	Route::RouteList targets, routes = Route::list(target.family());
-
+	RouteList::const_iterator it = routes.begin();
-	for (Route::RouteList::const_iterator it = routes.begin();
+	RouteList::const_iterator end = routes.end();
-		 it != routes.end(); it++) {
+	for (; it != end; ++it)
+	{
 		if ((target & it->getNetmask()) != it->getDest()) continue;
 
 		// look for insertion point
 		Route::RouteList::iterator it2 = targets.begin();
 		while (it2 != targets.end()
 			&& (it2->getPrefix() > it->getPrefix()
-			 || (it2->getPrefix() == it->getPrefix() && it2->getMetric() <= it->getMetric())))
+			|| (it2->getPrefix() == it->getPrefix() &&
-			it2++;
+				it2->getMetric() <= it->getMetric())))
+		{
+			++it2;
+		}
 		targets.insert(it2, *it);
 	}
 

Net/src/Route_BSD.cpp

@@ -41,7 +41,6 @@
 #include <net/route.h>
 #include <sys/sysctl.h>
 #include <netinet/in.h>
-
 #include <string>
 
 
@@ -59,8 +58,14 @@
 #define SIN6_LENGTH (sizeof(struct in6_addr))
 
 
+
+namespace Poco {
+namespace Net {
+		
+		
 static int seq = rand();
 
+	
 static void get_rtaddrs(unsigned addrs, struct sockaddr *sa, struct sockaddr **rti_info)
 {
 	for (unsigned i = 0; i < RTAX_MAX; i++) {
@@ -73,6 +78,7 @@ static void get_rtaddrs(unsigned addrs, struct sockaddr *sa, struct sockaddr **r
 	}
 }
 
+	
 static IPAddress unpack_sockaddr_inX(struct sockaddr *sa, bool ipv4)
 {
 	const unsigned offset = (ipv4 ? SIN_OFFSET : SIN6_OFFSET);
@@ -91,36 +97,33 @@ static IPAddress unpack_sockaddr_inX(struct sockaddr *sa, bool ipv4)
 	return ip;
 }
 	
-class RouteHelper {
-public:
-	static Route* createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info);
 
-private:
+static Route createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info)
-	RouteHelper();
-	~RouteHelper();
-};
-
-Route* RouteHelper::createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info)
 {
 	IPAddress dest, netmask, nexthop;
 	int ifIndex = rtm->rtm_index;
 	bool adjacent = false;
 	sa_family_t family = AF_MAX;
-	char macaddr[16];		// should be plenty, right?
+	char macaddr[16];
 
-	for (unsigned i = 0; i < RTAX_MAX; i++) {
+	for (unsigned i = 0; i < RTAX_MAX; i++)
+	{
 		sockaddr* sa = (struct sockaddr*)rti_info[i];
 
-		if (sa == NULL) continue;
+		if (sa == 0) continue;
 
-		switch (i) {
+		switch (i)
+		{
 		case RTAX_DST:
 			poco_assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
 			family = sa->sa_family;
-			if (family == AF_INET) {
+			if (family == AF_INET)
+			{
 				struct sockaddr_in *sin = (struct sockaddr_in *)sa;
 				dest = IPAddress(&sin->sin_addr, SIN_LENGTH);
-			} else {
+			}
+			else
+			{
 				struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
 				dest = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index);
 			}
@@ -128,7 +131,8 @@ Route* RouteHelper::createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_in
 
 		case RTAX_GATEWAY:
 			poco_assert((sa->sa_family == family || sa->sa_family == AF_LINK));
-			switch (sa->sa_family) {
+			switch (sa->sa_family)
+			{
 			case AF_INET:
 				{
 					struct sockaddr_in *sin = (struct sockaddr_in *)sa;
@@ -168,28 +172,52 @@ Route* RouteHelper::createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_in
 		}
 	}
 
-	if (rtm->rtm_flags & RTF_HOST) {
+	if (rtm->rtm_flags & RTF_HOST)
-		poco_assert(! (rtm->rtm_addrs & RTA_NETMASK));
+	{
+		poco_assert(!(rtm->rtm_addrs & RTA_NETMASK));
 		if (family == AF_INET)
 			netmask = IPAddress(32, IPAddress::IPv4);
 		else
 			netmask = IPAddress(128, IPAddress::IPv6);
 	}
 
-	Route *route;
-
 	if (adjacent)
-		route = new Route(dest, netmask, ifIndex, Route::ROUTE_DIRECT);
+	{
-	else
+		Route route(dest, netmask, ifIndex, Route::ROUTE_DIRECT);
-		route = new Route(dest, netmask, nexthop, ifIndex, Route::ROUTE_INDIRECT);
+		route.setMTU(rtm->rtm_rmx.rmx_mtu);
-
+		route.setHops(rtm->rtm_rmx.rmx_hopcount);
-	route->setMTU(rtm->rtm_rmx.rmx_mtu);
+		route.setUsage(rtm->rtm_use);
-	route->setHops(rtm->rtm_rmx.rmx_hopcount);
+		// OSX uses expire, not metric; we reuse metric member here
-	route->setUsage(rtm->rtm_use);
+		if (rtm->rtm_rmx.rmx_expire)
-
+		{
+			time_t expTime;
+			if ((expTime = rtm->rtm_rmx.rmx_expire - ::time(0)) > 0)
+				route.setMetric(expTime);
+			else route.setMetric(Route::ROUTE_METRIC_UNKNOWN);
+		}
+		else route.setMetric(Route::ROUTE_METRIC_UNKNOWN);
 		return route;
+	}
+	else
+	{
+		Route route(dest, netmask, nexthop, ifIndex, Route::ROUTE_INDIRECT);
+		route.setMTU(rtm->rtm_rmx.rmx_mtu);
+		route.setHops(rtm->rtm_rmx.rmx_hopcount);
+		route.setUsage(rtm->rtm_use);
+		// OSX uses expire, not metric; we reuse metric member here
+		if (rtm->rtm_rmx.rmx_expire)
+		{
+			time_t expTime;
+			if ((expTime = rtm->rtm_rmx.rmx_expire - ::time(0)) > 0)
+				route.setMetric(expTime);
+			else route.setMetric(Route::ROUTE_METRIC_UNKNOWN);
+		}
+		else route.setMetric(Route::ROUTE_METRIC_UNKNOWN);
+		return route;
+	}
 }
 
+	
 Route::RouteList Route::list(IPAddress::Family family)
 {
 	Route::RouteList routes;
@@ -208,10 +236,11 @@ Route::RouteList Route::list(IPAddress::Family family)
 	char *buf = new char[needed];
 
 	if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
-		throw std::runtime_error("sysctl faield to populate routing table");
+		throw std::runtime_error("sysctl failed to populate routing table");
 
 	struct rt_msghdr2 *rtm = NULL;
-	for (char *next = buf, *lim = &buf[needed]; next < lim; next += rtm->rtm_msglen) {
+	for (char *next = buf, *lim = &buf[needed]; next < lim; next += rtm->rtm_msglen)
+	{
 		rtm = (struct rt_msghdr2 *)next;
 
 		struct sockaddr_in *sin = (struct sockaddr_in*)(rtm + 1);
@@ -224,14 +253,15 @@ Route::RouteList Route::list(IPAddress::Family family)
 		struct sockaddr* rti_info[RTAX_MAX];
 		get_rtaddrs(rtm->rtm_addrs, (struct sockaddr *)sin, rti_info);
 
-		Route *route = RouteHelper::createRoute(rtm, rti_info);
-
 		// RTF_IFSCOPE?
 
-		routes.push_back(route);
+		routes.push_back(createRoute(rtm, rti_info));
 	}
 
 	delete[] buf;
 
 	return routes;
 }
+	
+
+}} // namespace Poco::Net

Net/testsuite/Makefile

@@ -24,7 +24,7 @@ objects = \
 	SocketReactorTest ReactorTestSuite \
 	MailTestSuite MailMessageTest MailStreamTest \
 	SMTPClientSessionTest POP3ClientSessionTest \
-	RawSocketTest ICMPClientTest ICMPSocketTest ICMPClientTestSuite \
+	RawSocketTest RouteTest ICMPClientTest ICMPSocketTest ICMPClientTestSuite \
 	WebSocketTest WebSocketTestSuite \
 	SyslogTest
 

Net/testsuite/src/RouteTest.cpp

@@ -36,6 +36,7 @@
 #include "Poco/Net/IPAddress.h"
 #include "Poco/Net/Route.h"
 #include "Poco/Net/NetException.h"
+#include <iostream>
 #include <iomanip>
 
 
@@ -67,63 +68,6 @@ RouteTest::~RouteTest()
 // with results we get back from NetworkInterface::list().
 //
 
-void RouteTest::testAllRoutes()
-{
-	Route::RouteList routes = Route::list(IPAddress::IPv4);
-	assert(routes.size() >= 3);
-
-	std::cout << "Active IPv4 Routes:" << std::endl;
-	std::cout << "=============================================================================" << std::endl;
-	std::cout << std::setw(17) << "Destinaton" 
-		<< std::setw(17) << "Netmask" 
-		<< std::setw(17) << "Gateway" 
-		<< std::setw(17) << "Interface" 
-		<< std::setw(8) << "Metric" << std::endl;
-
-	Route::RouteList::const_iterator it = routes.begin();
-	Route::RouteList::const_iterator end = routes.end();
-	for (; it != end; ++it)
-	{
-		IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv4);
-		if (!ip.isLinkLocal())
-		{
-			std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString();
-			std::cout << std::setw(17) << it->getDest().toString()
-				<< std::setw(17) << it->getNetmask().toString()
-				<< std::setw(17) << gateway
-				<< std::setw(17) << ip.toString()
-				<< std::setw(8) << it->getMetric() << std::endl;
-		}
-	}
-	std::cout << "=============================================================================" << std::endl;
-
-	routes = Route::list(IPAddress::IPv6);
-	assert(routes.size() >= 3);
-
-	std::cout << std::endl << "Active IPv6 Routes:" << std::endl;
-	std::cout << "=============================================================" << std::endl;
-	std::cout << std::setw(4) << "If"
-		<< std::setw(7) << "Metric" 
-		<< std::setw(41) << "Destinaton" 
-		<< std::setw(8) << "Gateway" 
-		<< std::endl;
-
-	it = routes.begin();
-	for (; it != end; ++it)
-	{
-		IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv6);
-		if (!ip.isLinkLocal())
-		{
-			std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString();
-			std::cout << std::setw(4) << it->getIfIndex()
-				<< std::setw(7) << it->getMetric()
-				<< std::setw(41) << it->getDest().toString()
-				<< std::setw(8) << gateway << std::endl;
-		}
-	}
-	std::cout << "=============================================================" << std::endl;
-}
-
 
 void RouteTest::testDefaultRoute()
 {
@@ -158,6 +102,81 @@ void RouteTest::tearDown()
 }
 
 
+void RouteTest::testAllRoutes()
+{
+	std::string metric = "Metric";
+#if defined(POCO_OS_FAMILY_BSD)
+	metric = "Expire";
+#endif
+	Route::RouteList routes = Route::list(IPAddress::IPv4);
+	assert(routes.size() >= 3);
+	
+	std::cout << std::endl << "Active IPv4 Routes:" << std::endl;
+	std::cout << "=============================================================================" << std::endl;
+	std::cout << std::setw(17) << "Destinaton"
+	<< std::setw(17) << "Netmask"
+	<< std::setw(17) << "Gateway"
+	<< std::setw(17) << "Interface"
+	<< std::setw(8) << metric << std::endl;
+	
+	Route::RouteList::const_iterator it = routes.begin();
+	Route::RouteList::const_iterator end = routes.end();
+	for (; it != end; ++it)
+	{
+		IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv4);
+		if (!ip.isLinkLocal())
+		{
+			std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString();
+			std::cout << std::setw(17) << it->getDest().toString()
+			<< std::setw(17) << it->getNetmask().toString()
+			<< std::setw(17) << gateway
+#if defined(POCO_OS_FAMILY_BSD)
+			<< std::setw(17) << it->getNetworkInterface().name();
+#else
+			<< std::setw(17) << ip.toString();
+#endif
+			if (it->getMetric() != Route::ROUTE_METRIC_UNKNOWN)
+				std::cout << std::setw(8) << it->getMetric();
+			std::cout << std::endl;
+		}
+	}
+	std::cout << "=============================================================================" << std::endl;
+	
+	routes = Route::list(IPAddress::IPv6);
+	assert(routes.size() >= 3);
+	
+	std::cout << std::endl << "Active IPv6 Routes:" << std::endl;
+	std::cout << "=============================================================" << std::endl;
+	std::cout << std::setw(4) << "If"
+	<< std::setw(7) << metric
+	<< std::setw(41) << "Destinaton"
+	<< std::setw(41) << "Gateway"
+	<< std::endl;
+	
+	it = routes.begin();
+	for (; it != end; ++it)
+	{
+		IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv6);
+		if (!ip.isLinkLocal())
+		{
+			std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString();
+#if defined(POCO_OS_FAMILY_BSD)
+			std::cout << std::setw(4) << it->getNetworkInterface().name();
+#else
+			std::cout << std::setw(4) << it->getIfIndex();
+#endif
+			if (it->getMetric() != Route::ROUTE_METRIC_UNKNOWN)
+				std::cout << std::setw(7) << it->getMetric();
+			else
+				std::cout << std::setw(7) << "";
+			std::cout << std::setw(41) << it->getDest().toString()
+			<< std::setw(41) << gateway << std::endl;
+		}
+	}
+	std::cout << "=============================================================" << std::endl;
+}
+
+
 CppUnit::Test* RouteTest::suite()
 {
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("RouteTest");