proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 19:06:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: remove VTYNL, part 6 of 6

Browse Source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-07-13 20:17:06 +02:00
parent cdda201036
commit 625e016d14
20 changed files with 189 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/rfapi/rfapi_rib.c
View File

@ -2500,19 +2500,18 @@ rfapiRibShowResponses (
{ {
++printedheader; ++printedheader;
fp (out, "%s[%s]\n", fp (out, "\n[%s]\n",
VTYNL,
show_removed ? "Removed" : "Active"); show_removed ? "Removed" : "Active");
fp (out, "%-15s %-15s\n", "Querying VN", "Querying UN"); fp (out, "%-15s %-15s\n", "Querying VN", "Querying UN");
fp (out, " %-20s %-15s %-15s %4s %-8s %-8s%s", fp (out, " %-20s %-15s %-15s %4s %-8s %-8s\n",
"Prefix", "Registered VN", "Registered UN", "Cost", "Prefix", "Registered VN", "Registered UN", "Cost",
"Lifetime", "Lifetime",
#if RFAPI_REGISTRATIONS_REPORT_AGE #if RFAPI_REGISTRATIONS_REPORT_AGE
"Age", "Age"
#else #else
"Remaining", "Remaining"
#endif #endif
VTYNL); );
} }
if (!printednve) if (!printednve)
{ {

4
bgpd/rfapi/rfapi_vty.c
View File

@ -385,14 +385,14 @@ rfapiStdioPrintf (void *stream, const char *format, ...)
/* Fake out for debug logging */ /* Fake out for debug logging */
static struct vty vty_dummy_zlog; static struct vty vty_dummy_zlog;
static struct vty vty_dummy_stdio; static struct vty vty_dummy_stdio;
#define HVTYNL ((vty == &vty_dummy_zlog)? "": VTYNL) #define HVTYNL ((vty == &vty_dummy_zlog)? "": "\n")
static const char * static const char *
str_vty_newline (struct vty *vty) str_vty_newline (struct vty *vty)
{ {
if (vty == &vty_dummy_zlog) if (vty == &vty_dummy_zlog)
return ""; return "";
return VTYNL; return "\n";
} }
int int

17
eigrpd/eigrp_dump.c
View File

@ -210,11 +210,11 @@ void
show_ip_eigrp_interface_header (struct vty *vty, struct eigrp *eigrp) show_ip_eigrp_interface_header (struct vty *vty, struct eigrp *eigrp)
{ {
vty_out (vty, "\n%s%d%s%s%s %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s%s %-39s %-12s %-7s %-14s %-12s %-8s\n", vty_out (vty, "\nEIGRP interfaces for AS(%d)\n\n %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s\n %-39s %-12s %-7s %-14s %-12s %-8s\n",
"EIGRP interfaces for AS(",eigrp->AS,")",VTYNL,VTYNL, eigrp->AS,
"Interface", "Bandwidth", "Delay", "Peers", "Xmit Queue", "Mean", "Interface", "Bandwidth", "Delay", "Peers", "Xmit Queue", "Mean",
"Pacing Time", "Multicast", "Pending", "Hello", "Holdtime", "Pacing Time", "Multicast", "Pending", "Hello", "Holdtime",
VTYNL,"","Un/Reliable","SRTT","Un/Reliable","Flow Timer", "","Un/Reliable","SRTT","Un/Reliable","Flow Timer",
"Routes"); "Routes");
} }
@ -256,11 +256,11 @@ show_ip_eigrp_interface_detail (struct vty *vty, struct eigrp *eigrp,
void void
show_ip_eigrp_neighbor_header (struct vty *vty, struct eigrp *eigrp) show_ip_eigrp_neighbor_header (struct vty *vty, struct eigrp *eigrp)
{ {
vty_out (vty, "\n%s%d%s%s%s%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s%s %-41s %-6s %-8s %-6s %-4s %-6s %-5s \n", vty_out (vty, "\nEIGRP neighbors for AS(%d)\n\n%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s\n %-41s %-6s %-8s %-6s %-4s %-6s %-5s \n",
"EIGRP neighbors for AS(",eigrp->AS,")",VTYNL,VTYNL, eigrp->AS,
"H", "Address", "Interface", "Hold", "Uptime", "H", "Address", "Interface", "Hold", "Uptime",
"SRTT", "RTO", "Q", "Seq", VTYNL "SRTT", "RTO", "Q", "Seq",
,"","(sec)","","(ms)","","Cnt","Num"); "","(sec)","","(ms)","","Cnt","Num");
} }
void void
@ -298,8 +298,7 @@ show_ip_eigrp_topology_header (struct vty *vty, struct eigrp *eigrp)
vty_out (vty, "\nEIGRP Topology Table for AS(%d)/ID(%s)\n\n", eigrp->AS, inet_ntoa(router_id)); vty_out (vty, "\nEIGRP Topology Table for AS(%d)/ID(%s)\n\n", eigrp->AS, inet_ntoa(router_id));
vty_out (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, " vty_out (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, "
"R - Reply%s r - reply Status, s - sia Status%s\n", "R - Reply\n r - reply Status, s - sia Status\n\n");
VTYNL, VTYNL);
} }
void void

56
ldpd/ldp_vty_exec.c
View File

@ -232,23 +232,23 @@ show_discovery_detail_adj(struct vty *vty, char *buffer, struct ctl_adj *adj)
size_t buflen = strlen(buffer); size_t buflen = strlen(buffer);
snprintf(buffer + buflen, LDPBUFSIZ - buflen, snprintf(buffer + buflen, LDPBUFSIZ - buflen,
" LSR Id: %s:0%s", inet_ntoa(adj->id), VTYNL); " LSR Id: %s:0\n", inet_ntoa(adj->id));
buflen = strlen(buffer); buflen = strlen(buffer);
snprintf(buffer + buflen, LDPBUFSIZ - buflen, snprintf(buffer + buflen, LDPBUFSIZ - buflen,
" Source address: %s%s", " Source address: %s\n",
log_addr(adj->af, &adj->src_addr), VTYNL); log_addr(adj->af, &adj->src_addr));
buflen = strlen(buffer); buflen = strlen(buffer);
snprintf(buffer + buflen, LDPBUFSIZ - buflen, snprintf(buffer + buflen, LDPBUFSIZ - buflen,
" Transport address: %s%s", " Transport address: %s\n",
log_addr(adj->af, &adj->trans_addr), VTYNL); log_addr(adj->af, &adj->trans_addr));
buflen = strlen(buffer); buflen = strlen(buffer);
snprintf(buffer + buflen, LDPBUFSIZ - buflen, snprintf(buffer + buflen, LDPBUFSIZ - buflen,
" Hello hold time: %u secs (due in %u secs)%s", " Hello hold time: %u secs (due in %u secs)\n",
adj->holdtime, adj->holdtime_remaining, VTYNL); adj->holdtime, adj->holdtime_remaining);
buflen = strlen(buffer); buflen = strlen(buffer);
snprintf(buffer + buflen, LDPBUFSIZ - buflen, snprintf(buffer + buflen, LDPBUFSIZ - buflen,
" Dual-stack capability TLV: %s%s", " Dual-stack capability TLV: %s\n",
(adj->ds_tlv) ? "yes" : "no", VTYNL); (adj->ds_tlv) ? "yes" : "no");
} }
static int static int
@ -279,8 +279,8 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg,
buflen = strlen(ifaces_buffer); buflen = strlen(ifaces_buffer);
snprintf(ifaces_buffer + buflen, LDPBUFSIZ - buflen, snprintf(ifaces_buffer + buflen, LDPBUFSIZ - buflen,
" %s: %s%s", iface->name, (iface->no_adj) ? " %s: %s\n", iface->name, (iface->no_adj) ?
"(no adjacencies)" : "", VTYNL); "(no adjacencies)" : "");
break; break;
case IMSG_CTL_SHOW_DISC_TNBR: case IMSG_CTL_SHOW_DISC_TNBR:
tnbr = imsg->data; tnbr = imsg->data;
@ -292,9 +292,9 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg,
tnbr->af))->trans_addr; tnbr->af))->trans_addr;
buflen = strlen(tnbrs_buffer); buflen = strlen(tnbrs_buffer);
snprintf(tnbrs_buffer + buflen, LDPBUFSIZ - buflen, snprintf(tnbrs_buffer + buflen, LDPBUFSIZ - buflen,
" %s -> %s: %s%s", log_addr(tnbr->af, trans_addr), " %s -> %s: %s\n", log_addr(tnbr->af, trans_addr),
log_addr(tnbr->af, &tnbr->addr), (tnbr->no_adj) ? log_addr(tnbr->af, &tnbr->addr), (tnbr->no_adj) ?
"(no adjacencies)" : "", VTYNL); "(no adjacencies)" : "");
break; break;
case IMSG_CTL_SHOW_DISC_ADJ: case IMSG_CTL_SHOW_DISC_ADJ:
adj = imsg->data; adj = imsg->data;
@ -531,12 +531,12 @@ show_nbr_detail_adj(struct vty *vty, char *buffer, struct ctl_adj *adj)
switch (adj->type) { switch (adj->type) {
case HELLO_LINK: case HELLO_LINK:
snprintf(buffer + buflen, LDPBUFSIZ - buflen, snprintf(buffer + buflen, LDPBUFSIZ - buflen,
" Interface: %s%s", adj->ifname, VTYNL); " Interface: %s\n", adj->ifname);
break; break;
case HELLO_TARGETED: case HELLO_TARGETED:
snprintf(buffer + buflen, LDPBUFSIZ - buflen, snprintf(buffer + buflen, LDPBUFSIZ - buflen,
" Targeted Hello: %s%s", log_addr(adj->af, " Targeted Hello: %s\n", log_addr(adj->af,
&adj->src_addr), VTYNL); &adj->src_addr));
break; break;
} }
} }
@ -869,11 +869,10 @@ show_nbr_detail_msg_json(struct imsg *imsg, struct show_params *params,
void void
show_nbr_capabilities(struct vty *vty, struct ctl_nbr *nbr) show_nbr_capabilities(struct vty *vty, struct ctl_nbr *nbr)
{ {
vty_out (vty, " Capabilities Sent:%s" vty_out (vty, " Capabilities Sent:\n"
" - Dynamic Announcement (0x0506)%s" " - Dynamic Announcement (0x0506)\n"
" - Typed Wildcard (0x050B)%s" " - Typed Wildcard (0x050B)\n"
" - Unrecognized Notification (0x0603)\n", " - Unrecognized Notification (0x0603)\n");
VTYNL, VTYNL, VTYNL);
vty_out (vty, " Capabilities Received:\n"); vty_out (vty, " Capabilities Received:\n");
if (nbr->flags & F_NBR_CAP_DYNAMIC) if (nbr->flags & F_NBR_CAP_DYNAMIC)
vty_out (vty," - Dynamic Announcement (0x0506)\n"); vty_out (vty," - Dynamic Announcement (0x0506)\n");
@ -1077,15 +1076,15 @@ show_lib_detail_msg(struct vty *vty, struct imsg *imsg, struct show_params *para
upstream = 1; upstream = 1;
buflen = strlen(sent_buffer); buflen = strlen(sent_buffer);
snprintf(sent_buffer + buflen, LDPBUFSIZ - buflen, snprintf(sent_buffer + buflen, LDPBUFSIZ - buflen,
"%12s%s:0%s", "", inet_ntoa(rt->nexthop), VTYNL); "%12s%s:0\n", "", inet_ntoa(rt->nexthop));
break; break;
case IMSG_CTL_SHOW_LIB_RCVD: case IMSG_CTL_SHOW_LIB_RCVD:
downstream = 1; downstream = 1;
buflen = strlen(rcvd_buffer); buflen = strlen(rcvd_buffer);
snprintf(rcvd_buffer + buflen, LDPBUFSIZ - buflen, snprintf(rcvd_buffer + buflen, LDPBUFSIZ - buflen,
"%12s%s:0, label %s%s%s", "", inet_ntoa(rt->nexthop), "%12s%s:0, label %s%s\n", "", inet_ntoa(rt->nexthop),
log_label(rt->remote_label), log_label(rt->remote_label),
rt->in_use ? " (in use)" : "", VTYNL); rt->in_use ? " (in use)" : "");
break; break;
case IMSG_CTL_SHOW_LIB_END: case IMSG_CTL_SHOW_LIB_END:
if (upstream) { if (upstream) {
@ -1695,11 +1694,10 @@ ldp_vty_show_capabilities(struct vty *vty, int json)
} }
vty_out (vty, vty_out (vty,
"Supported LDP Capabilities%s" "Supported LDP Capabilities\n"
" * Dynamic Announcement (0x0506)%s" " * Dynamic Announcement (0x0506)\n"
" * Typed Wildcard (0x050B)%s" " * Typed Wildcard (0x050B)\n"
" * Unrecognized Notification (0x0603)%s\n", VTYNL, " * Unrecognized Notification (0x0603)\n\n");
VTYNL, VTYNL, VTYNL);
return (0); return (0);
} }

4
lib/grammar_sandbox.c
View File

@ -414,9 +414,9 @@ DEFUN (grammar_findambig,
if (same) if (same)
{ {
vty_out (vty, "'%s' AMBIGUOUS:\n", cur->cmd); vty_out (vty, "'%s' AMBIGUOUS:\n", cur->cmd);
vty_out (vty, " %s%s '%s'\n", prev->el->name, VTYNL, vty_out (vty, " %s\n '%s'\n", prev->el->name,
prev->el->string); prev->el->string);
vty_out (vty, " %s%s '%s'\n", cur->el->name, VTYNL, vty_out (vty, " %s\n '%s'\n", cur->el->name,
cur->el->string); cur->el->string);
vty_out (vty, "\n"); vty_out (vty, "\n");
ambig++; ambig++;

2
lib/hash.c
View File

@ -467,7 +467,7 @@ DEFUN(show_hash_stats,
if (tt->nrows > 1) if (tt->nrows > 1)
{ {
ttable_colseps (tt, 0, RIGHT, true, '|'); ttable_colseps (tt, 0, RIGHT, true, '|');
char *table = ttable_dump (tt, VTYNL); char *table = ttable_dump (tt, "\n");
vty_out (vty, "%s\n", table); vty_out (vty, "%s\n", table);
XFREE (MTYPE_TMP, table); XFREE (MTYPE_TMP, table);
} }

12
lib/route_types.pl
View File

@ -113,19 +113,15 @@ sub codelist {
$protodetail{$p}->{"shorthelp"}); $protodetail{$p}->{"shorthelp"});
if (length($str . $s) > 70) { if (length($str . $s) > 70) {
$str =~ s/ $//; $str =~ s/ $//;
push @lines, $str . "%s\" \\\n"; push @lines, $str . "\\n\" \\\n";
$str = " \" "; $str = " \" ";
} }
$str .= $s; $str .= $s;
} }
$str =~ s/ $//; $str =~ s/ $//;
push @lines, $str . "%s\" \\\n"; push @lines, $str . "\\n\" \\\n";
push @lines, " \" > - selected route, * - FIB route%s%s\", \\\n"; push @lines, " \" > - selected route, * - FIB route\\n\\n\"";
my @nl = (); return join("", @lines);
for (my $c = 0; $c < @lines + 1; $c++) {
push @nl, "VTYNL"
}
return join("", @lines) ." ". join(", ", @nl);
} }
print "\n"; print "\n";

4
lib/thread.c
View File

@ -163,12 +163,12 @@ cpu_record_print(struct vty *vty, thread_type filter)
else else
vty_out(vty, "No data to display yet.\n"); vty_out(vty, "No data to display yet.\n");
vty_out(vty, VTYNL); vty_out(vty, "\n");
} }
} }
pthread_mutex_unlock (&masters_mtx); pthread_mutex_unlock (&masters_mtx);
vty_out(vty, VTYNL); vty_out(vty, "\n");
vty_out(vty, "Total thread statistics\n"); vty_out(vty, "Total thread statistics\n");
vty_out(vty, "-------------------------\n"); vty_out(vty, "-------------------------\n");
vty_out(vty, "%21s %18s %18s\n", "", "CPU (user+system):", "Real (wall-clock):"); vty_out(vty, "%21s %18s %18s\n", "", "CPU (user+system):", "Real (wall-clock):");

4
lib/vrf.c
View File

@ -474,8 +474,8 @@ DEFUN_NOSH (vrf,
if (strlen(vrfname) > VRF_NAMSIZ) if (strlen(vrfname) > VRF_NAMSIZ)
{ {
vty_out (vty, "%% VRF name %s is invalid: length exceeds " vty_out (vty, "%% VRF name %s is invalid: length exceeds "
"%d characters%s", "%d characters\n",
vrfname, VRF_NAMSIZ, VTYNL); vrfname, VRF_NAMSIZ);
return CMD_WARNING; return CMD_WARNING;
} }

4
lib/vty.h
View File

@ -156,7 +156,7 @@ static inline void vty_push_context(struct vty *vty,
#define VTY_CHECK_CONTEXT(ptr) \ #define VTY_CHECK_CONTEXT(ptr) \
if (!ptr) { \ if (!ptr) { \
vty_out (vty, "Current configuration object was deleted " \ vty_out (vty, "Current configuration object was deleted " \
"by another process.%s", VTYNL); \ "by another process.\n"); \
return CMD_WARNING; \ return CMD_WARNING; \
} }
@ -198,7 +198,7 @@ struct vty_arg
#define VNL "\n" \ #define VNL "\n" \
CPP_WARN("VNL has been replaced with \\n.") CPP_WARN("VNL has been replaced with \\n.")
#define VTYNL "\n" \ #define VTYNL "\n" \
/* CPP_WARN("VTYNL has been replaced with \\n.") */ CPP_WARN("VTYNL has been replaced with \\n.")
#define VTY_NEWLINE "\n" \ #define VTY_NEWLINE "\n" \
CPP_WARN("VTY_NEWLINE has been replaced with \\n.") CPP_WARN("VTY_NEWLINE has been replaced with \\n.")
#define VTY_GET_INTEGER(desc,v,str) {(v)=strtoul ((str), NULL, 10);} \ #define VTY_GET_INTEGER(desc,v,str) {(v)=strtoul ((str), NULL, 10);} \

6
nhrpd/nhrp_vty.c
View File

@ -678,14 +678,12 @@ static void show_ip_opennhrp_cache(struct nhrp_cache *c, void *pctx)
return; return;
vty_out(ctx->vty, vty_out(ctx->vty,
"Type: %s%s" "Type: %s\n"
"Flags:%s%s%s" "Flags:%s%s\n"
"Protocol-Address: %s/%zu\n", "Protocol-Address: %s/%zu\n",
nhrp_cache_type_str[c->cur.type], nhrp_cache_type_str[c->cur.type],
VTYNL,
(c->cur.peer && c->cur.peer->online) ? " up": "", (c->cur.peer && c->cur.peer->online) ? " up": "",
c->used ? " used": "", c->used ? " used": "",
VTYNL,
sockunion2str(&c->remote_addr, buf, sizeof buf), sockunion2str(&c->remote_addr, buf, sizeof buf),
8 * family2addrsize(sockunion_family(&c->remote_addr))); 8 * family2addrsize(sockunion_family(&c->remote_addr)));

4
ospf6d/ospf6_asbr.c
View File

@ -1269,8 +1269,8 @@ ospf6_as_external_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
/* Tag */ /* Tag */
if (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_T)) if (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_T))
{ {
vty_out (vty, " Tag: %"ROUTE_TAG_PRI"%s", vty_out (vty, " Tag: %"ROUTE_TAG_PRI"\n",
ospf6_as_external_lsa_get_tag (lsa), VTYNL); ospf6_as_external_lsa_get_tag (lsa));
} }
return 0; return 0;

16
ospf6d/ospf6_top.c
View File

@ -814,14 +814,14 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
vty_out (vty, " LSA minimum arrival %d msecs\n",o->lsa_minarrival); vty_out (vty, " LSA minimum arrival %d msecs\n",o->lsa_minarrival);
/* Show SPF parameters */ /* Show SPF parameters */
vty_out(vty, " Initial SPF scheduling delay %d millisec(s)%s" vty_out(vty, " Initial SPF scheduling delay %d millisec(s)\n"
" Minimum hold time between consecutive SPFs %d millsecond(s)%s" " Minimum hold time between consecutive SPFs %d millsecond(s)\n"
" Maximum hold time between consecutive SPFs %d millsecond(s)%s" " Maximum hold time between consecutive SPFs %d millsecond(s)\n"
" Hold time multiplier is currently %d%s", " Hold time multiplier is currently %d\n",
o->spf_delay, VTYNL, o->spf_delay,
o->spf_holdtime, VTYNL, o->spf_holdtime,
o->spf_max_holdtime, VTYNL, o->spf_max_holdtime,
o->spf_hold_multiplier, VTYNL); o->spf_hold_multiplier);
vty_out(vty, " SPF algorithm "); vty_out(vty, " SPF algorithm ");
if (o->ts_spf.tv_sec || o->ts_spf.tv_usec) if (o->ts_spf.tv_sec || o->ts_spf.tv_usec)

118
ospf6d/ospf6d.c
View File

@ -115,11 +115,11 @@ config_write_ospf6_debug (struct vty *vty)
} }
#define AREA_LSDB_TITLE_FORMAT \ #define AREA_LSDB_TITLE_FORMAT \
"%s Area Scoped Link State Database (Area %s)%s%s" "\n Area Scoped Link State Database (Area %s)\n\n"
#define IF_LSDB_TITLE_FORMAT \ #define IF_LSDB_TITLE_FORMAT \
"%s I/F Scoped Link State Database (I/F %s in Area %s)%s%s" "\n I/F Scoped Link State Database (I/F %s in Area %s)\n\n"
#define AS_LSDB_TITLE_FORMAT \ #define AS_LSDB_TITLE_FORMAT \
"%s AS Scoped Link State Database%s%s" "\n AS Scoped Link State Database\n\n"
static int static int
parse_show_level (int idx_level, int argc, struct cmd_token **argv) parse_show_level (int idx_level, int argc, struct cmd_token **argv)
@ -189,7 +189,7 @@ DEFUN (show_ipv6_ospf6_database,
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oa->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oa->lsdb);
} }
@ -197,13 +197,13 @@ DEFUN (show_ipv6_ospf6_database,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oi->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oi->lsdb);
} }
} }
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, NULL, NULL, NULL, o->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, NULL, o->lsdb);
vty_out (vty, "\n"); vty_out (vty, "\n");
@ -250,7 +250,7 @@ DEFUN (show_ipv6_ospf6_database_type,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, NULL, NULL, oa->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, NULL, oa->lsdb);
} }
break; break;
@ -260,15 +260,15 @@ DEFUN (show_ipv6_ospf6_database_type,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, NULL, NULL, oi->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, NULL, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, NULL, NULL, o->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, NULL, o->lsdb);
break; break;
@ -313,7 +313,7 @@ DEFUN (show_ipv6_ospf6_database_id,
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, NULL, &id, NULL, oa->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, NULL, oa->lsdb);
} }
@ -321,13 +321,13 @@ DEFUN (show_ipv6_ospf6_database_id,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, NULL, &id, NULL, oi->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, NULL, oi->lsdb);
} }
} }
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, NULL, &id, NULL, o->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, NULL, o->lsdb);
vty_out (vty, "\n"); vty_out (vty, "\n");
@ -364,7 +364,7 @@ DEFUN (show_ipv6_ospf6_database_router,
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb);
} }
@ -372,13 +372,13 @@ DEFUN (show_ipv6_ospf6_database_router,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb);
} }
} }
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
vty_out (vty, "\n"); vty_out (vty, "\n");
@ -430,7 +430,7 @@ DEFUN (show_ipv6_ospf6_database_type_id,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, NULL, oa->lsdb); ospf6_lsdb_show (vty, level, &type, &id, NULL, oa->lsdb);
} }
break; break;
@ -440,15 +440,15 @@ DEFUN (show_ipv6_ospf6_database_type_id,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, NULL, oi->lsdb); ospf6_lsdb_show (vty, level, &type, &id, NULL, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, &id, NULL, o->lsdb); ospf6_lsdb_show (vty, level, &type, &id, NULL, o->lsdb);
break; break;
@ -507,7 +507,7 @@ DEFUN (show_ipv6_ospf6_database_type_router,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb);
} }
break; break;
@ -517,15 +517,15 @@ DEFUN (show_ipv6_ospf6_database_type_router,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb);
break; break;
@ -572,7 +572,7 @@ DEFUN (show_ipv6_ospf6_database_id_router,
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb);
} }
@ -580,13 +580,13 @@ DEFUN (show_ipv6_ospf6_database_id_router,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb);
} }
} }
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
vty_out (vty, "\n"); vty_out (vty, "\n");
@ -627,7 +627,7 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb);
} }
@ -635,13 +635,13 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb);
} }
} }
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
vty_out (vty, "\n"); vty_out (vty, "\n");
@ -694,7 +694,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
} }
break; break;
@ -704,15 +704,15 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
break; break;
@ -774,7 +774,7 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
} }
break; break;
@ -784,15 +784,15 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
break; break;
@ -831,7 +831,7 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb);
} }
@ -839,13 +839,13 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb);
} }
} }
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
vty_out (vty, "\n"); vty_out (vty, "\n");
@ -896,7 +896,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb);
} }
break; break;
@ -906,15 +906,15 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb);
break; break;
@ -974,7 +974,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
} }
break; break;
@ -984,15 +984,15 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
break; break;
@ -1051,7 +1051,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
case OSPF6_SCOPE_AREA: case OSPF6_SCOPE_AREA:
for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
{ {
vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL); vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
} }
break; break;
@ -1061,15 +1061,15 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
{ {
for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
{ {
vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL, vty_out (vty, IF_LSDB_TITLE_FORMAT,
oi->interface->name, oa->name, VTYNL, VTYNL); oi->interface->name, oa->name);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
} }
} }
break; break;
case OSPF6_SCOPE_AS: case OSPF6_SCOPE_AS:
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT);
ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
break; break;

57
ospfd/ospf_vty.c
View File

@ -223,7 +223,7 @@ DEFUN (ospf_router_id,
if (area->full_nbrs) if (area->full_nbrs)
{ {
vty_out (vty, "For this router-id change to take effect," vty_out (vty, "For this router-id change to take effect,"
" save config and restart ospfd%s", VTYNL); " save config and restart ospfd\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -258,7 +258,7 @@ DEFUN_HIDDEN (ospf_router_id_old,
if (area->full_nbrs) if (area->full_nbrs)
{ {
vty_out (vty, "For this router-id change to take effect," vty_out (vty, "For this router-id change to take effect,"
" save config and restart ospfd%s", VTYNL); " save config and restart ospfd\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -285,7 +285,7 @@ DEFUN (no_ospf_router_id,
if (area->full_nbrs) if (area->full_nbrs)
{ {
vty_out (vty, "For this router-id change to take effect," vty_out (vty, "For this router-id change to take effect,"
" save config and restart ospfd%s", VTYNL); " save config and restart ospfd\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1356,8 +1356,7 @@ DEFUN (ospf_area_shortcut,
if (ospf->abr_type != OSPF_ABR_SHORTCUT) if (ospf->abr_type != OSPF_ABR_SHORTCUT)
vty_out (vty, "Shortcut area setting will take effect " vty_out (vty, "Shortcut area setting will take effect "
"only when the router is configured as Shortcut ABR%s", "only when the router is configured as Shortcut ABR\n");
VTYNL);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2716,8 +2715,8 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar
} }
else else
vty_out (vty, " Number of interfaces in this area: Total: %d, " vty_out (vty, " Number of interfaces in this area: Total: %d, "
"Active: %d%s", listcount (area->oiflist), "Active: %d\n", listcount (area->oiflist),
area->act_ints, VTYNL); area->act_ints);
if (area->external_routing == OSPF_AREA_NSSA) if (area->external_routing == OSPF_AREA_NSSA)
{ {
@ -2830,7 +2829,7 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar
{ {
/* Show number of fully adjacent neighbors. */ /* Show number of fully adjacent neighbors. */
vty_out (vty, " Number of fully adjacent neighbors in this area:" vty_out (vty, " Number of fully adjacent neighbors in this area:"
" %d%s", area->full_nbrs, VTYNL); " %d\n", area->full_nbrs);
/* Show authentication type. */ /* Show authentication type. */
vty_out (vty, " Area has "); vty_out (vty, " Area has ");
@ -2843,7 +2842,7 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar
if (!OSPF_IS_AREA_BACKBONE (area)) if (!OSPF_IS_AREA_BACKBONE (area))
vty_out (vty, " Number of full virtual adjacencies going through" vty_out (vty, " Number of full virtual adjacencies going through"
" this area: %d%s", area->full_vls, VTYNL); " this area: %d\n", area->full_vls);
/* Show SPF calculation times. */ /* Show SPF calculation times. */
vty_out (vty, " SPF algorithm executed %d times\n", vty_out (vty, " SPF algorithm executed %d times\n",
@ -3013,14 +3012,14 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json)
} }
else else
{ {
vty_out (vty, " Initial SPF scheduling delay %d millisec(s)%s" vty_out (vty, " Initial SPF scheduling delay %d millisec(s)\n"
" Minimum hold time between consecutive SPFs %d millisec(s)%s" " Minimum hold time between consecutive SPFs %d millisec(s)\n"
" Maximum hold time between consecutive SPFs %d millisec(s)%s" " Maximum hold time between consecutive SPFs %d millisec(s)\n"
" Hold time multiplier is currently %d%s", " Hold time multiplier is currently %d\n",
ospf->spf_delay, VTYNL, ospf->spf_delay,
ospf->spf_holdtime, VTYNL, ospf->spf_holdtime,
ospf->spf_max_holdtime, VTYNL, ospf->spf_max_holdtime,
ospf->spf_hold_multiplier, VTYNL); ospf->spf_hold_multiplier);
} }
if (use_json) if (use_json)
@ -3104,7 +3103,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json)
json_object_string_add(json, "asbrRouter", "injectingExternalRoutingInformation"); json_object_string_add(json, "asbrRouter", "injectingExternalRoutingInformation");
else else
vty_out (vty, " This router is an ASBR " vty_out (vty, " This router is an ASBR "
"(injecting external routing information)%s", VTYNL); "(injecting external routing information)\n");
} }
/* Show Number of AS-external-LSAs. */ /* Show Number of AS-external-LSAs. */
@ -4909,8 +4908,8 @@ show_as_external_lsa_detail (struct vty *vty, struct ospf_lsa *lsa)
vty_out (vty, " Forward Address: %s\n", vty_out (vty, " Forward Address: %s\n",
inet_ntoa (al->e[0].fwd_addr)); inet_ntoa (al->e[0].fwd_addr));
vty_out (vty, " External Route Tag: %"ROUTE_TAG_PRI"%s%s", vty_out (vty, " External Route Tag: %"ROUTE_TAG_PRI"\n\n",
(route_tag_t)ntohl (al->e[0].route_tag), VTYNL, VTYNL); (route_tag_t)ntohl (al->e[0].route_tag));
} }
return 0; return 0;
@ -4961,8 +4960,8 @@ show_as_nssa_lsa_detail (struct vty *vty, struct ospf_lsa *lsa)
vty_out (vty, " NSSA: Forward Address: %s\n", vty_out (vty, " NSSA: Forward Address: %s\n",
inet_ntoa (al->e[0].fwd_addr)); inet_ntoa (al->e[0].fwd_addr));
vty_out (vty, " External Route Tag: %"ROUTE_TAG_PRI"%s%s", vty_out (vty, " External Route Tag: %"ROUTE_TAG_PRI"\n\n",
(route_tag_t)ntohl (al->e[0].route_tag), VTYNL, VTYNL); (route_tag_t)ntohl (al->e[0].route_tag));
} }
return 0; return 0;
@ -7906,12 +7905,12 @@ show_ip_ospf_route_external (struct vty *vty, struct route_table *rt)
switch (er->path_type) switch (er->path_type)
{ {
case OSPF_PATH_TYPE1_EXTERNAL: case OSPF_PATH_TYPE1_EXTERNAL:
vty_out (vty, "N E1 %-18s [%d] tag: %"ROUTE_TAG_PRI"%s", buf1, vty_out (vty, "N E1 %-18s [%d] tag: %"ROUTE_TAG_PRI"\n", buf1,
er->cost, er->u.ext.tag, VTYNL); er->cost, er->u.ext.tag);
break; break;
case OSPF_PATH_TYPE2_EXTERNAL: case OSPF_PATH_TYPE2_EXTERNAL:
vty_out (vty, "N E2 %-18s [%d/%d] tag: %"ROUTE_TAG_PRI"%s", buf1, er->cost, vty_out (vty, "N E2 %-18s [%d/%d] tag: %"ROUTE_TAG_PRI"\n", buf1, er->cost,
er->u.ext.type2_cost, er->u.ext.tag, VTYNL); er->u.ext.type2_cost, er->u.ext.tag);
break; break;
} }
@ -8502,10 +8501,10 @@ config_write_virtual_link (struct vty *vty, struct ospf *ospf)
for (ALL_LIST_ELEMENTS_RO (IF_DEF_PARAMS (vl_data->vl_oi->ifp)->auth_crypt, for (ALL_LIST_ELEMENTS_RO (IF_DEF_PARAMS (vl_data->vl_oi->ifp)->auth_crypt,
n2, ck)) n2, ck))
vty_out (vty, " area %s virtual-link %s" vty_out (vty, " area %s virtual-link %s"
" message-digest-key %d md5 %s%s", " message-digest-key %d md5 %s\n",
buf, buf,
inet_ntoa (vl_data->vl_peer), inet_ntoa (vl_data->vl_peer),
ck->key_id, ck->auth_key, VTYNL); ck->key_id, ck->auth_key);
} }
} }
@ -8694,7 +8693,7 @@ ospf_config_write (struct vty *vty)
if (ospf->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH) if (ospf->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH)
{ {
vty_out (vty, "! Important: ensure reference bandwidth " vty_out (vty, "! Important: ensure reference bandwidth "
"is consistent across all routers%s", VTYNL); "is consistent across all routers\n");
vty_out (vty, " auto-cost reference-bandwidth %d\n", vty_out (vty, " auto-cost reference-bandwidth %d\n",
ospf->ref_bandwidth); ospf->ref_bandwidth);
} }

46
pimd/pim_cmd.c
View File

@ -221,11 +221,10 @@ static void pim_show_assert_internal(struct vty *vty)
struct in_addr ifaddr; struct in_addr ifaddr;
vty_out (vty, vty_out (vty,
"CA: CouldAssert%s" "CA: CouldAssert\n"
"ECA: Evaluate CouldAssert%s" "ECA: Evaluate CouldAssert\n"
"ATD: AssertTrackingDesired%s" "ATD: AssertTrackingDesired\n"
"eATD: Evaluate AssertTrackingDesired%s\n", "eATD: Evaluate AssertTrackingDesired\n\n");
VTYNL, VTYNL, VTYNL, VTYNL);
vty_out (vty, vty_out (vty,
"Interface Address Source Group CA eCA ATD eATD\n"); "Interface Address Source Group CA eCA ATD eATD\n");
@ -2149,19 +2148,19 @@ static void show_rpf_refresh_stats(struct vty *vty, time_t now, json_object *jso
json_object_int_add(json, "nexthopLookupsAvoided", nexthop_lookups_avoided); json_object_int_add(json, "nexthopLookupsAvoided", nexthop_lookups_avoided);
} else { } else {
vty_out (vty, vty_out (vty,
"RPF Cache Refresh Delay: %ld msecs%s" "RPF Cache Refresh Delay: %ld msecs\n"
"RPF Cache Refresh Timer: %ld msecs%s" "RPF Cache Refresh Timer: %ld msecs\n"
"RPF Cache Refresh Requests: %lld%s" "RPF Cache Refresh Requests: %lld\n"
"RPF Cache Refresh Events: %lld%s" "RPF Cache Refresh Events: %lld\n"
"RPF Cache Refresh Last: %s%s" "RPF Cache Refresh Last: %s\n"
"Nexthop Lookups: %lld%s" "Nexthop Lookups: %lld\n"
"Nexthop Lookups Avoided: %lld\n", "Nexthop Lookups Avoided: %lld\n",
qpim_rpf_cache_refresh_delay_msec, VTYNL, qpim_rpf_cache_refresh_delay_msec,
pim_time_timer_remain_msec(qpim_rpf_cache_refresher), VTYNL, pim_time_timer_remain_msec(qpim_rpf_cache_refresher),
(long long)qpim_rpf_cache_refresh_requests, VTYNL, (long long)qpim_rpf_cache_refresh_requests,
(long long)qpim_rpf_cache_refresh_events, VTYNL, (long long)qpim_rpf_cache_refresh_events,
refresh_uptime, VTYNL, refresh_uptime,
(long long) qpim_nexthop_lookups, VTYNL, (long long) qpim_nexthop_lookups,
(long long)nexthop_lookups_avoided); (long long)nexthop_lookups_avoided);
} }
} }
@ -2177,11 +2176,11 @@ static void show_scan_oil_stats(struct vty *vty, time_t now)
pim_time_uptime_begin(uptime_mroute_del, sizeof(uptime_mroute_del), now, qpim_mroute_del_last); pim_time_uptime_begin(uptime_mroute_del, sizeof(uptime_mroute_del), now, qpim_mroute_del_last);
vty_out (vty, vty_out (vty,
"Scan OIL - Last: %s Events: %lld%s" "Scan OIL - Last: %s Events: %lld\n"
"MFC Add - Last: %s Events: %lld%s" "MFC Add - Last: %s Events: %lld\n"
"MFC Del - Last: %s Events: %lld\n", "MFC Del - Last: %s Events: %lld\n",
uptime_scan_oil, (long long) qpim_scan_oil_events, VTYNL, uptime_scan_oil, (long long) qpim_scan_oil_events,
uptime_mroute_add, (long long) qpim_mroute_add_events, VTYNL, uptime_mroute_add, (long long) qpim_mroute_add_events,
uptime_mroute_del, (long long)qpim_mroute_del_events); uptime_mroute_del, (long long)qpim_mroute_del_events);
} }
@ -3214,13 +3213,12 @@ static void show_multicast_interfaces(struct vty *vty)
vreq.vifi = pim_ifp->mroute_vif_index; vreq.vifi = pim_ifp->mroute_vif_index;
if (ioctl(qpim_mroute_socket_fd, SIOCGETVIFCNT, &vreq)) { if (ioctl(qpim_mroute_socket_fd, SIOCGETVIFCNT, &vreq)) {
zlog_warn("ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s%s", zlog_warn("ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s\n",
(unsigned long)SIOCGETVIFCNT, (unsigned long)SIOCGETVIFCNT,
ifp->name, ifp->name,
pim_ifp->mroute_vif_index, pim_ifp->mroute_vif_index,
errno, errno,
safe_strerror(errno), safe_strerror(errno));
VTYNL);
} }
ifaddr = pim_ifp->primary_address; ifaddr = pim_ifp->primary_address;

11
ripd/ripd.c
View File

@ -3474,12 +3474,11 @@ DEFUN (show_ip_rip,
if (! rip) if (! rip)
return CMD_SUCCESS; return CMD_SUCCESS;
vty_out (vty, "Codes: R - RIP, C - connected, S - Static, O - OSPF, B - BGP%s" vty_out (vty, "Codes: R - RIP, C - connected, S - Static, O - OSPF, B - BGP\n"
"Sub-codes:%s" "Sub-codes:\n"
" (n) - normal, (s) - static, (d) - default, (r) - redistribute,%s" " (n) - normal, (s) - static, (d) - default, (r) - redistribute,\n"
" (i) - interface%s%s" " (i) - interface\n\n"
" Network Next Hop Metric From Tag Time\n", " Network Next Hop Metric From Tag Time\n");
VTYNL, VTYNL, VTYNL, VTYNL, VTYNL);
for (np = route_top (rip->table); np; np = route_next (np)) for (np = route_top (rip->table); np; np = route_next (np))
if ((list = np->info) != NULL) if ((list = np->info) != NULL)

4
ripngd/ripng_peer.c
View File

@ -193,8 +193,8 @@ ripng_peer_display (struct vty *vty)
for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer)) for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer))
{ {
vty_out (vty, " %s %s%14s %10d %10d %10d %s\n", inet6_ntoa (peer->addr), vty_out (vty, " %s \n%14s %10d %10d %10d %s\n", inet6_ntoa (peer->addr),
VTYNL, " ", " ",
peer->recv_badpackets, peer->recv_badroutes, peer->recv_badpackets, peer->recv_badroutes,
ZEBRA_RIPNG_DISTANCE_DEFAULT, ZEBRA_RIPNG_DISTANCE_DEFAULT,
ripng_peer_uptime(peer, timebuf, RIPNG_UPTIME_LEN)); ripng_peer_uptime(peer, timebuf, RIPNG_UPTIME_LEN));

12
ripngd/ripngd.c
View File

@ -2004,13 +2004,11 @@ DEFUN (show_ipv6_ripng,
return CMD_SUCCESS; return CMD_SUCCESS;
/* Header of display. */ /* Header of display. */
vty_out (vty, "Codes: R - RIPng, C - connected, S - Static, O - OSPF, B - BGP%s" vty_out (vty, "Codes: R - RIPng, C - connected, S - Static, O - OSPF, B - BGP\n"
"Sub-codes:%s" "Sub-codes:\n"
" (n) - normal, (s) - static, (d) - default, (r) - redistribute,%s" " (n) - normal, (s) - static, (d) - default, (r) - redistribute,\n"
" (i) - interface, (a/S) - aggregated/Suppressed%s%s" " (i) - interface, (a/S) - aggregated/Suppressed\n\n"
" Network Next Hop Via Metric Tag Time\n", " Network Next Hop Via Metric Tag Time\n");
VTYNL, VTYNL, VTYNL,
VTYNL, VTYNL);
for (rp = route_top (ripng->table); rp; rp = route_next (rp)) for (rp = route_top (ripng->table); rp; rp = route_next (rp))
{ {

2
tests/lib/test_heavy.c
View File

@ -63,7 +63,7 @@ slow_func (struct vty *vty, const char *str, const int i)
printf ("%s: hard error\n", __func__); printf ("%s: hard error\n", __func__);
if ((i % ITERS_PRINT) == 0) if ((i % ITERS_PRINT) == 0)
printf ("%s did %d, x = %g%s", str, i, x, VTYNL); printf ("%s did %d, x = %g\n", str, i, x);
} }
static void static void