diff options
Diffstat (limited to 'proto/babel')
| -rw-r--r-- | proto/babel/babel.c | 12 | ||||
| -rw-r--r-- | proto/babel/config.Y | 8 |
2 files changed, 4 insertions, 16 deletions
diff --git a/proto/babel/babel.c b/proto/babel/babel.c index ba98598b..618abaa8 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -1891,7 +1891,6 @@ babel_show_interfaces(struct proto *P, const char *iff) if (p->p.proto_state != PS_UP) { cli_msg(-1023, "%s: is not up", p->p.name); - cli_msg(0, ""); return; } @@ -1915,8 +1914,6 @@ babel_show_interfaces(struct proto *P, const char *iff) ifa->cf->rxcost, nbrs, MAX(timer, 0), ifa->next_hop_ip4, ifa->next_hop_ip6); } - - cli_msg(0, ""); } void @@ -1930,7 +1927,6 @@ babel_show_neighbors(struct proto *P, const char *iff) if (p->p.proto_state != PS_UP) { cli_msg(-1024, "%s: is not up", p->p.name); - cli_msg(0, ""); return; } @@ -1955,8 +1951,6 @@ babel_show_neighbors(struct proto *P, const char *iff) n->addr, ifa->iface->name, n->cost, rts, hellos, MAX(timer, 0)); } } - - cli_msg(0, ""); } static void @@ -1998,7 +1992,6 @@ babel_show_entries(struct proto *P) if (p->p.proto_state != PS_UP) { cli_msg(-1025, "%s: is not up", p->p.name); - cli_msg(0, ""); return; } @@ -2008,8 +2001,6 @@ babel_show_entries(struct proto *P) babel_show_entries_(p, &p->ip4_rtable); babel_show_entries_(p, &p->ip6_rtable); - - cli_msg(0, ""); } static void @@ -2041,7 +2032,6 @@ babel_show_routes(struct proto *P) if (p->p.proto_state != PS_UP) { cli_msg(-1025, "%s: is not up", p->p.name); - cli_msg(0, ""); return; } @@ -2051,8 +2041,6 @@ babel_show_routes(struct proto *P) babel_show_routes_(p, &p->ip4_rtable); babel_show_routes_(p, &p->ip6_rtable); - - cli_msg(0, ""); } diff --git a/proto/babel/config.Y b/proto/babel/config.Y index b6bc70fa..2f3b637b 100644 --- a/proto/babel/config.Y +++ b/proto/babel/config.Y @@ -130,16 +130,16 @@ dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_BAB CF_CLI_HELP(SHOW BABEL, ..., [[Show information about Babel protocol]]); CF_CLI(SHOW BABEL INTERFACES, optproto opttext, [<name>] [\"<interface>\"], [[Show information about Babel interfaces]]) -{ babel_show_interfaces(proto_get_named($4, &proto_babel), $5); }; +{ PROTO_WALK_CMD($4, &proto_babel, p) babel_show_interfaces(p, $5); }; CF_CLI(SHOW BABEL NEIGHBORS, optproto opttext, [<name>] [\"<interface>\"], [[Show information about Babel neighbors]]) -{ babel_show_neighbors(proto_get_named($4, &proto_babel), $5); }; +{ PROTO_WALK_CMD($4, &proto_babel, p) babel_show_neighbors(p, $5); }; CF_CLI(SHOW BABEL ENTRIES, optproto opttext, [<name>], [[Show information about Babel prefix entries]]) -{ babel_show_entries(proto_get_named($4, &proto_babel)); }; +{ PROTO_WALK_CMD($4, &proto_babel, p) babel_show_entries(p); }; CF_CLI(SHOW BABEL ROUTES, optproto opttext, [<name>], [[Show information about Babel route entries]]) -{ babel_show_routes(proto_get_named($4, &proto_babel)); }; +{ PROTO_WALK_CMD($4, &proto_babel, p) babel_show_routes(p); }; CF_CODE |