ip route: Change type mask to bitmask
Allow option to select multiple route types to show or exlude
specific route types.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
diff --git a/ip/iproute.c b/ip/iproute.c
index 7c0f5a4..e785d40 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -113,7 +113,7 @@
int flushe;
int protocol, protocolmask;
int scope, scopemask;
- int type, typemask;
+ __u64 typemask;
int tos, tosmask;
int iif, iifmask;
int oif, oifmask;
@@ -178,7 +178,8 @@
return 0;
if ((filter.scope^r->rtm_scope)&filter.scopemask)
return 0;
- if ((filter.type^r->rtm_type)&filter.typemask)
+
+ if (filter.typemask && !(filter.typemask & (1 << r->rtm_type)))
return 0;
if ((filter.tos^r->rtm_tos)&filter.tosmask)
return 0;
@@ -365,7 +366,8 @@
if (n->nlmsg_type == RTM_DELROUTE)
fprintf(fp, "Deleted ");
- if ((r->rtm_type != RTN_UNICAST || show_details > 0) && !filter.type)
+ if ((r->rtm_type != RTN_UNICAST || show_details > 0) &&
+ (!filter.typemask || (filter.typemask & (1 << r->rtm_type))))
fprintf(fp, "%s ", rtnl_rtntype_n2a(r->rtm_type, b1, sizeof(b1)));
if (tb[RTA_DST]) {
@@ -1430,10 +1432,9 @@
int type;
NEXT_ARG();
- filter.typemask = -1;
if (rtnl_rtntype_a2n(&type, *argv))
invarg("node type value is invalid\n", *argv);
- filter.type = type;
+ filter.typemask = (1<<type);
} else if (strcmp(*argv, "dev") == 0 ||
strcmp(*argv, "oif") == 0) {
NEXT_ARG();