proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-28 21:19:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: remove VTYNL, part 5 of 6

Browse Source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-07-13 19:50:33 +02:00
parent 55f70b671f
commit cdda201036
7 changed files with 134 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
babeld/babel_main.c
View File

@ -378,24 +378,21 @@ void
show_babel_main_configuration (struct vty *vty)
{
vty_out (vty,
"state file = %s%s"
"configuration file = %s%s"
"protocol informations:%s"
" multicast address = %s%s"
" port = %d%s"
"vty address = %s%s"
"vty port = %d%s"
"id = %s%s"
"state file = %s\n"
"configuration file = %s\n"
"protocol informations:\n"
" multicast address = %s\n"
" port = %d\n"
"vty address = %s\n"
"vty port = %d\n"
"id = %s\n"
"kernel_metric = %d\n",
state_file, VTYNL,
state_file,
babel_config_file ? babel_config_file : babel_config_default,
VTYNL,
VTYNL,
format_address(protocol_group), VTYNL,
protocol_port, VTYNL,
format_address(protocol_group),
protocol_port,
babel_vty_addr ? babel_vty_addr : "None",
VTYNL,
babel_vty_port, VTYNL,
format_eui64(myid), VTYNL,
babel_vty_port,
format_eui64(myid),
kernel_metric);
}

21
bgpd/bgp_vty.c
View File

@ -616,7 +616,7 @@ bgp_clear (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
peer = peer_lookup (bgp, &su);
if (! peer)
{
vty_out (vty, "%%BGP: Unknown neighbor - \"%s\"%s", arg, VTYNL);
vty_out (vty, "%%BGP: Unknown neighbor - \"%s\"\n", arg);
return CMD_WARNING;
}
}
@ -3414,7 +3414,7 @@ peer_flag_modify_vty (struct vty *vty, const char *ip_str,
*/
if (peer->conf_if && (flag == PEER_FLAG_DISABLE_CONNECTED_CHECK)) {
vty_out (vty, "%s is directly connected peer, cannot accept disable-"
"connected-check%s", ip_str, VTYNL);
"connected-check\n", ip_str);
return CMD_WARNING;
}
@ -6943,8 +6943,8 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi,
if (bgp->v_maxmed_admin)
vty_out (vty, "Max-med administrative active\n");
vty_out(vty, "BGP table version %" PRIu64 "%s",
bgp_table_version(bgp->rib[afi][safi]), VTYNL);
vty_out(vty, "BGP table version %" PRIu64 "\n",
bgp_table_version(bgp->rib[afi][safi]));
ents = bgp_table_count (bgp->rib[afi][safi]);
vty_out (vty, "RIB entries %ld, using %s of memory\n", ents,
@ -7088,8 +7088,8 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi,
else
{
if (use_json)
vty_out(vty, "{\"error\": {\"message\": \"No %s neighbor configured\"}}%s",
afi_safi_print(afi, safi), VTYNL);
vty_out(vty, "{\"error\": {\"message\": \"No %s neighbor configured\"}}\n",
afi_safi_print(afi, safi));
else
vty_out (vty, "No %s neighbor is configured\n",
afi_safi_print(afi, safi));
@ -7646,8 +7646,8 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi,
paf = peer_af_find(p, afi, safi);
if (paf && PAF_SUBGRP(paf))
{
vty_out (vty, " Update group %" PRIu64 ", subgroup %" PRIu64 "%s",
PAF_UPDGRP(paf)->id, PAF_SUBGRP(paf)->id, VTYNL);
vty_out (vty, " Update group %" PRIu64 ", subgroup %" PRIu64 "\n",
PAF_UPDGRP(paf)->id, PAF_SUBGRP(paf)->id);
vty_out (vty, " Packet Queue length %d\n",
bpacket_queue_virtual_length(paf));
}
@ -8811,7 +8811,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
msg_str = bgp_notify_admin_message(msgbuf, sizeof(msgbuf),
(u_char*)p->notify.data, p->notify.length);
if (msg_str)
vty_out (vty, " Message: \"%s\"%s", msg_str, VTYNL);
vty_out (vty, " Message: \"%s\"\n", msg_str);
}
}
else
@ -9112,8 +9112,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
{
zlog_err("Unable to allocate memory for JSON object");
vty_out (vty,
"{\"error\": {\"message:\": \"Unable to allocate memory for JSON object\"}}}%s",
VTYNL);
"{\"error\": {\"message:\": \"Unable to allocate memory for JSON object\"}}}\n");
return;
}

164
bgpd/bgpd.c
View File

@ -6502,15 +6502,15 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer,
|| strcmp (filter->dlist[in].name, gfilter->dlist[in].name) != 0)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s distribute-list %s in%s",
addr, filter->dlist[in].name, VTYNL);
" neighbor %s distribute-list %s in\n",
addr, filter->dlist[in].name);
}
if (filter->dlist[out].name && ! gfilter)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s distribute-list %s out%s",
addr, filter->dlist[out].name, VTYNL);
" neighbor %s distribute-list %s out\n",
addr, filter->dlist[out].name);
}
/* prefix-list. */
@ -6519,15 +6519,15 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer,
|| strcmp (filter->plist[in].name, gfilter->plist[in].name) != 0)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s prefix-list %s in%s",
addr, filter->plist[in].name, VTYNL);
" neighbor %s prefix-list %s in\n",
addr, filter->plist[in].name);
}
if (filter->plist[out].name && ! gfilter)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s prefix-list %s out%s",
addr, filter->plist[out].name, VTYNL);
" neighbor %s prefix-list %s out\n",
addr, filter->plist[out].name);
}
/* route-map. */
@ -6536,8 +6536,8 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer,
|| strcmp (filter->map[RMAP_IN].name, gfilter->map[RMAP_IN].name) != 0)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s route-map %s in%s",
addr, filter->map[RMAP_IN].name, VTYNL);
" neighbor %s route-map %s in\n",
addr, filter->map[RMAP_IN].name);
}
if (filter->map[RMAP_OUT].name)
@ -6545,16 +6545,16 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer,
|| strcmp (filter->map[RMAP_OUT].name, gfilter->map[RMAP_OUT].name) != 0)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s route-map %s out%s",
addr, filter->map[RMAP_OUT].name, VTYNL);
" neighbor %s route-map %s out\n",
addr, filter->map[RMAP_OUT].name);
}
/* unsuppress-map */
if (filter->usmap.name && ! gfilter)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s unsuppress-map %s%s",
addr, filter->usmap.name, VTYNL);
" neighbor %s unsuppress-map %s\n",
addr, filter->usmap.name);
}
/* filter-list. */
@ -6563,15 +6563,15 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer,
|| strcmp (filter->aslist[in].name, gfilter->aslist[in].name) != 0)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s filter-list %s in%s",
addr, filter->aslist[in].name, VTYNL);
" neighbor %s filter-list %s in\n",
addr, filter->aslist[in].name);
}
if (filter->aslist[out].name && ! gfilter)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s filter-list %s out%s",
addr, filter->aslist[out].name, VTYNL);
" neighbor %s filter-list %s out\n",
addr, filter->aslist[out].name);
}
}
@ -6942,16 +6942,16 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (g_peer->afc[afi][safi] && !peer->afc[afi][safi])
{
afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s activate%s",
addr, VTYNL);
" no neighbor %s activate\n",
addr);
}
/* If the peer-group is not active but peer is, print an 'activate' */
else if (!g_peer->afc[afi][safi] && peer->afc[afi][safi])
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s activate%s",
addr, VTYNL);
" neighbor %s activate\n",
addr);
}
}
else
@ -6963,14 +6963,14 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4))
{
afi_header_vty_out(vty, afi, safi, write,
" neighbor %s activate%s",
addr, VTYNL);
" neighbor %s activate\n",
addr);
}
}
else
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s activate%s",
addr, VTYNL);
" neighbor %s activate\n",
addr);
}
else
{
@ -6979,8 +6979,8 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (!bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4))
{
afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s activate%s",
addr, VTYNL);
" no neighbor %s activate\n",
addr);
}
}
}
@ -6990,15 +6990,15 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_ADDPATH_TX_ALL_PATHS))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s addpath-tx-all-paths%s",
addr, VTYNL);
" neighbor %s addpath-tx-all-paths\n",
addr);
}
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s addpath-tx-bestpath-per-AS%s",
addr, VTYNL);
" neighbor %s addpath-tx-bestpath-per-AS\n",
addr);
}
/* ORF capability. */
@ -7023,61 +7023,61 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_REFLECTOR_CLIENT))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s route-reflector-client%s",
addr, VTYNL);
" neighbor %s route-reflector-client\n",
addr);
}
/* next-hop-self force */
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_FORCE_NEXTHOP_SELF))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s next-hop-self force%s",
addr, VTYNL);
" neighbor %s next-hop-self force\n",
addr);
}
/* next-hop-self */
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_NEXTHOP_SELF))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s next-hop-self%s",
addr, VTYNL);
" neighbor %s next-hop-self\n",
addr);
}
/* remove-private-AS */
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s remove-private-AS all replace-AS%s",
addr, VTYNL);
" neighbor %s remove-private-AS all replace-AS\n",
addr);
}
else if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s remove-private-AS replace-AS%s",
addr, VTYNL);
" neighbor %s remove-private-AS replace-AS\n",
addr);
}
else if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_REMOVE_PRIVATE_AS_ALL))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s remove-private-AS all%s",
addr, VTYNL);
" neighbor %s remove-private-AS all\n",
addr);
}
else if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_REMOVE_PRIVATE_AS))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s remove-private-AS%s",
addr, VTYNL);
" neighbor %s remove-private-AS\n",
addr);
}
/* as-override */
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_AS_OVERRIDE))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s as-override%s",
addr, VTYNL);
" neighbor %s as-override\n",
addr);
}
/* send-community print. */
@ -7088,26 +7088,26 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
&& peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s send-community all%s",
addr, VTYNL);
" neighbor %s send-community all\n",
addr);
}
else if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s send-community large%s",
addr, VTYNL);
" neighbor %s send-community large\n",
addr);
}
else if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s send-community extended%s",
addr, VTYNL);
" neighbor %s send-community extended\n",
addr);
}
else if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s send-community%s",
addr, VTYNL);
" neighbor %s send-community\n",
addr);
}
}
else
@ -7120,8 +7120,8 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
(!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY)))
{
afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s send-community all%s",
addr, VTYNL);
" no neighbor %s send-community all\n",
addr);
}
else
{
@ -7129,24 +7129,24 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
(!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY)))
{
afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s send-community large%s",
addr, VTYNL);
" no neighbor %s send-community large\n",
addr);
}
if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY) &&
(!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY)))
{
afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s send-community extended%s",
addr, VTYNL);
" no neighbor %s send-community extended\n",
addr);
}
if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) &&
(!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY)))
{
afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s send-community%s",
addr, VTYNL);
" no neighbor %s send-community\n",
addr);
}
}
}
@ -7170,8 +7170,8 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_SOFT_RECONFIG))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s soft-reconfiguration inbound%s",
addr, VTYNL);
" neighbor %s soft-reconfiguration inbound\n",
addr);
}
/* maximum-prefix. */
@ -7198,16 +7198,16 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_RSERVER_CLIENT))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s route-server-client%s",
addr, VTYNL);
" neighbor %s route-server-client\n",
addr);
}
/* Nexthop-local unchanged. */
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s nexthop-local unchanged%s",
addr, VTYNL);
" neighbor %s nexthop-local unchanged\n",
addr);
}
/* allowas-in <1-10> */
@ -7220,14 +7220,14 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (peer->allowas_in[afi][safi] == 3)
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s allowas-in%s",
addr, VTYNL);
" neighbor %s allowas-in\n",
addr);
}
else
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s allowas-in %d%s",
addr, peer->allowas_in[afi][safi], VTYNL);
" neighbor %s allowas-in %d\n",
addr, peer->allowas_in[afi][safi]);
}
}
}
@ -7239,8 +7239,8 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
|| ! peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_ALLOWAS_IN_ORIGIN))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s allowas-in origin%s",
addr, VTYNL);
" neighbor %s allowas-in origin\n",
addr);
}
}
@ -7253,8 +7253,8 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
if (peer->weight[afi][safi])
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s weight %lu%s",
addr, peer->weight[afi][safi], VTYNL);
" neighbor %s weight %lu\n",
addr, peer->weight[afi][safi]);
}
}
@ -7271,19 +7271,19 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
&& peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_MED_UNCHANGED))
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s attribute-unchanged%s",
addr, VTYNL);
" neighbor %s attribute-unchanged\n",
addr);
}
else
{
afi_header_vty_out (vty, afi, safi, write,
" neighbor %s attribute-unchanged%s%s%s%s", addr,
" neighbor %s attribute-unchanged%s%s%s\n", addr,
peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_AS_PATH_UNCHANGED) ?
" as-path" : "",
peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_NEXTHOP_UNCHANGED) ?
" next-hop" : "",
peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_MED_UNCHANGED) ?
" med" : "", VTYNL);
" med" : "");
}
}
}

2
bgpd/rfapi/rfapi.c
View File

@ -3144,7 +3144,7 @@ test_nexthops_callback (
fp (out, "Nexthops Callback, Target=(");
//rfapiPrintRfapiIpAddr(stream, target);
fp (out, ")%s", VTYNL);
fp (out, ")\n");
rfapiPrintNhl (stream, next_hops);

28
bgpd/rfapi/rfapi_rib.c
View File

@ -2294,7 +2294,7 @@ rfapiRibShowResponsesSummary (void *stream)
fp (out, "%-24s ", "Responses: (Prefixes)");
fp (out, "%-8s %-8u ", "Active:", bgp->rfapi->rib_prefix_count_total);
fp (out, "%-8s %-8u", "Maximum:", bgp->rfapi->rib_prefix_count_total_max);
fp (out, "%s", VTYNL);
fp (out, "\n");
fp (out, "%-24s ", " (Updated)");
fp (out, "%-8s %-8u ", "Update:",
@ -2304,7 +2304,7 @@ rfapiRibShowResponsesSummary (void *stream)
fp (out, "%-8s %-8u", "Total:",
bgp->rfapi->stat.count_updated_response_updates +
bgp->rfapi->stat.count_updated_response_deletes);
fp (out, "%s", VTYNL);
fp (out, "\n");
fp (out, "%-24s ", " (NVEs)");
for (ALL_LIST_ELEMENTS_RO (&bgp->rfapi->descriptors, node, rfd))
@ -2315,7 +2315,7 @@ rfapiRibShowResponsesSummary (void *stream)
}
fp (out, "%-8s %-8u ", "Active:", nves_with_nonempty_ribs);
fp (out, "%-8s %-8u", "Total:", nves);
fp (out, "%s", VTYNL);
fp (out, "\n");
}
@ -2385,10 +2385,10 @@ print_rib_sl (
prefix_rd2str(&ri->rk.rd, str_rd+1, BUFSIZ-1);
#endif
fp (out, " %c %-20s %-15s %-15s %-4u %-8s %-8s%s%s",
fp (out, " %c %-20s %-15s %-15s %-4u %-8s %-8s%s\n",
deleted ? 'r' : ' ',
*printedprefix ? "" : str_pfx,
str_vn, str_un, ri->cost, str_lifetime, str_age, str_rd, VTYNL);
str_vn, str_un, ri->cost, str_lifetime, str_age, str_rd);
if (!*printedprefix)
*printedprefix = 1;
@ -2500,11 +2500,10 @@ rfapiRibShowResponses (
{
++printedheader;
fp (out, "%s[%s]%s",
fp (out, "%s[%s]\n",
VTYNL,
show_removed ? "Removed" : "Active", VTYNL);
fp (out, "%-15s %-15s%s", "Querying VN", "Querying UN",
VTYNL);
show_removed ? "Removed" : "Active");
fp (out, "%-15s %-15s\n", "Querying VN", "Querying UN");
fp (out, " %-20s %-15s %-15s %4s %-8s %-8s%s",
"Prefix", "Registered VN", "Registered UN", "Cost",
"Lifetime",
@ -2523,14 +2522,13 @@ rfapiRibShowResponses (
++printednve;
++nves_displayed;
fp (out, "%-15s %-15s%s",
fp (out, "%-15s %-15s\n",
rfapiRfapiIpAddr2Str (&rfd->vn_addr, str_vn, BUFSIZ),
rfapiRfapiIpAddr2Str (&rfd->un_addr, str_un, BUFSIZ),
VTYNL);
rfapiRfapiIpAddr2Str (&rfd->un_addr, str_un, BUFSIZ));
}
prefix2str (&rn->p, str_pfx, BUFSIZ);
//fp(out, " %s%s", buf, VTYNL); /* prefix */
//fp(out, " %s\n", buf); /* prefix */
routes_displayed++;
nhs_displayed += print_rib_sl (fp, vty, out, sl,
@ -2542,12 +2540,12 @@ rfapiRibShowResponses (
if (routes_total)
{
fp (out, "%s", VTYNL);
fp (out, "\n");
fp (out, "Displayed %u NVEs, and %u out of %u %s prefixes",
nves_displayed, routes_displayed,
routes_total, show_removed ? "removed" : "active");
if (nhs_displayed != routes_displayed || nhs_total != routes_total)
fp (out, " with %u out of %u next hops", nhs_displayed, nhs_total);
fp (out, "%s", VTYNL);
fp (out, "\n");
}
}

27
bgpd/rfapi/rfapi_vty.c
View File

@ -995,10 +995,10 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match)
if (!printedheader)
{
++printedheader;
fp (out, "%s", VTYNL);
fp (out, "%-15s %-15s %-15s %-10s%s",
fp (out, "\n");
fp (out, "%-15s %-15s %-15s %-10s\n",
"VN Address", "UN Address",
"Target", "Remaining", VTYNL);
"Target", "Remaining");
}
if (!printedquerier)
@ -1022,9 +1022,9 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match)
rfapiFormatSeconds (thread_timer_remain_second (m->timer),
buf_remain, BUFSIZ);
}
fp (out, " %-15s %-10s%s",
fp (out, " %-15s %-10s\n",
inet_ntop (m->p.family, &m->p.u.prefix, buf_pfx, BUFSIZ),
buf_remain, VTYNL);
buf_remain);
}
}
@ -1070,10 +1070,10 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match)
if (!printedheader)
{
++printedheader;
fp (out, "%s", VTYNL);
fp (out, "%-15s %-15s %-17s %10s %-10s%s",
fp (out, "\n");
fp (out, "%-15s %-15s %-17s %10s %-10s\n",
"VN Address", "UN Address",
"Target", "LNI", "Remaining", VTYNL);
"Target", "LNI", "Remaining");
}
if (!printedquerier)
@ -1097,19 +1097,18 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match)
rfapiFormatSeconds (thread_timer_remain_second
(mon_eth->timer), buf_remain, BUFSIZ);
}
fp (out, " %-17s %10d %-10s%s",
fp (out, " %-17s %10d %-10s\n",
rfapi_ntop (pfx_mac.family, &pfx_mac.u.prefix, buf_pfx,
BUFSIZ), mon_eth->logical_net_id, buf_remain,
VTYNL);
BUFSIZ), mon_eth->logical_net_id, buf_remain);
}
}
}
if (queries_total)
{
fp (out, "%s", VTYNL);
fp (out, "Displayed %d out of %d total queries%s",
queries_displayed, queries_total, VTYNL);
fp (out, "\n");
fp (out, "Displayed %d out of %d total queries\n",
queries_displayed, queries_total);
}
return CMD_SUCCESS;
}

5
ospf6d/ospf6_asbr.c
View File

@ -798,10 +798,9 @@ ospf6_redistribute_show_config (struct vty *vty)
continue;
if (ospf6->rmap[type].name)
vty_out (vty, " %d: %s with route-map \"%s\"%s%s", nroute[type],
vty_out (vty, " %d: %s with route-map \"%s\"%s\n", nroute[type],
ZROUTE_NAME (type), ospf6->rmap[type].name,
(ospf6->rmap[type].map ? "" : " (not found !)"),
VTYNL);
(ospf6->rmap[type].map ? "" : " (not found !)"));
else
vty_out (vty, " %d: %s\n", nroute[type],
ZROUTE_NAME (type));