iproute2: filter routing entries based on clone flag

PATCH New Ulrich Weber 1 participant 1 message Jul 23, 2010

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Ulrich Weber

author

2010-07-23 13:51 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 ip/iproute.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

ip/iproute.c +3 ~~-10~~

index 8252e18..fce7f33 100644
@@ -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;
 	}

Signature · 1 line

1.7.0.4