diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-13 18:50:29 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 10:19:58 +0200 |
| commit | 181039f3d7a5f59ed31274210a9626f2cc5f673e (patch) | |
| tree | 945a074b1f8f7bd53c21e6b65ec7e08de15b2121 /babeld | |
| parent | *: ditch vty_outln(), part 1 of 2 (diff) | |
| download | frr-181039f3d7a5f59ed31274210a9626f2cc5f673e.tar.xz frr-181039f3d7a5f59ed31274210a9626f2cc5f673e.zip | |
*: ditch vty_outln(), part 2 of 2
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'babeld')
| -rw-r--r-- | babeld/babel_interface.c | 10 | ||||
| -rw-r--r-- | babeld/babel_main.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index 5d60f4193..831df9b68 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -879,7 +879,7 @@ show_babel_interface_sub (struct vty *vty, struct interface *ifp) } babel_ifp = babel_get_if_nfo (ifp); vty_out (vty, " Babel protocol is running on this interface\n"); - vty_outln (vty, " Operating mode is \"%s\"", + vty_out (vty, " Operating mode is \"%s\"\n", CHECK_FLAG(babel_ifp->flags, BABEL_IF_WIRED) ? "wired" : "wireless"); vty_out (vty, " Split horizon mode is %s\n", CHECK_FLAG(babel_ifp->flags, BABEL_IF_SPLIT_HORIZON) ? "On" : "Off"); @@ -917,9 +917,9 @@ DEFUN (show_babel_interface, static void show_babel_neighbour_sub (struct vty *vty, struct neighbour *neigh) { - vty_outln (vty, + vty_out (vty, "Neighbour %s dev %s reach %04x rxcost %d txcost %d " - "rtt %s rttcost %d%s.", + "rtt %s rttcost %d%s.\n", format_address(neigh->address), neigh->ifp->name, neigh->reach, @@ -1009,9 +1009,9 @@ show_babel_routes_sub(struct babel_route *route, struct vty *vty, channels[0] = '\0'; } - vty_outln (vty, + vty_out (vty, "%s metric %d refmetric %d id %s seqno %d%s age %d " - "via %s neigh %s%s%s%s", + "via %s neigh %s%s%s%s\n", format_prefix(route->src->prefix, route->src->plen), route_metric(route), route->refmetric, format_eui64(route->src->id), diff --git a/babeld/babel_main.c b/babeld/babel_main.c index eb2909b40..725b2b432 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -377,7 +377,7 @@ babel_save_state_file(void) void show_babel_main_configuration (struct vty *vty) { - vty_outln (vty, + vty_out (vty, "state file = %s%s" "configuration file = %s%s" "protocol informations:%s" @@ -386,7 +386,7 @@ show_babel_main_configuration (struct vty *vty) "vty address = %s%s" "vty port = %d%s" "id = %s%s" - "kernel_metric = %d", + "kernel_metric = %d\n", state_file, VTYNL, babel_config_file ? babel_config_file : babel_config_default, VTYNL, |