diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 17:30:56 +0200 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 17:30:56 +0200 |
commit | 22106bbf6870c19db1a06f3182b894c852686eae (patch) | |
tree | 9b2c8861988a80aa42d3095b804190e38d409903 /ospf6d/ospf6_abr.c | |
parent | ospf6d: rewrite ospf6_lsdb_lookup_next() (diff) | |
parent | Merge pull request #803 from opensourcerouting/redhat-doc-fixes-master (diff) | |
download | frr-22106bbf6870c19db1a06f3182b894c852686eae.tar.xz frr-22106bbf6870c19db1a06f3182b894c852686eae.zip |
Merge remote-tracking branch 'frr/master' into table-hash-ospf6-lsdb-refactor
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_abr.c')
-rw-r--r-- | ospf6d/ospf6_abr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 5ef6604cc..2e195d0af 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -1062,16 +1062,16 @@ ospf6_inter_area_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa) prefix_lsa = (struct ospf6_inter_prefix_lsa *) OSPF6_LSA_HEADER_END (lsa->header); - vty_out (vty, " Metric: %lu%s", - (u_long) OSPF6_ABR_SUMMARY_METRIC (prefix_lsa), VNL); + vty_out (vty, " Metric: %lu\n", + (u_long) OSPF6_ABR_SUMMARY_METRIC (prefix_lsa)); ospf6_prefix_options_printbuf (prefix_lsa->prefix.prefix_options, buf, sizeof (buf)); - vty_out (vty, " Prefix Options: %s%s", buf, VNL); + vty_out (vty, " Prefix Options: %s\n", buf); - vty_out (vty, " Prefix: %s%s", + vty_out (vty, " Prefix: %s\n", ospf6_inter_area_prefix_lsa_get_prefix_str (lsa, buf, sizeof(buf), - 0), VNL); + 0)); return 0; } @@ -1105,12 +1105,12 @@ ospf6_inter_area_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa) OSPF6_LSA_HEADER_END (lsa->header); ospf6_options_printbuf (router_lsa->options, buf, sizeof (buf)); - vty_out (vty, " Options: %s%s", buf, VNL); - vty_out (vty, " Metric: %lu%s", - (u_long) OSPF6_ABR_SUMMARY_METRIC (router_lsa), VNL); + vty_out (vty, " Options: %s\n", buf); + vty_out (vty, " Metric: %lu\n", + (u_long) OSPF6_ABR_SUMMARY_METRIC (router_lsa)); inet_ntop (AF_INET, &router_lsa->router_id, buf, sizeof (buf)); - vty_out (vty, " Destination Router ID: %s%s", buf, VNL); + vty_out (vty, " Destination Router ID: %s\n", buf); return 0; } @@ -1145,7 +1145,7 @@ int config_write_ospf6_debug_abr (struct vty *vty) { if (IS_OSPF6_DEBUG_ABR) - vty_out (vty, "debug ospf6 abr%s", VNL); + vty_out (vty, "debug ospf6 abr\n"); return 0; } |