From 8ccc01cf2d7ee051e7a38e045ba08aebb4445e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 13 Aug 2010 08:02:40 +0000 Subject: [PATCH] * Improved the output of the "net_domains" KDL command. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38077 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/network/stack/domains.cpp | 11 +++++++++-- src/add-ons/kernel/network/stack/routes.cpp | 20 -------------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/add-ons/kernel/network/stack/domains.cpp b/src/add-ons/kernel/network/stack/domains.cpp index 03fac2e268..b331172d83 100644 --- a/src/add-ons/kernel/network/stack/domains.cpp +++ b/src/add-ons/kernel/network/stack/domains.cpp @@ -13,6 +13,7 @@ #include "stack_private.h" #include +#include #include #include @@ -75,8 +76,14 @@ dump_domains(int argc, char** argv) kprintf(" routes:\n"); RouteList::Iterator routeIterator = domain->routes.GetIterator(); - while (net_route* route = routeIterator.Next()) { - kprintf(" %p\n", route); + while (net_route_private* route = routeIterator.Next()) { + kprintf(" %p: dest %s, mask %s, gw %s, flags %lx, address %p\n", + route, AddressString(domain, route->destination + ? route->destination : NULL).Data(), + AddressString(domain, route->mask ? route->mask : NULL).Data(), + AddressString(domain, route->gateway + ? route->gateway : NULL).Data(), + route->flags, route->interface_address); } if (!domain->route_infos.IsEmpty()) diff --git a/src/add-ons/kernel/network/stack/routes.cpp b/src/add-ons/kernel/network/stack/routes.cpp index e2b8777b4a..0a704072e8 100644 --- a/src/add-ons/kernel/network/stack/routes.cpp +++ b/src/add-ons/kernel/network/stack/routes.cpp @@ -54,26 +54,6 @@ net_route_private::~net_route_private() // #pragma mark - private functions -#if 0 -static void -dump_routes(net_domain_private* domain) -{ - RouteList::Iterator iterator = domain->routes.GetIterator(); - uint32 count = 1; - - while (iterator.HasNext()) { - net_route_private* route = iterator.Next(); - - dprintf(" [%lu] dest %s, mask %s, gw %s, flags %lx\n", count++, - AddressString(domain, route->destination ? route->destination : NULL).Data(), - AddressString(domain, route->mask ? route->mask : NULL).Data(), - AddressString(domain, route->gateway ? route->gateway : NULL).Data(), - route->flags); - } -} -#endif - - static status_t user_copy_address(const sockaddr* from, sockaddr** to) {