summaryrefslogtreecommitdiff
path: root/proto/static
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2020-05-14 03:48:17 +0200
committerOndrej Zajicek (work) <santiago@crfreenet.org>2020-06-28 15:38:47 +0200
commitc26c6bc2d78a2fe76f27dcc9fbb5afc95c3a7626 (patch)
treeb9058f04982a155d2a214e488e143bf1fac36597 /proto/static
parenta948cf9a5c338518773e6c98e895c829c469f56b (diff)
Show info from multiple protocols when protocol is not specified
Most commands like 'show ospf neighbors' fail when protocol is not specified and there are multiple instances of given protocol type. This is annoying in BIRD 2, as many protocols have IPv4 and IPv6 instances. The patch changes that by showing output from all protocol instances of appropriate type. Note that the patch also removes terminating cli_msg() call from these commands and moves it to the common iterating code.
Diffstat (limited to 'proto/static')
-rw-r--r--proto/static/config.Y2
-rw-r--r--proto/static/static.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/proto/static/config.Y b/proto/static/config.Y
index 6e410879..41e10dbf 100644
--- a/proto/static/config.Y
+++ b/proto/static/config.Y
@@ -158,7 +158,7 @@ stat_route_opt_list:
CF_CLI(SHOW STATIC, optproto, [<name>], [[Show details of static protocol]])
-{ static_show(proto_get_named($3, &proto_static)); } ;
+{ PROTO_WALK_CMD($3, &proto_static, p) static_show(p); } ;
CF_CODE
diff --git a/proto/static/static.c b/proto/static/static.c
index c899cc87..72b14991 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -647,7 +647,6 @@ static_show(struct proto *P)
WALK_LIST(r, c->routes)
static_show_rt(r);
- cli_msg(0, "");
}