diff options
author | Thomas Graf <tgr@lsx.localdomain> | 2008-05-22 23:51:02 +0200 |
---|---|---|
committer | Thomas Graf <tgr@lsx.localdomain> | 2008-05-22 23:51:02 +0200 |
commit | 18efaacc169635f891b0c9b869f4e0db18584258 (patch) | |
tree | aae87b6eab0c64a99c912390586a9f90dfccc44b | |
parent | 566a09ecbd0f69ad277246780ee92584c7e2fbfd (diff) | |
download | android_external_libnl-18efaacc169635f891b0c9b869f4e0db18584258.tar.gz android_external_libnl-18efaacc169635f891b0c9b869f4e0db18584258.tar.bz2 android_external_libnl-18efaacc169635f891b0c9b869f4e0db18584258.zip |
Improve printing of routing rules
-rw-r--r-- | lib/route/rule.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/route/rule.c b/lib/route/rule.c index 12a0d05..df16604 100644 --- a/lib/route/rule.c +++ b/lib/route/rule.c @@ -174,10 +174,8 @@ static int rule_dump_brief(struct nl_object *o, struct nl_dump_params *p) struct rtnl_rule *r = (struct rtnl_rule *) o; char buf[128]; - if (r->ce_mask & RULE_ATTR_PRIO) - dp_dump(p, "%d:\t", r->r_prio); - else - dp_dump(p, "0:\t"); + dp_dump(p, "%8d ", (r->ce_mask & RULE_ATTR_PRIO) ? r->r_prio : 0); + dp_dump(p, "%s ", nl_af2str(r->r_family, buf, sizeof(buf))); if (r->ce_mask & RULE_ATTR_SRC) dp_dump(p, "from %s ", @@ -222,15 +220,10 @@ static int rule_dump_full(struct nl_object *obj, struct nl_dump_params *p) line = rule_dump_brief(obj, p); - dp_dump_line(p, line++, " family %s", - nl_af2str(rule->r_family, buf, sizeof(buf))); - if (rule->ce_mask & RULE_ATTR_SRCMAP) - dp_dump(p, " srcmap %s", + dp_dump_line(p, line++, " srcmap %s\n", nl_addr2str(rule->r_srcmap, buf, sizeof(buf))); - dp_dump(p, "\n"); - return line; } |