[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20100723133608.GA12942@babylon>
Date: Fri, 23 Jul 2010 15:36:08 +0200
From: Ulrich Weber <uweber@...aro.com>
To: shemminger@...tta.com
Cc: netdev@...r.kernel.org
Subject: [PATCH] iproute2: filter routing entries based on clone flag
Before IPv6 routing cache entries were always displayed
if additional tables beside MAIN and LOCAL are installed.
Signed-off-by: Ulrich Weber <uweber@...aro.com>
---
ip/iproute.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ip/iproute.c b/ip/iproute.c
index 8252e18..fce7f33 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -160,14 +160,11 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN)
ip6_multiple_tables = 1;
+ if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED))
+ return 0;
+
if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) {
- if (filter.cloned) {
- if (!(r->rtm_flags&RTM_F_CLONED))
- return 0;
- }
if (filter.tb) {
- if (!filter.cloned && r->rtm_flags&RTM_F_CLONED)
- return 0;
if (filter.tb == RT_TABLE_LOCAL) {
if (r->rtm_type != RTN_LOCAL)
return 0;
@@ -179,10 +176,6 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
}
}
} else {
- if (filter.cloned) {
- if (!(r->rtm_flags&RTM_F_CLONED))
- return 0;
- }
if (filter.tb > 0 && filter.tb != table)
return 0;
}
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists