diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-06-21 19:15:40 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-06-29 19:34:54 +0200 |
| commit | 1318e7c84190d55d958cd412276115850d46f55f (patch) | |
| tree | 8d8c1b5831997a4771cb7614575ad42c471b9862 | |
| parent | *: use vty_outln (diff) | |
| download | frr-1318e7c84190d55d958cd412276115850d46f55f.tar.xz frr-1318e7c84190d55d958cd412276115850d46f55f.zip | |
*: s/VTY_NEWLINE/VTYNL/g
Should be able to fit more vty_out onto one line now
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
47 files changed, 1032 insertions, 1041 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 84973fa5c..eb2909b40 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -387,15 +387,15 @@ show_babel_main_configuration (struct vty *vty) "vty port = %d%s" "id = %s%s" "kernel_metric = %d", - state_file, VTY_NEWLINE, + state_file, VTYNL, babel_config_file ? babel_config_file : babel_config_default, - VTY_NEWLINE, - VTY_NEWLINE, - format_address(protocol_group), VTY_NEWLINE, - protocol_port, VTY_NEWLINE, + VTYNL, + VTYNL, + format_address(protocol_group), VTYNL, + protocol_port, VTYNL, babel_vty_addr ? babel_vty_addr : "None", - VTY_NEWLINE, - babel_vty_port, VTY_NEWLINE, - format_eui64(myid), VTY_NEWLINE, + VTYNL, + babel_vty_port, VTYNL, + format_eui64(myid), VTYNL, kernel_metric); } diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 18a9d25f4..d22a07ed3 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -147,7 +147,7 @@ bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd, "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal"); vty_outln (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s", - VTY_NEWLINE); + VTYNL); vty_outln(vty, V4_HEADER); } } @@ -257,7 +257,7 @@ bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd, total_count); else vty_outln (vty, "%sDisplayed %ld out of %ld total prefixes", - VTY_NEWLINE, output_count, total_count); + VTYNL, output_count, total_count); return CMD_SUCCESS; } diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 0a33243fc..125b06a41 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -638,7 +638,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd, vty_outln (vty, "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal"); vty_outln (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s", - VTY_NEWLINE); + VTYNL); vty_outln (vty, V4_HEADER); } } @@ -746,7 +746,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd, vty_outln (vty, "No prefixes displayed, %ld exist", total_count); else vty_outln (vty, "%sDisplayed %ld routes and %ld total paths", - VTY_NEWLINE, output_count, total_count); + VTYNL, output_count, total_count); } return CMD_SUCCESS; diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index cb4640313..69882a317 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -479,7 +479,7 @@ bgp_show_all_instances_nexthops_vty (struct vty *vty) for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp)) { vty_outln (vty, "%sInstance %s:", - VTY_NEWLINE, + VTYNL, (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name); bgp_show_nexthops (vty, bgp, 0); } diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index cd11b2bfc..eb31e04e3 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -6169,7 +6169,7 @@ route_vty_out_route (struct prefix *p, struct vty *vty) len = 17 - len; if (len < 1) - vty_out (vty, "%s%*s", VTY_NEWLINE, 20, " "); + vty_out (vty, "%s%*s", VTYNL, 20, " "); else vty_out (vty, "%*s", len, " "); } @@ -6393,7 +6393,7 @@ route_vty_out (struct vty *vty, struct prefix *p, len = 7 - len; /* len of IPv6 addr + max len of def ifname */ if (len < 1) - vty_out (vty, "%s%*s", VTY_NEWLINE, 45, " "); + vty_out (vty, "%s%*s", VTYNL, 45, " "); else vty_out (vty, "%*s", len, " "); } @@ -6406,7 +6406,7 @@ route_vty_out (struct vty *vty, struct prefix *p, len = 16 - len; if (len < 1) - vty_out (vty, "%s%*s", VTY_NEWLINE, 36, " "); + vty_out (vty, "%s%*s", VTYNL, 36, " "); else vty_out (vty, "%*s", len, " "); } @@ -6420,7 +6420,7 @@ route_vty_out (struct vty *vty, struct prefix *p, len = 16 - len; if (len < 1) - vty_out (vty, "%s%*s", VTY_NEWLINE, 36, " "); + vty_out (vty, "%s%*s", VTYNL, 36, " "); else vty_out (vty, "%*s", len, " "); } @@ -6608,7 +6608,7 @@ route_vty_out_tmp (struct vty *vty, struct prefix *p, struct attr *attr, safi_t buf, BUFSIZ)); len = 16 - len; if (len < 1) - vty_out (vty, "%s%*s", VTY_NEWLINE, 36, " "); + vty_out (vty, "%s%*s", VTYNL, 36, " "); else vty_out (vty, "%*s", len, " "); } @@ -6861,7 +6861,7 @@ damp_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo, if (len < 1) { if (!use_json) - vty_out (vty, "%s%*s", VTY_NEWLINE, 34, " "); + vty_out (vty, "%s%*s", VTYNL, 34, " "); } else { @@ -6931,7 +6931,7 @@ flap_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo, if (len < 1) { if (!use_json) - vty_out (vty, "%s%*s", VTY_NEWLINE, 33, " "); + vty_out (vty, "%s%*s", VTYNL, 33, " "); } else { @@ -7964,8 +7964,8 @@ bgp_show_table (struct vty *vty, struct bgp *bgp, struct bgp_table *table, { vty_outln (vty, "BGP table version is %" PRIu64 ", local router ID is %s", table->version, inet_ntoa(bgp->router_id)); - vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE); - vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE); + vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL); + vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL); if (type == bgp_show_type_dampend_paths || type == bgp_show_type_damp_neighbor) vty_outln (vty, BGP_SHOW_DAMP_HEADER); @@ -8020,7 +8020,7 @@ bgp_show_table (struct vty *vty, struct bgp *bgp, struct bgp_table *table, } else vty_outln (vty, "%sDisplayed %ld routes and %ld total paths", - VTY_NEWLINE, output_count, total_count); + VTYNL, output_count, total_count); } return CMD_SUCCESS; @@ -8082,7 +8082,7 @@ bgp_show_all_instances_routes_vty (struct vty *vty, afi_t afi, safi_t safi, else { vty_outln (vty, "%sInstance %s:", - VTY_NEWLINE, + VTYNL, (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name); } bgp_show (vty, bgp, afi, safi, bgp_show_type_normal, NULL, use_json); @@ -9169,7 +9169,7 @@ bgp_table_stats (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi) thread_execute (bm->master, bgp_table_stats_walker, &ts, 0); vty_outln (vty, "BGP %s RIB statistics%s", - afi_safi_print (afi, safi), VTY_NEWLINE); + afi_safi_print (afi, safi), VTYNL); for (i = 0; i < BGP_STATS_MAX; i++) { @@ -9405,7 +9405,7 @@ bgp_peer_counts (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, u_c vty_outln (vty, "PfxCt: %ld", peer->pcount[afi][safi]); vty_outln (vty, "%sCounts from RIB table walk:%s", - VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL); for (i = 0; i < PCOUNT_MAX; i++) vty_outln (vty, "%20s: %-10d", pcount_strs[i], pcounts.count[i]); @@ -9633,11 +9633,11 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, { vty_outln (vty, "BGP table version is %" PRIu64 ", local router ID is %s", table->version, inet_ntoa(bgp->router_id)); - vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE); - vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE); + vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL); + vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL); vty_outln (vty, "Originating default network 0.0.0.0%s", - VTY_NEWLINE); + VTYNL); } header1 = 0; } @@ -9664,8 +9664,8 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, { vty_outln (vty, "BGP table version is 0, local router ID is %s", inet_ntoa(bgp->router_id)); - vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE); - vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE); + vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL); + vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL); } header1 = 0; } @@ -9708,8 +9708,8 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, { vty_outln (vty, "BGP table version is %" PRIu64 ", local router ID is %s", table->version, inet_ntoa(bgp->router_id)); - vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE); - vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE); + vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL); + vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL); } header1 = 0; } @@ -9745,7 +9745,7 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, json_object_int_add(json, "totalPrefixCounter", output_count); else vty_outln (vty, "%sTotal number of prefixes %ld", - VTY_NEWLINE, output_count); + VTYNL, output_count); } if (use_json) { diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c index 8b11b4c7f..d12d282a9 100644 --- a/bgpd/bgp_updgrp_adv.c +++ b/bgpd/bgp_updgrp_adv.c @@ -229,8 +229,8 @@ subgrp_show_adjq_vty (struct update_subgroup *subgrp, struct vty *vty, vty_outln (vty, "BGP table version is %" PRIu64 ", local router ID is %s", table->version,inet_ntoa(bgp->router_id)); - vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE); - vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE); + vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL); + vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL); header1 = 0; } if (header2) @@ -251,7 +251,7 @@ subgrp_show_adjq_vty (struct update_subgroup *subgrp, struct vty *vty, } if (output_count != 0) vty_outln (vty, "%sTotal number of prefixes %ld", - VTY_NEWLINE, output_count); + VTYNL, output_count); } static int diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c index a40396c44..a1eb5c4a4 100644 --- a/bgpd/bgp_vpn.c +++ b/bgpd/bgp_vpn.c @@ -109,7 +109,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd, vty_outln (vty, "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal"); vty_outln (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s", - VTY_NEWLINE); + VTYNL); vty_outln (vty, V4_HEADER); } header = 0; diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 01422f392..96e0b63d6 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -308,7 +308,7 @@ bgp_vty_find_and_parse_afi_safi_bgp (struct vty *vty, struct cmd_token **argv, i *bgp = bgp_lookup_by_name (vrf_name); if (!*bgp) { - vty_out (vty, "View/Vrf specified is unknown: %s%s", vrf_name, VTY_NEWLINE); + vty_out (vty, "View/Vrf specified is unknown: %s%s", vrf_name, VTYNL); *idx = 0; return 0; } @@ -319,7 +319,7 @@ bgp_vty_find_and_parse_afi_safi_bgp (struct vty *vty, struct cmd_token **argv, i *bgp = bgp_get_default (); if (!*bgp) { - vty_out (vty, "Unable to find default BGP instance%s", VTY_NEWLINE); + vty_out (vty, "Unable to find default BGP instance%s", VTYNL); *idx = 0; return 0; } @@ -373,7 +373,7 @@ peer_lookup_vty (struct vty *vty, const char *ip_str) { if ((peer = peer_lookup_by_hostname(bgp, ip_str)) == NULL) { - vty_out (vty, "%% Malformed address or name: %s%s", ip_str, VTY_NEWLINE); + vty_out (vty, "%% Malformed address or name: %s%s", ip_str, VTYNL); return NULL; } } @@ -384,13 +384,13 @@ peer_lookup_vty (struct vty *vty, const char *ip_str) if (! peer) { vty_out (vty, "%% Specify remote-as or peer-group commands first%s", - VTY_NEWLINE); + VTYNL); return NULL; } if (peer_dynamic_neighbor (peer)) { vty_out (vty, "%% Operation not allowed on a dynamic neighbor%s", - VTY_NEWLINE); + VTYNL); return NULL; } @@ -434,7 +434,7 @@ peer_and_group_lookup_vty (struct vty *vty, const char *peer_str) if (peer_dynamic_neighbor (peer)) { vty_out (vty, "%% Operation not allowed on a dynamic neighbor%s", - VTY_NEWLINE); + VTYNL); return NULL; } @@ -445,7 +445,7 @@ peer_and_group_lookup_vty (struct vty *vty, const char *peer_str) return group->conf; vty_out (vty, "%% Specify remote-as or peer-group commands first%s", - VTY_NEWLINE); + VTYNL); return NULL; } @@ -520,7 +520,7 @@ bgp_vty_return (struct vty *vty, int ret) } if (str) { - vty_out (vty, "%% %s%s", str, VTY_NEWLINE); + vty_out (vty, "%% %s%s", str, VTYNL); return CMD_WARNING; } return CMD_SUCCESS; @@ -545,10 +545,10 @@ bgp_clear_vty_error (struct vty *vty, struct peer *peer, afi_t afi, case BGP_ERR_AF_UNCONFIGURED: vty_out (vty, "%%BGP: Enable %s address family for the neighbor %s%s", - afi_safi_print(afi, safi), peer->host, VTY_NEWLINE); + afi_safi_print(afi, safi), peer->host, VTYNL); break; case BGP_ERR_SOFT_RECONFIG_UNCONFIGURED: - vty_out (vty, "%%BGP: Inbound soft reconfig for %s not possible as it%s has neither refresh capability, nor inbound soft reconfig%s", peer->host, VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%%BGP: Inbound soft reconfig for %s not possible as it%s has neither refresh capability, nor inbound soft reconfig%s", peer->host, VTYNL, VTYNL); break; default: break; @@ -607,7 +607,7 @@ bgp_clear (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi, peer = peer_lookup_by_hostname(bgp, arg); if (!peer) { - vty_out (vty, "Malformed address or name: %s%s", arg, VTY_NEWLINE); + vty_out (vty, "Malformed address or name: %s%s", arg, VTYNL); return CMD_WARNING; } } @@ -617,7 +617,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, VTY_NEWLINE); + vty_out (vty, "%%BGP: Unknown neighbor - \"%s\"%s", arg, VTYNL); return CMD_WARNING; } } @@ -641,7 +641,7 @@ bgp_clear (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi, group = peer_group_lookup (bgp, arg); if (! group) { - vty_out (vty, "%%BGP: No such peer-group %s%s", arg, VTY_NEWLINE); + vty_out (vty, "%%BGP: No such peer-group %s%s", arg, VTYNL); return CMD_WARNING; } @@ -705,7 +705,7 @@ bgp_clear (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi, } if (! find) vty_out (vty, "%%BGP: No peer is configured with AS %s%s", arg, - VTY_NEWLINE); + VTYNL); return CMD_SUCCESS; } @@ -725,7 +725,7 @@ bgp_clear_vty (struct vty *vty, const char *name, afi_t afi, safi_t safi, bgp = bgp_lookup_by_name (name); if (bgp == NULL) { - vty_out (vty, "Can't find BGP instance %s%s", name, VTY_NEWLINE); + vty_out (vty, "Can't find BGP instance %s%s", name, VTYNL); return CMD_WARNING; } } @@ -734,7 +734,7 @@ bgp_clear_vty (struct vty *vty, const char *name, afi_t afi, safi_t safi, bgp = bgp_get_default (); if (bgp == NULL) { - vty_out (vty, "No BGP process is configured%s", VTY_NEWLINE); + vty_out (vty, "No BGP process is configured%s", VTYNL); return CMD_WARNING; } } @@ -791,7 +791,7 @@ DEFUN (no_bgp_multiple_instance, ret = bgp_option_unset (BGP_OPT_MULTIPLE_INSTANCE); if (ret < 0) { - vty_out (vty, "%% There are more than two BGP instances%s", VTY_NEWLINE); + vty_out (vty, "%% There are more than two BGP instances%s", VTYNL); return CMD_WARNING; } return CMD_SUCCESS; @@ -872,13 +872,13 @@ DEFUN_NOSH (router_bgp, if (bgp == NULL) { - vty_out (vty, "%% No BGP process is configured%s", VTY_NEWLINE); + vty_out (vty, "%% No BGP process is configured%s", VTYNL); return CMD_WARNING; } if (listcount(bm->bgp) > 1) { - vty_out (vty, "%% Multiple BGP processes are configured%s", VTY_NEWLINE); + vty_out (vty, "%% Multiple BGP processes are configured%s", VTYNL); return CMD_WARNING; } } @@ -904,15 +904,15 @@ DEFUN_NOSH (router_bgp, { case BGP_ERR_MULTIPLE_INSTANCE_NOT_SET: vty_out (vty, "Please specify 'bgp multiple-instance' first%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; case BGP_ERR_AS_MISMATCH: - vty_out (vty, "BGP is already running; AS is %u%s", as, VTY_NEWLINE); + vty_out (vty, "BGP is already running; AS is %u%s", as, VTYNL); return CMD_WARNING; case BGP_ERR_INSTANCE_MISMATCH: - vty_out (vty, "BGP instance name and AS number mismatch%s", VTY_NEWLINE); + vty_out (vty, "BGP instance name and AS number mismatch%s", VTYNL); vty_out (vty, "BGP instance is already running; AS is %u%s", - as, VTY_NEWLINE); + as, VTYNL); return CMD_WARNING; } @@ -948,13 +948,13 @@ DEFUN (no_router_bgp, if (bgp == NULL) { - vty_out (vty, "%% No BGP process is configured%s", VTY_NEWLINE); + vty_out (vty, "%% No BGP process is configured%s", VTYNL); return CMD_WARNING; } if (listcount(bm->bgp) > 1) { - vty_out (vty, "%% Multiple BGP processes are configured%s", VTY_NEWLINE); + vty_out (vty, "%% Multiple BGP processes are configured%s", VTYNL); return CMD_WARNING; } } @@ -969,7 +969,7 @@ DEFUN (no_router_bgp, bgp = bgp_lookup (as, name); if (! bgp) { - vty_out (vty, "%% Can't find BGP instance%s", VTY_NEWLINE); + vty_out (vty, "%% Can't find BGP instance%s", VTYNL); return CMD_WARNING; } } @@ -1009,7 +1009,7 @@ DEFPY (no_bgp_router_id, { if (! IPV4_ADDR_SAME (&bgp->router_id_static, &router_id)) { - vty_out (vty, "%% BGP router-id doesn't match%s", VTY_NEWLINE); + vty_outln (vty, "%% BGP router-id doesn't match%s"); return CMD_WARNING; } } @@ -1038,7 +1038,7 @@ DEFUN (bgp_cluster_id, ret = inet_aton (argv[idx_ipv4]->arg, &cluster); if (! ret) { - vty_out (vty, "%% Malformed bgp cluster identifier%s", VTY_NEWLINE); + vty_out (vty, "%% Malformed bgp cluster identifier%s", VTYNL); return CMD_WARNING; } @@ -1118,7 +1118,7 @@ DEFUN (bgp_confederation_peers, if (bgp->as == as) { vty_out (vty, "%% Local member-AS not allowed in confed peer list%s", - VTY_NEWLINE); + VTYNL); continue; } @@ -1189,7 +1189,7 @@ bgp_maxpaths_config_vty (struct vty *vty, int peer_type, const char *mpaths, "%% Failed to %sset maximum-paths %s %u for afi %u, safi %u%s", (set == 1) ? "" : "un", (peer_type == BGP_PEER_EBGP) ? "ebgp" : "ibgp", - maxpaths, afi, safi, VTY_NEWLINE); + maxpaths, afi, safi, VTYNL); return CMD_WARNING; } @@ -1324,7 +1324,7 @@ bgp_update_delay_config_vty (struct vty *vty, const char *delay, if (update_delay < establish_wait) { vty_out (vty, "%%Failed: update-delay less than the establish-wait!%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -1353,7 +1353,7 @@ bgp_config_write_update_delay (struct vty *vty, struct bgp *bgp) vty_out (vty, " update-delay %d", bgp->v_update_delay); if (bgp->v_update_delay != bgp->v_establish_wait) vty_out (vty, " %d", bgp->v_establish_wait); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return 0; @@ -1415,7 +1415,7 @@ bgp_config_write_wpkt_quanta (struct vty *vty, struct bgp *bgp) { if (bgp->wpkt_quanta != BGP_WRITE_PACKET_MAX) vty_out (vty, " write-quanta %d%s", - bgp->wpkt_quanta, VTY_NEWLINE); + bgp->wpkt_quanta, VTYNL); return 0; } @@ -1449,7 +1449,7 @@ bgp_config_write_coalesce_time (struct vty *vty, struct bgp *bgp) { if (bgp->coalesce_time != BGP_DEFAULT_SUBGROUP_COALESCE_TIME) vty_out (vty, " coalesce-time %u%s", - bgp->coalesce_time, VTY_NEWLINE); + bgp->coalesce_time, VTYNL); return 0; } @@ -1584,7 +1584,7 @@ bgp_config_write_maxpaths (struct vty *vty, struct bgp *bgp, afi_t afi, { bgp_config_write_family_header (vty, afi, safi, write); vty_out (vty, " maximum-paths %d%s", - bgp->maxpaths[afi][safi].maxpaths_ebgp, VTY_NEWLINE); + bgp->maxpaths[afi][safi].maxpaths_ebgp, VTYNL); } if (bgp->maxpaths[afi][safi].maxpaths_ibgp != MULTIPATH_NUM) @@ -1595,7 +1595,7 @@ bgp_config_write_maxpaths (struct vty *vty, struct bgp *bgp, afi_t afi, if (CHECK_FLAG (bgp->maxpaths[afi][safi].ibgp_flags, BGP_FLAG_IBGP_MULTIPATH_SAME_CLUSTERLEN)) vty_out (vty, " equal-cluster-length"); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return 0; @@ -1624,7 +1624,7 @@ DEFUN (bgp_timers, if (holdtime < 3 && holdtime != 0) { vty_out (vty, "%% hold time value must be either 0 or greater than 3%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -1759,7 +1759,7 @@ DEFUN (no_bgp_deterministic_med, if (bestpath_per_as_used) { vty_out (vty, "bgp deterministic-med cannot be disabled while addpath-tx-bestpath-per-AS is in use%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } else @@ -2452,7 +2452,7 @@ DEFUN (bgp_listen_range, ret = str2prefix (prefix, &range); if (! ret) { - vty_out (vty, "%% Malformed listen range%s", VTY_NEWLINE); + vty_out (vty, "%% Malformed listen range%s", VTYNL); return CMD_WARNING; } @@ -2461,7 +2461,7 @@ DEFUN (bgp_listen_range, if (afi == AFI_IP6 && IN6_IS_ADDR_LINKLOCAL (&range.u.prefix6)) { vty_out (vty, "%% Malformed listen range (link-local address)%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -2476,7 +2476,7 @@ DEFUN (bgp_listen_range, else { vty_out (vty, "%% Same listen range is attached to peer-group %s%s", - existing_group->name, VTY_NEWLINE); + existing_group->name, VTYNL); return CMD_WARNING; } } @@ -2485,14 +2485,14 @@ DEFUN (bgp_listen_range, if (listen_range_exists (bgp, &range, 0)) { vty_out (vty, "%% Listen range overlaps with existing listen range%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } group = peer_group_lookup (bgp, peergroup); if (! group) { - vty_out (vty, "%% Configure the peer-group first%s", VTY_NEWLINE); + vty_out (vty, "%% Configure the peer-group first%s", VTYNL); return CMD_WARNING; } @@ -2528,7 +2528,7 @@ DEFUN (no_bgp_listen_range, ret = str2prefix (prefix, &range); if (! ret) { - vty_out (vty, "%% Malformed listen range%s", VTY_NEWLINE); + vty_out (vty, "%% Malformed listen range%s", VTYNL); return CMD_WARNING; } @@ -2537,7 +2537,7 @@ DEFUN (no_bgp_listen_range, if (afi == AFI_IP6 && IN6_IS_ADDR_LINKLOCAL (&range.u.prefix6)) { vty_out (vty, "%% Malformed listen range (link-local address)%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -2546,7 +2546,7 @@ DEFUN (no_bgp_listen_range, group = peer_group_lookup (bgp, peergroup); if (! group) { - vty_out (vty, "%% Peer-group does not exist%s", VTY_NEWLINE); + vty_out (vty, "%% Peer-group does not exist%s", VTYNL); return CMD_WARNING; } @@ -2565,7 +2565,7 @@ bgp_config_write_listen (struct vty *vty, struct bgp *bgp) if (bgp->dynamic_neighbors_limit != BGP_DYNAMIC_NEIGHBORS_LIMIT_DEFAULT) vty_out (vty, " bgp listen limit %d%s", - bgp->dynamic_neighbors_limit, VTY_NEWLINE); + bgp->dynamic_neighbors_limit, VTYNL); for (ALL_LIST_ELEMENTS (bgp->group, node, nnode, group)) { @@ -2575,7 +2575,7 @@ bgp_config_write_listen (struct vty *vty, struct bgp *bgp) { prefix2str(range, buf, sizeof(buf)); vty_out(vty, " bgp listen range %s peer-group %s%s", - buf, group->name, VTY_NEWLINE); + buf, group->name, VTYNL); } } } @@ -2650,7 +2650,7 @@ peer_remote_as_vty (struct vty *vty, const char *peer_str, if (ret < 0) { vty_out (vty, "%% Create the peer-group or interface first%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } return CMD_SUCCESS; @@ -2661,7 +2661,7 @@ peer_remote_as_vty (struct vty *vty, const char *peer_str, if (peer_address_self_check (bgp, &su)) { vty_out (vty, "%% Can not configure the local system as neighbor%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } ret = peer_remote_as (bgp, &su, NULL, &as, as_type, afi, safi); @@ -2671,10 +2671,10 @@ peer_remote_as_vty (struct vty *vty, const char *peer_str, switch (ret) { case BGP_ERR_PEER_GROUP_MEMBER: - vty_out (vty, "%% Peer-group AS %u. Cannot configure remote-as for member%s", as, VTY_NEWLINE); + vty_out (vty, "%% Peer-group AS %u. Cannot configure remote-as for member%s", as, VTYNL); return CMD_WARNING; case BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT: - vty_out (vty, "%% The AS# can not be changed from %u to %s, peer-group members must be all internal or all external%s", as, as_str, VTY_NEWLINE); + vty_out (vty, "%% The AS# can not be changed from %u to %s, peer-group members must be all internal or all external%s", as, as_str, VTYNL); return CMD_WARNING; } return bgp_vty_return (vty, ret); @@ -2712,7 +2712,7 @@ peer_conf_interface_get (struct vty *vty, const char *conf_if, afi_t afi, if (group) { - vty_out (vty, "%% Name conflict with peer-group %s", VTY_NEWLINE); + vty_out (vty, "%% Name conflict with peer-group %s", VTYNL); return CMD_WARNING; } @@ -2792,7 +2792,7 @@ peer_conf_interface_get (struct vty *vty, const char *conf_if, afi_t afi, group = peer_group_lookup (bgp, peer_group_name); if (! group) { - vty_out (vty, "%% Configure the peer-group first%s", VTY_NEWLINE); + vty_out (vty, "%% Configure the peer-group first%s", VTYNL); return CMD_WARNING; } @@ -2894,7 +2894,7 @@ DEFUN (neighbor_peer_group, peer = peer_lookup_by_conf_if (bgp, argv[idx_word]->arg); if (peer) { - vty_out (vty, "%% Name conflict with interface: %s", VTY_NEWLINE); + vty_out (vty, "%% Name conflict with interface: %s", VTYNL); return CMD_WARNING; } @@ -2943,7 +2943,7 @@ DEFUN (no_neighbor, peer_group_delete (group); else { - vty_out (vty, "%% Create the peer-group first%s", VTY_NEWLINE); + vty_out (vty, "%% Create the peer-group first%s", VTYNL); return CMD_WARNING; } } @@ -2955,7 +2955,7 @@ DEFUN (no_neighbor, if (peer_dynamic_neighbor (peer)) { vty_out (vty, "%% Operation not allowed on a dynamic neighbor%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -2999,7 +2999,7 @@ DEFUN (no_neighbor_interface_config, } else { - vty_out (vty, "%% Create the bgp interface first%s", VTY_NEWLINE); + vty_out (vty, "%% Create the bgp interface first%s", VTYNL); return CMD_WARNING; } return CMD_SUCCESS; @@ -3022,7 +3022,7 @@ DEFUN (no_neighbor_peer_group, peer_group_delete (group); else { - vty_out (vty, "%% Create the peer-group first%s", VTY_NEWLINE); + vty_out (vty, "%% Create the peer-group first%s", VTYNL); return CMD_WARNING; } return CMD_SUCCESS; @@ -3057,7 +3057,7 @@ DEFUN (no_neighbor_interface_peer_group_remote_as, peer_group_remote_as_delete (group); else { - vty_out (vty, "%% Create the peer-group or interface first%s", VTY_NEWLINE); + vty_out (vty, "%% Create the peer-group or interface first%s", VTYNL); return CMD_WARNING; } return CMD_SUCCESS; @@ -3329,7 +3329,7 @@ DEFUN (neighbor_set_peer_group, peer = peer_lookup_by_conf_if (bgp, argv[idx_peer]->arg); if (!peer) { - vty_out (vty, "%% Malformed address or name: %s%s", argv[idx_peer]->arg, VTY_NEWLINE); + vty_out (vty, "%% Malformed address or name: %s%s", argv[idx_peer]->arg, VTYNL); return CMD_WARNING; } } @@ -3338,7 +3338,7 @@ DEFUN (neighbor_set_peer_group, if (peer_address_self_check (bgp, &su)) { vty_out (vty, "%% Can not configure the local system as neighbor%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -3347,7 +3347,7 @@ DEFUN (neighbor_set_peer_group, if (peer && peer_dynamic_neighbor (peer)) { vty_out (vty, "%% Operation not allowed on a dynamic neighbor%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } } @@ -3355,7 +3355,7 @@ DEFUN (neighbor_set_peer_group, group = peer_group_lookup (bgp, argv[idx_word]->arg); if (! group) { - vty_out (vty, "%% Configure the peer-group first%s", VTY_NEWLINE); + vty_out (vty, "%% Configure the peer-group first%s", VTYNL); return CMD_WARNING; } @@ -3363,7 +3363,7 @@ DEFUN (neighbor_set_peer_group, if (ret == BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT) { - vty_out (vty, "%% Peer with AS %u cannot be in this peer-group, members must be all internal or all external%s", as, VTY_NEWLINE); + vty_out (vty, "%% Peer with AS %u cannot be in this peer-group, members must be all internal or all external%s", as, VTYNL); return CMD_WARNING; } @@ -3401,7 +3401,7 @@ DEFUN (no_neighbor_set_peer_group, group = peer_group_lookup (bgp, argv[idx_word]->arg); if (! group) { - vty_out (vty, "%% Configure the peer-group first%s", VTY_NEWLINE); + vty_out (vty, "%% Configure the peer-group first%s", VTYNL); return CMD_WARNING; } @@ -3436,7 +3436,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, VTY_NEWLINE); + "connected-check%s", ip_str, VTYNL); return CMD_WARNING; } @@ -4642,7 +4642,7 @@ peer_update_source_vty (struct vty *vty, const char *peer_str, if (str2prefix (source_str, &p)) { vty_out (vty, "%% Invalid update-source, remove prefix length %s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } else @@ -6054,7 +6054,7 @@ DEFUN (neighbor_ttl_security, */ if (peer->conf_if && (gtsm_hops > 1)) { vty_out (vty, "%s is directly connected peer, hops cannot exceed 1%s", - argv[idx_peer]->arg, VTY_NEWLINE); + argv[idx_peer]->arg, VTYNL); return CMD_WARNING; } @@ -6287,7 +6287,7 @@ bgp_clear_prefix (struct vty *vty, const char *view_name, const char *ip_str, bgp = bgp_lookup_by_name (view_name); if (bgp == NULL) { - vty_out (vty, "%% Can't find BGP instance %s%s", view_name, VTY_NEWLINE); + vty_out (vty, "%% Can't find BGP instance %s%s", view_name, VTYNL); return CMD_WARNING; } } @@ -6296,7 +6296,7 @@ bgp_clear_prefix (struct vty *vty, const char *view_name, const char *ip_str, bgp = bgp_get_default (); if (bgp == NULL) { - vty_out (vty, "%% No BGP process is configured%s", VTY_NEWLINE); + vty_out (vty, "%% No BGP process is configured%s", VTYNL); return CMD_WARNING; } } @@ -6305,7 +6305,7 @@ bgp_clear_prefix (struct vty *vty, const char *view_name, const char *ip_str, ret = str2prefix (ip_str, &match); if (! ret) { - vty_out (vty, "%% address is malformed%s", VTY_NEWLINE); + vty_out (vty, "%% address is malformed%s", VTYNL); return CMD_WARNING; } @@ -6529,11 +6529,11 @@ DEFUN (show_bgp_views, if (!bgp_option_check (BGP_OPT_MULTIPLE_INSTANCE)) { - vty_out (vty, "BGP Multiple Instance is not enabled%s", VTY_NEWLINE); + vty_out (vty, "BGP Multiple Instance is not enabled%s", VTYNL); return CMD_WARNING; } - vty_out (vty, "Defined BGP views:%s", VTY_NEWLINE); + vty_out (vty, "Defined BGP views:%s", VTYNL); for (ALL_LIST_ELEMENTS_RO(inst, node, bgp)) { /* Skip VRFs. */ @@ -6541,7 +6541,7 @@ DEFUN (show_bgp_views, continue; vty_out (vty, "\t%s (AS%u)%s", bgp->name ? bgp->name : "(null)", - bgp->as, VTY_NEWLINE); + bgp->as, VTYNL); } return CMD_SUCCESS; @@ -6567,7 +6567,7 @@ DEFUN (show_bgp_vrfs, if (!bgp_option_check (BGP_OPT_MULTIPLE_INSTANCE)) { - vty_out (vty, "BGP Multiple Instance is not enabled%s", VTY_NEWLINE); + vty_out (vty, "BGP Multiple Instance is not enabled%s", VTYNL); return CMD_WARNING; } @@ -6592,7 +6592,7 @@ DEFUN (show_bgp_vrfs, count++; if (!uj && count == 1) - vty_out (vty, "%s%s", header, VTY_NEWLINE); + vty_out (vty, "%s%s", header, VTYNL); peers_cfg = peers_estb = 0; if (uj) @@ -6634,7 +6634,7 @@ DEFUN (show_bgp_vrfs, vty_out (vty, "%4s %-5d %-16s %9u %10u %s%s", type, vrf_id_ui, inet_ntoa (bgp->router_id), peers_cfg, peers_estb, name, - VTY_NEWLINE); + VTYNL); } if (uj) @@ -6643,14 +6643,14 @@ DEFUN (show_bgp_vrfs, json_object_int_add(json, "totalVrfs", count); - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else { if (count) vty_out (vty, "%sTotal number of VRFs (including default): %d%s", - VTY_NEWLINE, count, VTY_NEWLINE); + VTYNL, count, VTYNL); } return CMD_SUCCESS; @@ -6672,136 +6672,136 @@ DEFUN (show_bgp_memory, vty_out (vty, "%ld RIB nodes, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_node)), - VTY_NEWLINE); + VTYNL); count = mtype_stats_alloc (MTYPE_BGP_ROUTE); vty_out (vty, "%ld BGP routes, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_info)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_BGP_ROUTE_EXTRA))) vty_out (vty, "%ld BGP route ancillaries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_info_extra)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_BGP_STATIC))) vty_out (vty, "%ld Static routes, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_static)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_BGP_PACKET))) vty_out (vty, "%ld Packets, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bpacket)), - VTY_NEWLINE); + VTYNL); /* Adj-In/Out */ if ((count = mtype_stats_alloc (MTYPE_BGP_ADJ_IN))) vty_out (vty, "%ld Adj-In entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_adj_in)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_BGP_ADJ_OUT))) vty_out (vty, "%ld Adj-Out entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_adj_out)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_BGP_NEXTHOP_CACHE))) vty_out (vty, "%ld Nexthop cache entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_nexthop_cache)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_BGP_DAMP_INFO))) vty_out (vty, "%ld Dampening entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct bgp_damp_info)), - VTY_NEWLINE); + VTYNL); /* Attributes */ count = attr_count(); vty_out (vty, "%ld BGP attributes, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof(struct attr)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_ATTR_EXTRA))) vty_out (vty, "%ld BGP extra attributes, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof(struct attr_extra)), - VTY_NEWLINE); + VTYNL); if ((count = attr_unknown_count())) - vty_out (vty, "%ld unknown attributes%s", count, VTY_NEWLINE); + vty_out (vty, "%ld unknown attributes%s", count, VTYNL); /* AS_PATH attributes */ count = aspath_count (); vty_out (vty, "%ld BGP AS-PATH entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct aspath)), - VTY_NEWLINE); + VTYNL); count = mtype_stats_alloc (MTYPE_AS_SEG); vty_out (vty, "%ld BGP AS-PATH segments, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct assegment)), - VTY_NEWLINE); + VTYNL); /* Other attributes */ if ((count = community_count ())) vty_out (vty, "%ld BGP community entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct community)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_ECOMMUNITY))) vty_out (vty, "%ld BGP community entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct ecommunity)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_LCOMMUNITY))) vty_out (vty, "%ld BGP large-community entries, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct lcommunity)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_CLUSTER))) vty_out (vty, "%ld Cluster lists, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct cluster_list)), - VTY_NEWLINE); + VTYNL); /* Peer related usage */ count = mtype_stats_alloc (MTYPE_BGP_PEER); vty_out (vty, "%ld peers, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct peer)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_PEER_GROUP))) vty_out (vty, "%ld peer groups, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct peer_group)), - VTY_NEWLINE); + VTYNL); /* Other */ if ((count = mtype_stats_alloc (MTYPE_HASH))) vty_out (vty, "%ld hash tables, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct hash)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_HASH_BACKET))) vty_out (vty, "%ld hash buckets, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (struct hash_backet)), - VTY_NEWLINE); + VTYNL); if ((count = mtype_stats_alloc (MTYPE_BGP_REGEXP))) vty_out (vty, "%ld compiled regexes, using %s of memory%s", count, mtype_memstr (memstrbuf, sizeof (memstrbuf), count * sizeof (regex_t)), - VTY_NEWLINE); + VTYNL); return CMD_SUCCESS; } @@ -6893,7 +6893,7 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi, vty_out (vty, "BGP router identifier %s, local AS number %u vrf-id %d", inet_ntoa (bgp->router_id), bgp->as, vrf_id_ui); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } if (bgp_update_delay_configured(bgp)) @@ -6928,29 +6928,29 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi, else { vty_out (vty, "Read-only mode update-delay limit: %d seconds%s", - bgp->v_update_delay, VTY_NEWLINE); + bgp->v_update_delay, VTYNL); if (bgp->v_update_delay != bgp->v_establish_wait) vty_out (vty, " Establish wait: %d seconds%s", - bgp->v_establish_wait, VTY_NEWLINE); + bgp->v_establish_wait, VTYNL); if (bgp_update_delay_active(bgp)) { vty_out (vty, " First neighbor established: %s%s", - bgp->update_delay_begin_time, VTY_NEWLINE); - vty_out (vty, " Delay in progress%s", VTY_NEWLINE); + bgp->update_delay_begin_time, VTYNL); + vty_out (vty, " Delay in progress%s", VTYNL); } else { if (bgp->update_delay_over) { vty_out (vty, " First neighbor established: %s%s", - bgp->update_delay_begin_time, VTY_NEWLINE); + bgp->update_delay_begin_time, VTYNL); vty_out (vty, " Best-paths resumed: %s%s", - bgp->update_delay_end_time, VTY_NEWLINE); + bgp->update_delay_end_time, VTYNL); vty_out (vty, " zebra update resumed: %s%s", - bgp->update_delay_zebra_resume_time, VTY_NEWLINE); + bgp->update_delay_zebra_resume_time, VTYNL); vty_out (vty, " peers update resumed: %s%s", - bgp->update_delay_peers_resume_time, VTY_NEWLINE); + bgp->update_delay_peers_resume_time, VTYNL); } } } @@ -6985,18 +6985,18 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi, else { if (bgp_maxmed_onstartup_configured(bgp) && bgp->maxmed_active) - vty_out (vty, "Max-med on-startup active%s", VTY_NEWLINE); + vty_out (vty, "Max-med on-startup active%s", VTYNL); if (bgp->v_maxmed_admin) - vty_out (vty, "Max-med administrative active%s", VTY_NEWLINE); + vty_out (vty, "Max-med administrative active%s", VTYNL); vty_out(vty, "BGP table version %" PRIu64 "%s", - bgp_table_version(bgp->rib[afi][safi]), VTY_NEWLINE); + bgp_table_version(bgp->rib[afi][safi]), VTYNL); ents = bgp_table_count (bgp->rib[afi][safi]); vty_out (vty, "RIB entries %ld, using %s of memory%s", ents, mtype_memstr (memstrbuf, sizeof (memstrbuf), ents * sizeof (struct bgp_node)), - VTY_NEWLINE); + VTYNL); /* Peer related usage */ ents = listcount (bgp->peer); @@ -7004,22 +7004,22 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi, ents, mtype_memstr (memstrbuf, sizeof (memstrbuf), ents * sizeof (struct peer)), - VTY_NEWLINE); + VTYNL); if ((ents = listcount (bgp->group))) vty_out (vty, "Peer groups %ld, using %s of memory%s", ents, mtype_memstr (memstrbuf, sizeof (memstrbuf), ents * sizeof (struct peer_group)), - VTY_NEWLINE); + VTYNL); if (CHECK_FLAG (bgp->af_flags[afi][safi], BGP_CONFIG_DAMPENING)) - vty_out (vty, "Dampening enabled.%s", VTY_NEWLINE); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "Dampening enabled.%s", VTYNL); + vty_out (vty, "%s", VTYNL); /* Subtract 8 here because 'Neighbor' is 8 characters */ vty_out (vty, "Neighbor"); vty_out (vty, "%*s", max_neighbor_width - 8, " "); - vty_out (vty, "V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd%s", VTY_NEWLINE); + vty_out (vty, "V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd%s", VTYNL); } } @@ -7114,7 +7114,7 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi, else vty_out (vty, " %12s", lookup_msg(bgp_status_msg, peer->status, NULL)); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } } @@ -7126,30 +7126,30 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi, json_object_int_add(json, "totalPeers", count); json_object_int_add(json, "dynamicPeers", dn_count); - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else { if (count) - vty_out (vty, "%sTotal number of neighbors %d%s", VTY_NEWLINE, - count, VTY_NEWLINE); + vty_out (vty, "%sTotal number of neighbors %d%s", VTYNL, + count, VTYNL); else { if (use_json) vty_out(vty, "{\"error\": {\"message\": \"No %s neighbor configured\"}}%s", - afi_safi_print(afi, safi), VTY_NEWLINE); + afi_safi_print(afi, safi), VTYNL); else vty_out (vty, "No %s neighbor is configured%s", - afi_safi_print(afi, safi), VTY_NEWLINE); + afi_safi_print(afi, safi), VTYNL); } if (dn_count && ! use_json) { - vty_out(vty, "* - dynamic neighbor%s", VTY_NEWLINE); + vty_out(vty, "* - dynamic neighbor%s", VTYNL); vty_out(vty, "%d dynamic neighbor(s), limit %d%s", - dn_count, bgp->dynamic_neighbors_limit, VTY_NEWLINE); + dn_count, bgp->dynamic_neighbors_limit, VTYNL); } } @@ -7188,7 +7188,7 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi, bool json_output = false; if (use_json && is_wildcard) - vty_out (vty, "{%s", VTY_NEWLINE); + vty_out (vty, "{%s", VTYNL); if (afi_wildcard) afi = 1; /* AFI_IP */ while (afi < AFI_MAX) @@ -7211,7 +7211,7 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi, json = json_object_new_object(); if (! is_first) - vty_out (vty, ",%s", VTY_NEWLINE); + vty_out (vty, ",%s", VTYNL); else is_first = 0; @@ -7220,7 +7220,7 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi, else { vty_out (vty, "%s%s Summary:%s", - VTY_NEWLINE, afi_safi_print(afi, safi), VTY_NEWLINE); + VTYNL, afi_safi_print(afi, safi), VTYNL); } } bgp_show_summary (vty, bgp, afi, safi, use_json, json); @@ -7239,9 +7239,9 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi, } if (use_json && is_wildcard) - vty_out (vty, "}%s", VTY_NEWLINE); + vty_out (vty, "}%s", VTYNL); else if (use_json && !json_output) - vty_out (vty, "{}%s", VTY_NEWLINE); + vty_out (vty, "{}%s", VTYNL); } static void @@ -7254,7 +7254,7 @@ bgp_show_all_instances_summary_vty (struct vty *vty, afi_t afi, safi_t safi, int is_first = 1; if (use_json) - vty_out (vty, "{%s", VTY_NEWLINE); + vty_out (vty, "{%s", VTYNL); for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp)) { @@ -7263,7 +7263,7 @@ bgp_show_all_instances_summary_vty (struct vty *vty, afi_t afi, safi_t safi, json = json_object_new_object(); if (! is_first) - vty_out (vty, ",%s", VTY_NEWLINE); + vty_out (vty, ",%s", VTYNL); else is_first = 0; @@ -7273,15 +7273,15 @@ bgp_show_all_instances_summary_vty (struct vty *vty, afi_t afi, safi_t safi, else { vty_out (vty, "%sInstance %s:%s", - VTY_NEWLINE, + VTYNL, (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) - ? "Default" : bgp->name, VTY_NEWLINE); + ? "Default" : bgp->name, VTYNL); } bgp_show_summary_afi_safi (vty, bgp, afi, safi, use_json, json); } if (use_json) - vty_out (vty, "}%s", VTY_NEWLINE); + vty_out (vty, "}%s", VTYNL); } @@ -7305,9 +7305,9 @@ bgp_show_summary_vty (struct vty *vty, const char *name, if (! bgp) { if (use_json) - vty_out (vty, "{}%s", VTY_NEWLINE); + vty_out (vty, "{}%s", VTYNL); else - vty_out (vty, "%% No such BGP instance exist%s", VTY_NEWLINE); + vty_out (vty, "%% No such BGP instance exist%s", VTYNL); return CMD_WARNING; } @@ -7458,7 +7458,7 @@ bgp_show_peer_afi_orf_cap (struct vty *vty, struct peer *p, afi_t afi, safi_t sa vty_out (vty, "%sreceived", CHECK_FLAG (p->af_cap[afi][safi], adv_smcap) ? ", " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } @@ -7484,7 +7484,7 @@ bgp_show_peer_afi_orf_cap (struct vty *vty, struct peer *p, afi_t afi, safi_t sa vty_out (vty, "%sreceived", CHECK_FLAG (p->af_cap[afi][safi], adv_rmcap) ? ", " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } } @@ -7690,22 +7690,22 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi, filter = &p->filter[afi][safi]; vty_out (vty, " For address family: %s%s", afi_safi_print (afi, safi), - VTY_NEWLINE); + VTYNL); if (peer_group_active(p)) - vty_out (vty, " %s peer-group member%s", p->group->name, VTY_NEWLINE); + vty_out (vty, " %s peer-group member%s", p->group->name, VTYNL); 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, VTY_NEWLINE); + PAF_UPDGRP(paf)->id, PAF_SUBGRP(paf)->id, VTYNL); vty_out (vty, " Packet Queue length %d%s", - bpacket_queue_virtual_length(paf), VTY_NEWLINE); + bpacket_queue_virtual_length(paf), VTYNL); } else { - vty_out(vty, " Not part of any update group%s", VTY_NEWLINE); + vty_out(vty, " Not part of any update group%s", VTYNL); } if (CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_SM_ADV) || CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_SM_RCV) @@ -7713,7 +7713,7 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi, || CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_RM_ADV) || CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_RM_RCV) || CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_RM_OLD_RCV)) - vty_out (vty, " AF-dependant capabilities:%s", VTY_NEWLINE); + vty_out (vty, " AF-dependant capabilities:%s", VTYNL); if (CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_SM_ADV) || CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_SM_RCV) @@ -7721,7 +7721,7 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi, || CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_RM_RCV)) { vty_out (vty, " Outbound Route Filter (ORF) type (%d) Prefix-list:%s", - ORF_TYPE_PREFIX, VTY_NEWLINE); + ORF_TYPE_PREFIX, VTYNL); bgp_show_peer_afi_orf_cap (vty, p, afi, safi, PEER_CAP_ORF_PREFIX_SM_ADV, PEER_CAP_ORF_PREFIX_RM_ADV, @@ -7734,7 +7734,7 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi, || CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_RM_OLD_RCV)) { vty_out (vty, " Outbound Route Filter (ORF) type (%d) Prefix-list:%s", - ORF_TYPE_PREFIX_OLD, VTY_NEWLINE); + ORF_TYPE_PREFIX_OLD, VTYNL); bgp_show_peer_afi_orf_cap (vty, p, afi, safi, PEER_CAP_ORF_PREFIX_SM_ADV, PEER_CAP_ORF_PREFIX_RM_ADV, @@ -7753,45 +7753,45 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi, vty_out (vty, " sent;"); if (orf_pfx_count) vty_out (vty, " received (%d entries)", orf_pfx_count); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } if (CHECK_FLAG (p->af_sflags[afi][safi], PEER_STATUS_ORF_WAIT_REFRESH)) - vty_out (vty, " First update is deferred until ORF or ROUTE-REFRESH is received%s", VTY_NEWLINE); + vty_out (vty, " First update is deferred until ORF or ROUTE-REFRESH is received%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT)) - vty_out (vty, " Route-Reflector Client%s", VTY_NEWLINE); + vty_out (vty, " Route-Reflector Client%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_RSERVER_CLIENT)) - vty_out (vty, " Route-Server Client%s", VTY_NEWLINE); + vty_out (vty, " Route-Server Client%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SOFT_RECONFIG)) - vty_out (vty, " Inbound soft reconfiguration allowed%s", VTY_NEWLINE); + vty_out (vty, " Inbound soft reconfiguration allowed%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE)) - vty_out (vty, " Private AS numbers (all) replaced in updates to this neighbor%s", VTY_NEWLINE); + vty_out (vty, " Private AS numbers (all) replaced in updates to this neighbor%s", VTYNL); else if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE)) - vty_out (vty, " Private AS numbers replaced in updates to this neighbor%s", VTY_NEWLINE); + vty_out (vty, " Private AS numbers replaced in updates to this neighbor%s", VTYNL); else if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_REMOVE_PRIVATE_AS_ALL)) - vty_out (vty, " Private AS numbers (all) removed in updates to this neighbor%s", VTY_NEWLINE); + vty_out (vty, " Private AS numbers (all) removed in updates to this neighbor%s", VTYNL); else if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_REMOVE_PRIVATE_AS)) - vty_out (vty, " Private AS numbers removed in updates to this neighbor%s", VTY_NEWLINE); + vty_out (vty, " Private AS numbers removed in updates to this neighbor%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_ADDPATH_TX_ALL_PATHS)) - vty_out (vty, " Advertise all paths via addpath%s", VTY_NEWLINE); + vty_out (vty, " Advertise all paths via addpath%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS)) - vty_out (vty, " Advertise bestpath per AS via addpath%s", VTY_NEWLINE); + vty_out (vty, " Advertise bestpath per AS via addpath%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_AS_OVERRIDE)) - vty_out (vty, " Override ASNs in outbound updates if aspath equals remote-as%s", VTY_NEWLINE); + vty_out (vty, " Override ASNs in outbound updates if aspath equals remote-as%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_NEXTHOP_SELF) || CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_FORCE_NEXTHOP_SELF)) - vty_out (vty, " NEXT_HOP is always this router%s", VTY_NEWLINE); + vty_out (vty, " NEXT_HOP is always this router%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_AS_PATH_UNCHANGED)) - vty_out (vty, " AS_PATH is propagated unchanged to this neighbor%s", VTY_NEWLINE); + vty_out (vty, " AS_PATH is propagated unchanged to this neighbor%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_NEXTHOP_UNCHANGED)) - vty_out (vty, " NEXT_HOP is propagated unchanged to this neighbor%s", VTY_NEWLINE); + vty_out (vty, " NEXT_HOP is propagated unchanged to this neighbor%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_MED_UNCHANGED)) - vty_out (vty, " MED is propagated unchanged to this neighbor%s", VTY_NEWLINE); + vty_out (vty, " MED is propagated unchanged to this neighbor%s", VTYNL); if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_COMMUNITY) || CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_EXT_COMMUNITY) || CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_LARGE_COMMUNITY)) @@ -7800,13 +7800,13 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi, if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_COMMUNITY) && CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_EXT_COMMUNITY) && CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_LARGE_COMMUNITY)) - vty_out (vty, "(all)%s", VTY_NEWLINE); + vty_out (vty, "(all)%s", VTYNL); else if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_LARGE_COMMUNITY)) - vty_out (vty, "(large)%s", VTY_NEWLINE); + vty_out (vty, "(large)%s", VTYNL); else if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_SEND_EXT_COMMUNITY)) - vty_out (vty, "(extended)%s", VTY_NEWLINE); + vty_out (vty, "(extended)%s", VTYNL); else - vty_out (vty, "(standard)%s", VTY_NEWLINE); + vty_out (vty, "(standard)%s", VTYNL); } if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_DEFAULT_ORIGINATE)) { @@ -7817,94 +7817,94 @@ bgp_show_peer_afi (struct vty *vty, struct peer *p, afi_t afi, safi_t safi, p->default_rmap[afi][safi].map ? "*" : "", p->default_rmap[afi][safi].name); if (paf && PAF_SUBGRP(paf) && CHECK_FLAG(PAF_SUBGRP(paf)->sflags, SUBGRP_STATUS_DEFAULT_ORIGINATE)) - vty_out (vty, " default sent%s", VTY_NEWLINE); + vty_out (vty, " default sent%s", VTYNL); else - vty_out (vty, " default not sent%s", VTY_NEWLINE); + vty_out (vty, " default not sent%s", VTYNL); } if (filter->plist[FILTER_IN].name || filter->dlist[FILTER_IN].name || filter->aslist[FILTER_IN].name || filter->map[RMAP_IN].name) - vty_out (vty, " Inbound path policy configured%s", VTY_NEWLINE); + vty_out (vty, " Inbound path policy configured%s", VTYNL); if (filter->plist[FILTER_OUT].name || filter->dlist[FILTER_OUT].name || filter->aslist[FILTER_OUT].name || filter->map[RMAP_OUT].name || filter->usmap.name) - vty_out (vty, " Outbound path policy configured%s", VTY_NEWLINE); + vty_out (vty, " Outbound path policy configured%s", VTYNL); /* prefix-list */ if (filter->plist[FILTER_IN].name) vty_out (vty, " Incoming update prefix filter list is %s%s%s", filter->plist[FILTER_IN].plist ? "*" : "", filter->plist[FILTER_IN].name, - VTY_NEWLINE); + VTYNL); if (filter->plist[FILTER_OUT].name) vty_out (vty, " Outgoing update prefix filter list is %s%s%s", filter->plist[FILTER_OUT].plist ? "*" : "", filter->plist[FILTER_OUT].name, - VTY_NEWLINE); + VTYNL); /* distribute-list */ if (filter->dlist[FILTER_IN].name) vty_out (vty, " Incoming update network filter list is %s%s%s", filter->dlist[FILTER_IN].alist ? "*" : "", filter->dlist[FILTER_IN].name, - VTY_NEWLINE); + VTYNL); if (filter->dlist[FILTER_OUT].name) vty_out (vty, " Outgoing update network filter list is %s%s%s", filter->dlist[FILTER_OUT].alist ? "*" : "", filter->dlist[FILTER_OUT].name, - VTY_NEWLINE); + VTYNL); /* filter-list. */ if (filter->aslist[FILTER_IN].name) vty_out (vty, " Incoming update AS path filter list is %s%s%s", filter->aslist[FILTER_IN].aslist ? "*" : "", filter->aslist[FILTER_IN].name, - VTY_NEWLINE); + VTYNL); if (filter->aslist[FILTER_OUT].name) vty_out (vty, " Outgoing update AS path filter list is %s%s%s", filter->aslist[FILTER_OUT].aslist ? "*" : "", filter->aslist[FILTER_OUT].name, - VTY_NEWLINE); + VTYNL); /* route-map. */ if (filter->map[RMAP_IN].name) vty_out (vty, " Route map for incoming advertisements is %s%s%s", filter->map[RMAP_IN].map ? "*" : "", filter->map[RMAP_IN].name, - VTY_NEWLINE); + VTYNL); if (filter->map[RMAP_OUT].name) vty_out (vty, " Route map for outgoing advertisements is %s%s%s", filter->map[RMAP_OUT].map ? "*" : "", filter->map[RMAP_OUT].name, - VTY_NEWLINE); + VTYNL); /* unsuppress-map */ if (filter->usmap.name) vty_out (vty, " Route map for selective unsuppress is %s%s%s", filter->usmap.map ? "*" : "", - filter->usmap.name, VTY_NEWLINE); + filter->usmap.name, VTYNL); /* Receive prefix count */ - vty_out (vty, " %ld accepted prefixes%s", p->pcount[afi][safi], VTY_NEWLINE); + vty_out (vty, " %ld accepted prefixes%s", p->pcount[afi][safi], VTYNL); /* Maximum prefix */ if (CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_MAX_PREFIX)) { vty_out (vty, " Maximum prefixes allowed %ld%s%s", p->pmax[afi][safi], CHECK_FLAG (p->af_flags[afi][safi], PEER_FLAG_MAX_PREFIX_WARNING) - ? " (warning-only)" : "", VTY_NEWLINE); + ? " (warning-only)" : "", VTYNL); vty_out (vty, " Threshold for warning message %d%%", p->pmax_threshold[afi][safi]); if (p->pmax_restart[afi][safi]) vty_out (vty, ", restart interval %d min", p->pmax_restart[afi][safi]); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } @@ -7991,9 +7991,9 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js else { if (CHECK_FLAG(bgp->config, BGP_CONFIG_CONFEDERATION)) - vty_out (vty, "confed-internal link%s", VTY_NEWLINE); + vty_out (vty, "confed-internal link%s", VTYNL); else - vty_out (vty, "internal link%s", VTY_NEWLINE); + vty_out (vty, "internal link%s", VTYNL); } } else @@ -8008,9 +8008,9 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js else { if (bgp_confederation_peers_check(bgp, p->as)) - vty_out (vty, "confed-external link%s", VTY_NEWLINE); + vty_out (vty, "confed-external link%s", VTYNL); else - vty_out (vty, "external link%s", VTY_NEWLINE); + vty_out (vty, "external link%s", VTYNL); } } @@ -8020,7 +8020,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (use_json) json_object_string_add(json_neigh, "nbrDesc", p->desc); else - vty_out (vty, " Description: %s%s", p->desc, VTY_NEWLINE); + vty_out (vty, " Description: %s%s", p->desc, VTYNL); } if (p->hostname) @@ -8037,9 +8037,9 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js { if (p->domainname && (p->domainname[0] != '\0')) vty_out(vty, "Hostname: %s.%s%s", p->hostname, p->domainname, - VTY_NEWLINE); + VTYNL); else - vty_out(vty, "Hostname: %s%s", p->hostname, VTY_NEWLINE); + vty_out(vty, "Hostname: %s%s", p->hostname, VTYNL); } } @@ -8068,7 +8068,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js else { vty_out (vty, " Member of peer-group %s for session parameters%s", - p->group->name, VTY_NEWLINE); + p->group->name, VTYNL); if (dn_flag[0]) { @@ -8080,7 +8080,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (range) { prefix2str(range, buf1, sizeof(buf1)); - vty_out (vty, " Belongs to the subnet range group: %s%s", buf1, VTY_NEWLINE); + vty_out (vty, " Belongs to the subnet range group: %s%s", buf1, VTYNL); } } } @@ -8161,18 +8161,18 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js { /* Administrative shutdown. */ if (CHECK_FLAG (p->flags, PEER_FLAG_SHUTDOWN)) - vty_out (vty, " Administratively shut down%s", VTY_NEWLINE); + vty_out (vty, " Administratively shut down%s", VTYNL); /* BGP Version. */ vty_out (vty, " BGP version 4"); vty_out (vty, ", remote router ID %s%s", inet_ntop (AF_INET, &p->remote_id, buf1, sizeof(buf1)), - VTY_NEWLINE); + VTYNL); /* Confederation */ if (CHECK_FLAG (bgp->config, BGP_CONFIG_CONFEDERATION) && bgp_confederation_peers_check (bgp, p->as)) - vty_out (vty, " Neighbor under common administration%s", VTY_NEWLINE); + vty_out (vty, " Neighbor under common administration%s", VTYNL); /* Status. */ vty_out (vty, " BGP state = %s", lookup_msg(bgp_status_msg, p->status, NULL)); @@ -8187,21 +8187,21 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js else if (CHECK_FLAG (p->sflags, PEER_STATUS_NSF_WAIT)) vty_out (vty, " (NSF passive)"); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); /* read timer */ vty_out (vty, " Last read %s", peer_uptime (p->readtime, timebuf, BGP_UPTIME_LEN, 0, NULL)); vty_out (vty, ", Last write %s%s", - peer_uptime (p->last_write, timebuf, BGP_UPTIME_LEN, 0, NULL), VTY_NEWLINE); + peer_uptime (p->last_write, timebuf, BGP_UPTIME_LEN, 0, NULL), VTYNL); /* Configured timer values. */ vty_out (vty, " Hold time is %d, keepalive interval is %d seconds%s", - p->v_holdtime, p->v_keepalive, VTY_NEWLINE); + p->v_holdtime, p->v_keepalive, VTYNL); if (CHECK_FLAG (p->config, PEER_CONFIG_TIMER)) { vty_out (vty, " Configured hold time is %d", p->holdtime); vty_out (vty, ", keepalive interval is %d seconds%s", - p->keepalive, VTY_NEWLINE); + p->keepalive, VTYNL); } } /* Capability. */ @@ -8433,7 +8433,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js } else { - vty_out (vty, " Neighbor capabilities:%s", VTY_NEWLINE); + vty_out (vty, " Neighbor capabilities:%s", VTYNL); /* AS4 */ if (CHECK_FLAG (p->cap, PEER_CAP_AS4_RCV) @@ -8445,14 +8445,14 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (CHECK_FLAG (p->cap, PEER_CAP_AS4_RCV)) vty_out (vty, " %sreceived", CHECK_FLAG (p->cap, PEER_CAP_AS4_ADV) ? "and " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* AddPath */ if (CHECK_FLAG (p->cap, PEER_CAP_ADDPATH_RCV) || CHECK_FLAG (p->cap, PEER_CAP_ADDPATH_ADV)) { - vty_out (vty, " AddPath:%s", VTY_NEWLINE); + vty_out (vty, " AddPath:%s", VTYNL); for (afi = AFI_IP ; afi < AFI_MAX ; afi++) for (safi = SAFI_UNICAST ; safi < SAFI_MAX ; safi++) @@ -8468,7 +8468,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ADDPATH_AF_TX_RCV)) vty_out (vty, "%sreceived", CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ADDPATH_AF_TX_ADV) ? " and " : "" ); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } if (CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ADDPATH_AF_RX_ADV) || @@ -8482,7 +8482,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ADDPATH_AF_RX_RCV)) vty_out (vty, "%sreceived", CHECK_FLAG (p->af_cap[afi][safi], PEER_CAP_ADDPATH_AF_RX_ADV) ? " and " : "" ); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } } @@ -8497,7 +8497,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (CHECK_FLAG (p->cap, PEER_CAP_DYNAMIC_RCV)) vty_out (vty, " %sreceived", CHECK_FLAG (p->cap, PEER_CAP_DYNAMIC_ADV) ? "and " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Extended nexthop */ @@ -8510,15 +8510,15 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (CHECK_FLAG (p->cap, PEER_CAP_ENHE_RCV)) vty_out (vty, " %sreceived", CHECK_FLAG (p->cap, PEER_CAP_ENHE_ADV) ? "and " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); if (CHECK_FLAG (p->cap, PEER_CAP_ENHE_RCV)) { - vty_out (vty, " Address families by peer:%s ", VTY_NEWLINE); + vty_out (vty, " Address families by peer:%s ", VTYNL); for (safi = SAFI_UNICAST ; safi < SAFI_MAX ; safi++) if (CHECK_FLAG (p->af_cap[AFI_IP][safi], PEER_CAP_ENHE_AF_RCV)) vty_out (vty, " %s%s", - afi_safi_print (AFI_IP, safi), VTY_NEWLINE); + afi_safi_print (AFI_IP, safi), VTYNL); } } @@ -8538,7 +8538,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js && CHECK_FLAG (p->cap, PEER_CAP_REFRESH_NEW_RCV)) ? "old & new" : CHECK_FLAG (p->cap, PEER_CAP_REFRESH_OLD_RCV) ? "old" : "new"); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Multiprotocol Extensions */ @@ -8551,7 +8551,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js vty_out (vty, " advertised"); if (p->afc_recv[afi][safi]) vty_out (vty, " %sreceived", p->afc_adv[afi][safi] ? "and " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Hostname capability */ @@ -8564,7 +8564,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (CHECK_FLAG (p->cap, PEER_CAP_HOSTNAME_RCV)) vty_out (vty, " %sreceived", CHECK_FLAG (p->cap, PEER_CAP_HOSTNAME_ADV) ? "and " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Gracefull Restart */ @@ -8577,15 +8577,15 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (CHECK_FLAG (p->cap, PEER_CAP_RESTART_RCV)) vty_out (vty, " %sreceived", CHECK_FLAG (p->cap, PEER_CAP_RESTART_ADV) ? "and " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); if (CHECK_FLAG (p->cap, PEER_CAP_RESTART_RCV)) { int restart_af_count = 0; vty_out (vty, " Remote Restart timer is %d seconds%s", - p->v_gr_restart, VTY_NEWLINE); - vty_out (vty, " Address families by peer:%s ", VTY_NEWLINE); + p->v_gr_restart, VTYNL); + vty_out (vty, " Address families by peer:%s ", VTYNL); for (afi = AFI_IP ; afi < AFI_MAX ; afi++) for (safi = SAFI_UNICAST ; safi < SAFI_MAX ; safi++) @@ -8599,7 +8599,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js } if (! restart_af_count) vty_out (vty, "none"); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } } @@ -8662,7 +8662,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js } else { - vty_out (vty, " Graceful restart informations:%s", VTY_NEWLINE); + vty_out (vty, " Graceful restart informations:%s", VTYNL); if (p->status == Established) { vty_out (vty, " End-of-RIB send: "); @@ -8678,7 +8678,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js } } } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); vty_out (vty, " End-of-RIB received: "); for (afi = AFI_IP ; afi < AFI_MAX ; afi++) { @@ -8692,16 +8692,16 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js } } } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } if (p->t_gr_restart) vty_out (vty, " The remaining time of restart timer is %ld%s", - thread_timer_remain_second (p->t_gr_restart), VTY_NEWLINE); + thread_timer_remain_second (p->t_gr_restart), VTYNL); if (p->t_gr_stale) vty_out (vty, " The remaining time of stalepath timer is %ld%s", - thread_timer_remain_second (p->t_gr_stale), VTY_NEWLINE); + thread_timer_remain_second (p->t_gr_stale), VTYNL); } } if (use_json) @@ -8730,20 +8730,20 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js else { /* Packet counts. */ - vty_out (vty, " Message statistics:%s", VTY_NEWLINE); - vty_out (vty, " Inq depth is 0%s", VTY_NEWLINE); - vty_out (vty, " Outq depth is %lu%s", (unsigned long) p->obuf->count, VTY_NEWLINE); - vty_out (vty, " Sent Rcvd%s", VTY_NEWLINE); - vty_out (vty, " Opens: %10d %10d%s", p->open_out, p->open_in, VTY_NEWLINE); - vty_out (vty, " Notifications: %10d %10d%s", p->notify_out, p->notify_in, VTY_NEWLINE); - vty_out (vty, " Updates: %10d %10d%s", p->update_out, p->update_in, VTY_NEWLINE); - vty_out (vty, " Keepalives: %10d %10d%s", p->keepalive_out, p->keepalive_in, VTY_NEWLINE); - vty_out (vty, " Route Refresh: %10d %10d%s", p->refresh_out, p->refresh_in, VTY_NEWLINE); - vty_out (vty, " Capability: %10d %10d%s", p->dynamic_cap_out, p->dynamic_cap_in, VTY_NEWLINE); + vty_out (vty, " Message statistics:%s", VTYNL); + vty_out (vty, " Inq depth is 0%s", VTYNL); + vty_out (vty, " Outq depth is %lu%s", (unsigned long) p->obuf->count, VTYNL); + vty_out (vty, " Sent Rcvd%s", VTYNL); + vty_out (vty, " Opens: %10d %10d%s", p->open_out, p->open_in, VTYNL); + vty_out (vty, " Notifications: %10d %10d%s", p->notify_out, p->notify_in, VTYNL); + vty_out (vty, " Updates: %10d %10d%s", p->update_out, p->update_in, VTYNL); + vty_out (vty, " Keepalives: %10d %10d%s", p->keepalive_out, p->keepalive_in, VTYNL); + vty_out (vty, " Route Refresh: %10d %10d%s", p->refresh_out, p->refresh_in, VTYNL); + vty_out (vty, " Capability: %10d %10d%s", p->dynamic_cap_out, p->dynamic_cap_in, VTYNL); vty_out (vty, " Total: %10d %10d%s", p->open_out + p->notify_out + p->update_out + p->keepalive_out + p->refresh_out + p->dynamic_cap_out, p->open_in + p->notify_in + p->update_in + p->keepalive_in + p->refresh_in + - p->dynamic_cap_in, VTY_NEWLINE); + p->dynamic_cap_in, VTYNL); } if (use_json) @@ -8764,7 +8764,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js { /* advertisement-interval */ vty_out (vty, " Minimum time between advertisement runs is %d seconds%s", - p->v_routeadv, VTY_NEWLINE); + p->v_routeadv, VTYNL); /* Update-source. */ if (p->update_if || p->update_source) @@ -8774,10 +8774,10 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js vty_out (vty, "%s", p->update_if); else if (p->update_source) vty_out (vty, "%s", sockunion2str (p->update_source, buf1, SU_ADDRSTRLEN)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Address Family Information */ @@ -8799,14 +8799,14 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js } else vty_out (vty, " Connections established %d; dropped %d%s", p->established, p->dropped, - VTY_NEWLINE); + VTYNL); if (! p->last_reset) { if (use_json) json_object_string_add(json_neigh, "lastReset", "never"); else - vty_out (vty, " Last reset never%s", VTY_NEWLINE); + vty_out (vty, " Last reset never%s", VTYNL); } else { @@ -8861,7 +8861,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js subcode_str = bgp_notify_subcode_str(p->notify.code, p->notify.subcode); vty_out (vty, "due to NOTIFICATION %s (%s%s)%s", p->last_reset == PEER_DOWN_NOTIFY_SEND ? "sent" : "received", - code_str, subcode_str, VTY_NEWLINE); + code_str, subcode_str, VTYNL); if (p->last_reset == PEER_DOWN_NOTIFY_RECEIVED && p->notify.code == BGP_NOTIFY_CEASE && (p->notify.subcode == BGP_NOTIFY_CEASE_ADMIN_SHUTDOWN @@ -8874,19 +8874,19 @@ 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, VTY_NEWLINE); + vty_out (vty, " Message: \"%s\"%s", msg_str, VTYNL); } } else { vty_out (vty, "due to %s%s", - peer_down_str[(int) p->last_reset], VTY_NEWLINE); + peer_down_str[(int) p->last_reset], VTYNL); } if (p->last_reset_cause_size) { msg = p->last_reset_cause; - vty_out(vty, " Message received that caused BGP to send a NOTIFICATION:%s ", VTY_NEWLINE); + vty_out(vty, " Message received that caused BGP to send a NOTIFICATION:%s ", VTYNL); for (i = 1; i <= p->last_reset_cause_size; i++) { vty_out(vty, "%02X", *msg++); @@ -8895,7 +8895,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js { if (i % 16 == 0) { - vty_out(vty, "%s ", VTY_NEWLINE); + vty_out(vty, "%s ", VTYNL); } else if (i % 4 == 0) { @@ -8903,7 +8903,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js } } } - vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, "%s", VTYNL); } } } @@ -8913,7 +8913,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js if (use_json) json_object_boolean_true_add(json_neigh, "prefixesConfigExceedMax"); else - vty_out (vty, " Peer had exceeded the max. no. of prefixes configured.%s", VTY_NEWLINE); + vty_out (vty, " Peer had exceeded the max. no. of prefixes configured.%s", VTYNL); if (p->t_pmax_restart) { @@ -8925,7 +8925,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js else vty_out (vty, " Reduce the no. of prefix from %s, will restart in %ld seconds%s", p->host, thread_timer_remain_second (p->t_pmax_restart), - VTY_NEWLINE); + VTYNL); } else { @@ -8933,7 +8933,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js json_object_boolean_true_add(json_neigh, "reducePrefixNumAndClearIpBgp"); else vty_out (vty, " Reduce the no. of prefix and clear ip bgp %s to restore peering%s", - p->host, VTY_NEWLINE); + p->host, VTYNL); } } @@ -8951,10 +8951,10 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js { if (p->gtsm_hops > 0) vty_out (vty, " External BGP neighbor may be up to %d hops away.%s", - p->gtsm_hops, VTY_NEWLINE); + p->gtsm_hops, VTYNL); else if (p->ttl > 1) vty_out (vty, " External BGP neighbor may be up to %d hops away.%s", - p->ttl, VTY_NEWLINE); + p->ttl, VTYNL); } } else @@ -8965,7 +8965,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js json_object_int_add(json_neigh, "internalBgpNbrMaxHopsAway", p->gtsm_hops); else vty_out (vty, " Internal BGP neighbor may be up to %d hops away.%s", - p->gtsm_hops, VTY_NEWLINE); + p->gtsm_hops, VTYNL); } } @@ -8981,7 +8981,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js vty_out (vty, "Local host: %s, Local port: %d%s", sockunion2str (p->su_local, buf1, SU_ADDRSTRLEN), ntohs (p->su_local->sin.sin_port), - VTY_NEWLINE); + VTYNL); } /* Remote address. */ @@ -8996,7 +8996,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js vty_out (vty, "Foreign host: %s, Foreign port: %d%s", sockunion2str (p->su_remote, buf1, SU_ADDRSTRLEN), ntohs (p->su_remote->sin.sin_port), - VTY_NEWLINE); + VTYNL); } /* Nexthop display. */ @@ -9019,16 +9019,16 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js { vty_out (vty, "Nexthop: %s%s", inet_ntop (AF_INET, &p->nexthop.v4, buf1, sizeof(buf1)), - VTY_NEWLINE); + VTYNL); vty_out (vty, "Nexthop global: %s%s", inet_ntop (AF_INET6, &p->nexthop.v6_global, buf1, sizeof(buf1)), - VTY_NEWLINE); + VTYNL); vty_out (vty, "Nexthop local: %s%s", inet_ntop (AF_INET6, &p->nexthop.v6_local, buf1, sizeof(buf1)), - VTY_NEWLINE); + VTYNL); vty_out (vty, "BGP connection: %s%s", p->shared_network ? "shared network" : "non shared network", - VTY_NEWLINE); + VTYNL); } } @@ -9062,27 +9062,27 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js else { vty_out (vty, "BGP Connect Retry Timer in Seconds: %d%s", - p->v_connect, VTY_NEWLINE); + p->v_connect, VTYNL); if (p->status == Established && p->rtt) vty_out (vty, "Estimated round trip time: %d ms%s", - p->rtt, VTY_NEWLINE); + p->rtt, VTYNL); if (p->t_start) vty_out (vty, "Next start timer due in %ld seconds%s", - thread_timer_remain_second (p->t_start), VTY_NEWLINE); + thread_timer_remain_second (p->t_start), VTYNL); if (p->t_connect) vty_out (vty, "Next connect timer due in %ld seconds%s", - thread_timer_remain_second (p->t_connect), VTY_NEWLINE); + thread_timer_remain_second (p->t_connect), VTYNL); if (p->t_routeadv) vty_out (vty, "MRAI (interval %u) timer expires in %ld seconds%s", p->v_routeadv, thread_timer_remain_second (p->t_routeadv), - VTY_NEWLINE); + VTYNL); if (p->password) - vty_out (vty, "Peer Authentication Enabled%s", VTY_NEWLINE); + vty_out (vty, "Peer Authentication Enabled%s", VTYNL); vty_out (vty, "Read thread: %s Write thread: %s%s", p->t_read ? "on" : "off", p->t_write ? "on" : "off", - VTY_NEWLINE); + VTYNL); } if (p->notify.code == BGP_NOTIFY_OPEN_ERR @@ -9090,7 +9090,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js bgp_capability_vty_out (vty, p, use_json, json_neigh); if (!use_json) - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); /* BFD information. */ bgp_bfd_show_info(vty, p, use_json, json_neigh); @@ -9149,17 +9149,17 @@ bgp_show_neighbor (struct vty *vty, struct bgp *bgp, enum show_type type, if (use_json) json_object_boolean_true_add(json, "bgpNoSuchNeighbor"); else - vty_out (vty, "%% No such neighbor%s", VTY_NEWLINE); + vty_out (vty, "%% No such neighbor%s", VTYNL); } if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else { - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return CMD_SUCCESS; @@ -9174,7 +9174,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json) int is_first = 1; if (use_json) - vty_out (vty, "{%s", VTY_NEWLINE); + vty_out (vty, "{%s", VTYNL); for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp)) { @@ -9185,7 +9185,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", - VTY_NEWLINE); + VTYNL); return; } @@ -9197,7 +9197,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json) ? "Default" : bgp->name); if (! is_first) - vty_out (vty, ",%s", VTY_NEWLINE); + vty_out (vty, ",%s", VTYNL); else is_first = 0; @@ -9207,16 +9207,16 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json) else { vty_out (vty, "%sInstance %s:%s", - VTY_NEWLINE, + VTYNL, (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name, - VTY_NEWLINE); + VTYNL); } bgp_show_neighbor (vty, bgp, show_all, NULL, NULL, use_json, json); } if (use_json) - vty_out (vty, "}%s", VTY_NEWLINE); + vty_out (vty, "}%s", VTYNL); } static int @@ -9244,11 +9244,11 @@ bgp_show_neighbor_vty (struct vty *vty, const char *name, { json = json_object_new_object(); json_object_boolean_true_add(json, "bgpNoSuchInstance"); - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%% No such BGP instance exist%s", VTY_NEWLINE); + vty_out (vty, "%% No such BGP instance exist%s", VTYNL); return CMD_WARNING; } @@ -9338,7 +9338,7 @@ DEFUN (show_ip_bgp_paths, BGP_SAFI_HELP_STR "Path information\n") { - vty_out (vty, "Address Refcnt Path%s", VTY_NEWLINE); + vty_out (vty, "Address Refcnt Path%s", VTYNL); aspath_print_all_vty (vty); return CMD_SUCCESS; } @@ -9352,7 +9352,7 @@ community_show_all_iterator (struct hash_backet *backet, struct vty *vty) com = (struct community *) backet->data; vty_out (vty, "[%p] (%ld) %s%s", (void *)backet, com->refcnt, - community_str (com), VTY_NEWLINE); + community_str (com), VTYNL); } /* Show BGP's community internal data. */ @@ -9364,7 +9364,7 @@ DEFUN (show_ip_bgp_community_info, BGP_STR "List all bgp community information\n") { - vty_out (vty, "Address Refcnt Community%s", VTY_NEWLINE); + vty_out (vty, "Address Refcnt Community%s", VTYNL); hash_iterate (community_hash (), (void (*) (struct hash_backet *, void *)) @@ -9381,7 +9381,7 @@ lcommunity_show_all_iterator (struct hash_backet *backet, struct vty *vty) lcom = (struct lcommunity *) backet->data; vty_out (vty, "[%p] (%ld) %s%s", (void *)backet, lcom->refcnt, - lcommunity_str (lcom), VTY_NEWLINE); + lcommunity_str (lcom), VTYNL); } /* Show BGP's community internal data. */ @@ -9393,7 +9393,7 @@ DEFUN (show_ip_bgp_lcommunity_info, BGP_STR "List all bgp large-community information\n") { - vty_out (vty, "Address Refcnt Large-community%s", VTY_NEWLINE); + vty_out (vty, "Address Refcnt Large-community%s", VTYNL); hash_iterate (lcommunity_hash (), (void (*) (struct hash_backet *, void *)) @@ -9425,9 +9425,9 @@ bgp_show_all_instances_updgrps_vty (struct vty *vty, afi_t afi, safi_t safi) for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp)) { vty_out (vty, "%sInstance %s:%s", - VTY_NEWLINE, + VTYNL, (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name, - VTY_NEWLINE); + VTYNL); update_group_show(bgp, afi, safi, vty, 0); } } @@ -9813,19 +9813,19 @@ bgp_show_one_peer_group (struct vty *vty, struct peer_group *group) if (conf->as_type == AS_SPECIFIED || conf->as_type == AS_EXTERNAL) { vty_out (vty, "%sBGP peer-group %s, remote AS %d%s", - VTY_NEWLINE, group->name, conf->as, VTY_NEWLINE); + VTYNL, group->name, conf->as, VTYNL); } else if (conf->as_type == AS_INTERNAL) { vty_out (vty, "%sBGP peer-group %s, remote AS %d%s", - VTY_NEWLINE, group->name, group->bgp->as, VTY_NEWLINE); + VTYNL, group->name, group->bgp->as, VTYNL); } else { vty_out (vty, "%sBGP peer-group %s%s", - VTY_NEWLINE, group->name, VTY_NEWLINE); + VTYNL, group->name, VTYNL); } if ((group->bgp->as == conf->as) || (conf->as_type == AS_INTERNAL)) - vty_out (vty, " Peer-group type is internal%s", VTY_NEWLINE); + vty_out (vty, " Peer-group type is internal%s", VTYNL); else - vty_out (vty, " Peer-group type is external%s", VTY_NEWLINE); + vty_out (vty, " Peer-group type is external%s", VTYNL); /* Display AFs configured. */ vty_out (vty, " Configured address-families:"); @@ -9839,9 +9839,9 @@ bgp_show_one_peer_group (struct vty *vty, struct peer_group *group) } } if (!af_cfgd) - vty_out (vty, " none%s", VTY_NEWLINE); + vty_out (vty, " none%s", VTYNL); else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); /* Display listen ranges (for dynamic neighbors), if any */ for (afi = AFI_IP; afi < AFI_MAX; afi++) @@ -9857,14 +9857,14 @@ bgp_show_one_peer_group (struct vty *vty, struct peer_group *group) { vty_out(vty, " %d %s listen range(s)%s", - lr_count, af_str, VTY_NEWLINE); + lr_count, af_str, VTYNL); for (ALL_LIST_ELEMENTS (group->listen_range[afi], node, nnode, range)) { prefix2str(range, buf, sizeof(buf)); - vty_out(vty, " %s%s", buf, VTY_NEWLINE); + vty_out(vty, " %s%s", buf, VTYNL); } } } @@ -9872,7 +9872,7 @@ bgp_show_one_peer_group (struct vty *vty, struct peer_group *group) /* Display group members and their status */ if (listcount(group->peer)) { - vty_out (vty, " Peer-group members:%s", VTY_NEWLINE); + vty_out (vty, " Peer-group members:%s", VTYNL); for (ALL_LIST_ELEMENTS (group->peer, node, nnode, peer)) { if (CHECK_FLAG (peer->flags, PEER_FLAG_SHUTDOWN)) @@ -9885,7 +9885,7 @@ bgp_show_one_peer_group (struct vty *vty, struct peer_group *group) dynamic = peer_dynamic_neighbor(peer); vty_out (vty, " %s %s %s %s", peer->host, dynamic ? "(dynamic)" : "", - peer_status, VTY_NEWLINE); + peer_status, VTYNL); } } @@ -9925,7 +9925,7 @@ bgp_show_peer_group (struct vty *vty, struct bgp *bgp, } if (type == show_peer_group && ! find) - vty_out (vty, "%% No such peer-group%s", VTY_NEWLINE); + vty_out (vty, "%% No such peer-group%s", VTYNL); return CMD_SUCCESS; } @@ -9944,7 +9944,7 @@ bgp_show_peer_group_vty (struct vty *vty, const char *name, if (! bgp) { - vty_out (vty, "%% No such BGP instance exist%s", VTY_NEWLINE); + vty_out (vty, "%% No such BGP instance exist%s", VTYNL); return CMD_WARNING; } @@ -9989,7 +9989,7 @@ DEFUN (bgp_redistribute_ipv4, type = proto_redistnum (AFI_IP, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } bgp_redist_add(bgp, AFI_IP, type, 0); @@ -10019,7 +10019,7 @@ DEFUN (bgp_redistribute_ipv4_rmap, type = proto_redistnum (AFI_IP, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } @@ -10054,7 +10054,7 @@ DEFUN (bgp_redistribute_ipv4_metric, type = proto_redistnum (AFI_IP, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } metric = strtoul(argv[idx_number]->arg, NULL, 10); @@ -10093,7 +10093,7 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric, type = proto_redistnum (AFI_IP, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } metric = strtoul(argv[idx_number]->arg, NULL, 10); @@ -10135,7 +10135,7 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap, type = proto_redistnum (AFI_IP, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } metric = strtoul(argv[idx_number]->arg, NULL, 10); @@ -10425,7 +10425,7 @@ DEFUN (no_bgp_redistribute_ipv4, type = proto_redistnum (AFI_IP, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } return bgp_redistribute_unset (bgp, AFI_IP, type, 0); @@ -10455,7 +10455,7 @@ DEFUN (bgp_redistribute_ipv6, type = proto_redistnum (AFI_IP6, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } @@ -10480,7 +10480,7 @@ DEFUN (bgp_redistribute_ipv6_rmap, type = proto_redistnum (AFI_IP6, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } @@ -10507,7 +10507,7 @@ DEFUN (bgp_redistribute_ipv6_metric, type = proto_redistnum (AFI_IP6, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } metric = strtoul(argv[idx_number]->arg, NULL, 10); @@ -10538,7 +10538,7 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric, type = proto_redistnum (AFI_IP6, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } metric = strtoul(argv[idx_number]->arg, NULL, 10); @@ -10570,7 +10570,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap, type = proto_redistnum (AFI_IP6, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } metric = strtoul(argv[idx_number]->arg, NULL, 10); @@ -10599,7 +10599,7 @@ DEFUN (no_bgp_redistribute_ipv6, type = proto_redistnum (AFI_IP6, argv[idx_protocol]->text); if (type < 0) { - vty_out (vty, "%% Invalid route type%s", VTY_NEWLINE); + vty_out (vty, "%% Invalid route type%s", VTYNL); return CMD_WARNING; } @@ -10642,7 +10642,7 @@ bgp_config_write_redistribute (struct vty *vty, struct bgp *bgp, afi_t afi, vty_out (vty, " metric %u", red->redist_metric); if (red->rmap.name) vty_out (vty, " route-map %s", red->rmap.name); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } } @@ -11814,16 +11814,16 @@ community_list_perror (struct vty *vty, int ret) switch (ret) { case COMMUNITY_LIST_ERR_CANT_FIND_LIST: - vty_out (vty, "%% Can't find community-list%s", VTY_NEWLINE); + vty_out (vty, "%% Can't find community-list%s", VTYNL); break; case COMMUNITY_LIST_ERR_MALFORMED_VAL: - vty_out (vty, "%% Malformed community-list value%s", VTY_NEWLINE); + vty_out (vty, "%% Malformed community-list value%s", VTYNL); break; case COMMUNITY_LIST_ERR_STANDARD_CONFLICT: - vty_out (vty, "%% Community name conflict, previously defined as standard community%s", VTY_NEWLINE); + vty_out (vty, "%% Community name conflict, previously defined as standard community%s", VTYNL); break; case COMMUNITY_LIST_ERR_EXPANDED_CONFLICT: - vty_out (vty, "%% Community name conflict, previously defined as expanded community%s", VTY_NEWLINE); + vty_out (vty, "%% Community name conflict, previously defined as expanded community%s", VTYNL); break; } } @@ -12003,22 +12003,22 @@ community_list_show (struct vty *vty, struct community_list *list) vty_out (vty, "Community %s list %s%s", entry->style == COMMUNITY_LIST_STANDARD ? "standard" : "(expanded) access", - list->name, VTY_NEWLINE); + list->name, VTYNL); else vty_out (vty, "Named Community %s list %s%s", entry->style == COMMUNITY_LIST_STANDARD ? "standard" : "expanded", - list->name, VTY_NEWLINE); + list->name, VTYNL); } if (entry->any) vty_out (vty, " %s%s", - community_direct_str (entry->direct), VTY_NEWLINE); + community_direct_str (entry->direct), VTYNL); else vty_out (vty, " %s %s%s", community_direct_str (entry->direct), entry->style == COMMUNITY_LIST_STANDARD ? community_str (entry->u.com) : entry->config, - VTY_NEWLINE); + VTYNL); } } @@ -12060,7 +12060,7 @@ DEFUN (show_ip_community_list_arg, list = community_list_lookup (bgp_clist, argv[idx_comm_list]->arg, COMMUNITY_LIST_MASTER); if (! list) { - vty_out (vty, "%% Can't find community-list%s", VTY_NEWLINE); + vty_out (vty, "%% Can't find community-list%s", VTYNL); return CMD_WARNING; } @@ -12092,7 +12092,7 @@ lcommunity_list_set_vty (struct vty *vty, int argc, struct cmd_token **argv, cl_name = argv[idx]->arg; if (reject_all_digit_name && all_digit (cl_name)) { - vty_out (vty, "%% Community name cannot have all digits%s", VTY_NEWLINE); + vty_out (vty, "%% Community name cannot have all digits%s", VTYNL); return CMD_WARNING; } @@ -12349,22 +12349,22 @@ lcommunity_list_show (struct vty *vty, struct community_list *list) vty_out (vty, "Large community %s list %s%s", entry->style == EXTCOMMUNITY_LIST_STANDARD ? "standard" : "(expanded) access", - list->name, VTY_NEWLINE); + list->name, VTYNL); else vty_out (vty, "Named large community %s list %s%s", entry->style == EXTCOMMUNITY_LIST_STANDARD ? "standard" : "expanded", - list->name, VTY_NEWLINE); + list->name, VTYNL); } if (entry->any) vty_out (vty, " %s%s", - community_direct_str (entry->direct), VTY_NEWLINE); + community_direct_str (entry->direct), VTYNL); else vty_out (vty, " %s %s%s", community_direct_str (entry->direct), entry->style == EXTCOMMUNITY_LIST_STANDARD ? entry->u.ecom->str : entry->config, - VTY_NEWLINE); + VTYNL); } } @@ -12405,7 +12405,7 @@ DEFUN (show_ip_lcommunity_list_arg, list = community_list_lookup (bgp_clist, argv[3]->arg, LARGE_COMMUNITY_LIST_MASTER); if (! list) { - vty_out (vty, "%% Can't find extcommunity-list%s", VTY_NEWLINE); + vty_out (vty, "%% Can't find extcommunity-list%s", VTYNL); return CMD_WARNING; } @@ -12585,22 +12585,22 @@ extcommunity_list_show (struct vty *vty, struct community_list *list) vty_out (vty, "Extended community %s list %s%s", entry->style == EXTCOMMUNITY_LIST_STANDARD ? "standard" : "(expanded) access", - list->name, VTY_NEWLINE); + list->name, VTYNL); else vty_out (vty, "Named extended community %s list %s%s", entry->style == EXTCOMMUNITY_LIST_STANDARD ? "standard" : "expanded", - list->name, VTY_NEWLINE); + list->name, VTYNL); } if (entry->any) vty_out (vty, " %s%s", - community_direct_str (entry->direct), VTY_NEWLINE); + community_direct_str (entry->direct), VTYNL); else vty_out (vty, " %s %s%s", community_direct_str (entry->direct), entry->style == EXTCOMMUNITY_LIST_STANDARD ? entry->u.ecom->str : entry->config, - VTY_NEWLINE); + VTYNL); } } @@ -12642,7 +12642,7 @@ DEFUN (show_ip_extcommunity_list_arg, list = community_list_lookup (bgp_clist, argv[idx_comm_list]->arg, EXTCOMMUNITY_LIST_MASTER); if (! list) { - vty_out (vty, "%% Can't find extcommunity-list%s", VTY_NEWLINE); + vty_out (vty, "%% Can't find extcommunity-list%s", VTYNL); return CMD_WARNING; } @@ -12687,7 +12687,7 @@ community_list_config_write (struct vty *vty) vty_out (vty, "ip community-list %s %s %s%s", list->name, community_direct_str (entry->direct), community_list_config_str (entry), - VTY_NEWLINE); + VTYNL); write++; } for (list = cm->str.head; list; list = list->next) @@ -12698,7 +12698,7 @@ community_list_config_write (struct vty *vty) ? "standard" : "expanded", list->name, community_direct_str (entry->direct), community_list_config_str (entry), - VTY_NEWLINE); + VTYNL); write++; } @@ -12710,7 +12710,7 @@ community_list_config_write (struct vty *vty) { vty_out (vty, "ip extcommunity-list %s %s %s%s", list->name, community_direct_str (entry->direct), - community_list_config_str (entry), VTY_NEWLINE); + community_list_config_str (entry), VTYNL); write++; } for (list = cm->str.head; list; list = list->next) @@ -12720,7 +12720,7 @@ community_list_config_write (struct vty *vty) entry->style == EXTCOMMUNITY_LIST_STANDARD ? "standard" : "expanded", list->name, community_direct_str (entry->direct), - community_list_config_str (entry), VTY_NEWLINE); + community_list_config_str (entry), VTYNL); write++; } @@ -12733,7 +12733,7 @@ community_list_config_write (struct vty *vty) { vty_out (vty, "ip large-community-list %s %s %s%s", list->name, community_direct_str (entry->direct), - community_list_config_str (entry), VTY_NEWLINE); + community_list_config_str (entry), VTYNL); write++; } for (list = cm->str.head; list; list = list->next) @@ -12743,7 +12743,7 @@ community_list_config_write (struct vty *vty) entry->style == LARGE_COMMUNITY_LIST_STANDARD ? "standard" : "expanded", list->name, community_direct_str (entry->direct), - community_list_config_str (entry), VTY_NEWLINE); + community_list_config_str (entry), VTYNL); write++; } diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 9336c1860..9c3611645 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6461,14 +6461,14 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s distribute-list %s in%s", - addr, filter->dlist[in].name, VTY_NEWLINE); + addr, filter->dlist[in].name, VTYNL); } 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, VTY_NEWLINE); + addr, filter->dlist[out].name, VTYNL); } /* prefix-list. */ @@ -6478,14 +6478,14 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s prefix-list %s in%s", - addr, filter->plist[in].name, VTY_NEWLINE); + addr, filter->plist[in].name, VTYNL); } 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, VTY_NEWLINE); + addr, filter->plist[out].name, VTYNL); } /* route-map. */ @@ -6495,7 +6495,7 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s route-map %s in%s", - addr, filter->map[RMAP_IN].name, VTY_NEWLINE); + addr, filter->map[RMAP_IN].name, VTYNL); } if (filter->map[RMAP_OUT].name) @@ -6504,7 +6504,7 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s route-map %s out%s", - addr, filter->map[RMAP_OUT].name, VTY_NEWLINE); + addr, filter->map[RMAP_OUT].name, VTYNL); } /* unsuppress-map */ @@ -6512,7 +6512,7 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s unsuppress-map %s%s", - addr, filter->usmap.name, VTY_NEWLINE); + addr, filter->usmap.name, VTYNL); } /* filter-list. */ @@ -6522,14 +6522,14 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s filter-list %s in%s", - addr, filter->aslist[in].name, VTY_NEWLINE); + addr, filter->aslist[in].name, VTYNL); } 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, VTY_NEWLINE); + addr, filter->aslist[out].name, VTYNL); } } @@ -6901,7 +6901,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s activate%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* If the peer-group is not active but peer is, print an 'activate' */ @@ -6909,7 +6909,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s activate%s", - addr, VTY_NEWLINE); + addr, VTYNL); } } else @@ -6922,13 +6922,13 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out(vty, afi, safi, write, " neighbor %s activate%s", - addr, VTY_NEWLINE); + addr, VTYNL); } } else afi_header_vty_out (vty, afi, safi, write, " neighbor %s activate%s", - addr, VTY_NEWLINE); + addr, VTYNL); } else { @@ -6938,7 +6938,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s activate%s", - addr, VTY_NEWLINE); + addr, VTYNL); } } } @@ -6949,14 +6949,14 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s addpath-tx-all-paths%s", - addr, VTY_NEWLINE); + addr, VTYNL); } 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, VTY_NEWLINE); + addr, VTYNL); } /* ORF capability. */ @@ -6982,7 +6982,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s route-reflector-client%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* next-hop-self force */ @@ -6990,7 +6990,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s next-hop-self force%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* next-hop-self */ @@ -6998,7 +6998,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s next-hop-self%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* remove-private-AS */ @@ -7006,28 +7006,28 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s remove-private-AS all replace-AS%s", - addr, VTY_NEWLINE); + addr, VTYNL); } 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, VTY_NEWLINE); + addr, VTYNL); } 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, VTY_NEWLINE); + addr, VTYNL); } 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, VTY_NEWLINE); + addr, VTYNL); } /* as-override */ @@ -7035,7 +7035,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s as-override%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* send-community print. */ @@ -7047,25 +7047,25 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s send-community all%s", - addr, VTY_NEWLINE); + addr, VTYNL); } 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, VTY_NEWLINE); + addr, VTYNL); } 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, VTY_NEWLINE); + addr, VTYNL); } 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, VTY_NEWLINE); + addr, VTYNL); } } else @@ -7079,7 +7079,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s send-community all%s", - addr, VTY_NEWLINE); + addr, VTYNL); } else { @@ -7088,7 +7088,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s send-community large%s", - addr, VTY_NEWLINE); + addr, VTYNL); } if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY) && @@ -7096,7 +7096,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s send-community extended%s", - addr, VTY_NEWLINE); + addr, VTYNL); } if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) && @@ -7104,7 +7104,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s send-community%s", - addr, VTY_NEWLINE); + addr, VTYNL); } } } @@ -7129,7 +7129,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s soft-reconfiguration inbound%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* maximum-prefix. */ @@ -7157,7 +7157,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s route-server-client%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* Nexthop-local unchanged. */ @@ -7165,7 +7165,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s nexthop-local unchanged%s", - addr, VTY_NEWLINE); + addr, VTYNL); } /* allowas-in <1-10> */ @@ -7179,13 +7179,13 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s allowas-in%s", - addr, VTY_NEWLINE); + addr, VTYNL); } else { afi_header_vty_out (vty, afi, safi, write, " neighbor %s allowas-in %d%s", - addr, peer->allowas_in[afi][safi], VTY_NEWLINE); + addr, peer->allowas_in[afi][safi], VTYNL); } } } @@ -7198,7 +7198,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s allowas-in origin%s", - addr, VTY_NEWLINE); + addr, VTYNL); } } @@ -7212,7 +7212,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s weight %lu%s", - addr, peer->weight[afi][safi], VTY_NEWLINE); + addr, peer->weight[afi][safi], VTYNL); } } @@ -7230,7 +7230,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { afi_header_vty_out (vty, afi, safi, write, " neighbor %s attribute-unchanged%s", - addr, VTY_NEWLINE); + addr, VTYNL); } else { @@ -7241,7 +7241,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, 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" : "", VTY_NEWLINE); + " med" : "", VTYNL); } } } @@ -7254,7 +7254,7 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi, if (*write) return; - vty_outln (vty, " !%s address-family ", VTY_NEWLINE); + vty_outln (vty, " !%s address-family ", VTYNL); if (afi == AFI_IP) { diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 63ef671e0..de153def4 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -2433,7 +2433,7 @@ DEFUN_NOSH (vnc_nve_group, if (!rfg) { /* Error out of memory */ - vty_out (vty, "Can't allocate memory for NVE group%s", VTY_NEWLINE); + vty_out (vty, "Can't allocate memory for NVE group%s", VTYNL); return CMD_WARNING; } @@ -3258,7 +3258,7 @@ DEFUN_NOSH (vnc_vrf_policy, if (!bgp) { - vty_out (vty, "No BGP process is configured%s", VTY_NEWLINE); + vty_out (vty, "No BGP process is configured%s", VTYNL); return CMD_WARNING; } @@ -3271,7 +3271,7 @@ DEFUN_NOSH (vnc_vrf_policy, if (!rfg) { /* Error out of memory */ - vty_out (vty, "Can't allocate memory for NVE group%s", VTY_NEWLINE); + vty_out (vty, "Can't allocate memory for NVE group%s", VTYNL); return CMD_WARNING; } } @@ -3401,7 +3401,7 @@ DEFUN (vnc_vrf_policy_nexthop, if (!str2prefix (argv[1]->arg, &p) && p.family) { - //vty_out (vty, "Nexthop set to self%s", VTY_NEWLINE); + //vty_out (vty, "Nexthop set to self%s", VTYNL); SET_FLAG (rfg->flags, RFAPI_RFG_VPN_NH_SELF); memset(&rfg->vn_prefix, 0, sizeof(struct prefix)); } @@ -3745,7 +3745,7 @@ DEFUN_NOSH (vnc_l2_group, if (!bgp) { - vty_out (vty, "No BGP process is configured%s", VTY_NEWLINE); + vty_out (vty, "No BGP process is configured%s", VTYNL); return CMD_WARNING; } @@ -3758,7 +3758,7 @@ DEFUN_NOSH (vnc_l2_group, if (!rfg) { /* Error out of memory */ - vty_out (vty, "Can't allocate memory for L2 group%s", VTY_NEWLINE); + vty_out (vty, "Can't allocate memory for L2 group%s", VTYNL); return CMD_WARNING; } rfg->name = strdup (argv[1]->arg); @@ -4300,7 +4300,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp) inet_ntop(rfg->vn_prefix.family, &rfg->vn_prefix.u.prefix, buf, sizeof(buf)); if (!buf[0] || buf[BUFSIZ - 1]) { - //vty_out (vty, "nexthop self%s", VTY_NEWLINE); + //vty_out (vty, "nexthop self%s", VTYNL); } else { diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index 87d62f713..510fbc27a 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -3144,7 +3144,7 @@ test_nexthops_callback ( fp (out, "Nexthops Callback, Target=("); //rfapiPrintRfapiIpAddr(stream, target); - fp (out, ")%s", VTY_NEWLINE); + fp (out, ")%s", VTYNL); rfapiPrintNhl (stream, next_hops); @@ -3838,7 +3838,7 @@ DEFUN (debug_rfapi_show_import, if (first_l2) { vty_outln (vty, "%sLNI-based Ethernet Tables:", - VTY_NEWLINE); + VTYNL); first_l2 = 0; } snprintf (buf, BUFSIZ, "L2VPN LNI=%u", lni); diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c index 04c69d58a..b2e6503ab 100644 --- a/bgpd/rfapi/rfapi_rib.c +++ b/bgpd/rfapi/rfapi_rib.c @@ -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", VTY_NEWLINE); + fp (out, "%s", VTYNL); 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", VTY_NEWLINE); + fp (out, "%s", VTYNL); 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", VTY_NEWLINE); + fp (out, "%s", VTYNL); } @@ -2388,7 +2388,7 @@ print_rib_sl ( fp (out, " %c %-20s %-15s %-15s %-4u %-8s %-8s%s%s", deleted ? 'r' : ' ', *printedprefix ? "" : str_pfx, - str_vn, str_un, ri->cost, str_lifetime, str_age, str_rd, VTY_NEWLINE); + str_vn, str_un, ri->cost, str_lifetime, str_age, str_rd, VTYNL); if (!*printedprefix) *printedprefix = 1; @@ -2501,10 +2501,10 @@ rfapiRibShowResponses ( ++printedheader; fp (out, "%s[%s]%s", - VTY_NEWLINE, - show_removed ? "Removed" : "Active", VTY_NEWLINE); + VTYNL, + show_removed ? "Removed" : "Active", VTYNL); fp (out, "%-15s %-15s%s", "Querying VN", "Querying UN", - VTY_NEWLINE); + VTYNL); fp (out, " %-20s %-15s %-15s %4s %-8s %-8s%s", "Prefix", "Registered VN", "Registered UN", "Cost", "Lifetime", @@ -2513,7 +2513,7 @@ rfapiRibShowResponses ( #else "Remaining", #endif - VTY_NEWLINE); + VTYNL); } if (!printednve) { @@ -2526,11 +2526,11 @@ rfapiRibShowResponses ( fp (out, "%-15s %-15s%s", rfapiRfapiIpAddr2Str (&rfd->vn_addr, str_vn, BUFSIZ), rfapiRfapiIpAddr2Str (&rfd->un_addr, str_un, BUFSIZ), - VTY_NEWLINE); + VTYNL); } prefix2str (&rn->p, str_pfx, BUFSIZ); - //fp(out, " %s%s", buf, VTY_NEWLINE); /* prefix */ + //fp(out, " %s%s", buf, VTYNL); /* prefix */ routes_displayed++; nhs_displayed += print_rib_sl (fp, vty, out, sl, @@ -2542,12 +2542,12 @@ rfapiRibShowResponses ( if (routes_total) { - fp (out, "%s", VTY_NEWLINE); + fp (out, "%s", VTYNL); 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", VTY_NEWLINE); + fp (out, "%s", VTYNL); } } diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index 2a0921bcf..8a5c1dff9 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -385,14 +385,14 @@ rfapiStdioPrintf (void *stream, const char *format, ...) /* Fake out for debug logging */ static struct vty vty_dummy_zlog; static struct vty vty_dummy_stdio; -#define HVTY_NEWLINE ((vty == &vty_dummy_zlog)? "": VTY_NEWLINE) +#define HVTYNL ((vty == &vty_dummy_zlog)? "": VTYNL) static const char * str_vty_newline (struct vty *vty) { if (vty == &vty_dummy_zlog) return ""; - return VTY_NEWLINE; + return VTYNL; } int @@ -406,7 +406,7 @@ rfapiStream2Vty ( if (!stream) { - vty_dummy_zlog.type = VTY_SHELL; /* for VTY_NEWLINE */ + vty_dummy_zlog.type = VTY_SHELL; /* for VTYNL */ *vty = &vty_dummy_zlog; *fp = (int (*)(void *, const char *,...)) rfapiDebugPrintf; *outstream = NULL; @@ -418,7 +418,7 @@ rfapiStream2Vty ( ((uintptr_t) stream == (uintptr_t) 2)) { - vty_dummy_stdio.type = VTY_SHELL; /* for VTY_NEWLINE */ + vty_dummy_stdio.type = VTY_SHELL; /* for VTYNL */ *vty = &vty_dummy_stdio; *fp = (int (*)(void *, const char *,...)) rfapiStdioPrintf; *outstream = stream; @@ -428,7 +428,7 @@ rfapiStream2Vty ( if (stream) { - *vty = stream; /* VTY_NEWLINE requires vty to be legit */ + *vty = stream; /* VTYNL requires vty to be legit */ *fp = (int (*)(void *, const char *,...)) vty_out; *outstream = stream; *vty_newline = str_vty_newline (*vty); @@ -488,7 +488,7 @@ rfapi_vty_out_vncinfo ( vty_out (vty, " type=%s, subtype=%d", zebra_route_string (bi->type), bi->sub_type); - vty_out (vty, "%s", HVTY_NEWLINE); + vty_out (vty, "%s", HVTYNL); } void @@ -505,27 +505,27 @@ rfapiPrintAttrPtrs (void *stream, struct attr *attr) if (rfapiStream2Vty (stream, &fp, &vty, &out, &vty_newline) == 0) return; - fp (out, "Attr[%p]:%s", attr, HVTY_NEWLINE); + fp (out, "Attr[%p]:%s", attr, HVTYNL); if (!attr) return; /* IPv4 Nexthop */ inet_ntop (AF_INET, &attr->nexthop, buf, BUFSIZ); - fp (out, " nexthop=%s%s", buf, HVTY_NEWLINE); + fp (out, " nexthop=%s%s", buf, HVTYNL); fp (out, " aspath=%p, refcnt=%d%s", attr->aspath, - (attr->aspath ? attr->aspath->refcnt : 0), HVTY_NEWLINE); + (attr->aspath ? attr->aspath->refcnt : 0), HVTYNL); fp (out, " community=%p, refcnt=%d%s", attr->community, - (attr->community ? attr->community->refcnt : 0), HVTY_NEWLINE); + (attr->community ? attr->community->refcnt : 0), HVTYNL); if ((ae = attr->extra)) { fp (out, " ecommunity=%p, refcnt=%d%s", ae->ecommunity, - (ae->ecommunity ? ae->ecommunity->refcnt : 0), HVTY_NEWLINE); + (ae->ecommunity ? ae->ecommunity->refcnt : 0), HVTYNL); fp (out, " cluster=%p, refcnt=%d%s", ae->cluster, - (ae->cluster ? ae->cluster->refcnt : 0), HVTY_NEWLINE); + (ae->cluster ? ae->cluster->refcnt : 0), HVTYNL); fp (out, " transit=%p, refcnt=%d%s", ae->transit, - (ae->transit ? ae->transit->refcnt : 0), HVTY_NEWLINE); + (ae->transit ? ae->transit->refcnt : 0), HVTYNL); } } @@ -726,7 +726,7 @@ rfapiPrintBi (void *stream, struct bgp_info *bi) snprintf (p, REMAIN, " %c:%u", zebra_route_char (bi->type), bi->sub_type); INCP; - fp (out, "%s%s", line, HVTY_NEWLINE); + fp (out, "%s%s", line, HVTYNL); if (has_macaddr) { @@ -735,7 +735,7 @@ rfapiPrintBi (void *stream, struct bgp_info *bi) macaddr.octet[0], macaddr.octet[1], macaddr.octet[2], - macaddr.octet[3], macaddr.octet[4], macaddr.octet[5], HVTY_NEWLINE); + macaddr.octet[3], macaddr.octet[4], macaddr.octet[5], HVTYNL); } if (!rfapiGetL2o (bi->attr, &l2o_buf)) @@ -745,7 +745,7 @@ rfapiPrintBi (void *stream, struct bgp_info *bi) l2o_buf.macaddr.octet[0], l2o_buf.macaddr.octet[1], l2o_buf.macaddr.octet[2], l2o_buf.macaddr.octet[3], l2o_buf.macaddr.octet[4], l2o_buf.macaddr.octet[5], l2o_buf.label, - l2o_buf.logical_net_id, l2o_buf.local_nve_id, HVTY_NEWLINE); + l2o_buf.logical_net_id, l2o_buf.local_nve_id, HVTYNL); } if (bi->extra && bi->extra->vnc.import.aux_prefix.family) { @@ -758,7 +758,7 @@ rfapiPrintBi (void *stream, struct bgp_info *bi) buf[BUFSIZ - 1] = 0; if (sp) { - fp (out, " IP: %s%s", sp, HVTY_NEWLINE); + fp (out, " IP: %s%s", sp, HVTYNL); } } { @@ -807,7 +807,7 @@ rfapiDebugPrintMonitorVpn (void *stream, struct rfapi_monitor_vpn *m) return; rfapiMonitorVpn2Str (m, buf, BUFSIZ); - fp (out, " Mon %s%s", buf, HVTY_NEWLINE); + fp (out, " Mon %s%s", buf, HVTYNL); } static void @@ -822,7 +822,7 @@ rfapiDebugPrintMonitorEncap (void *stream, struct rfapi_monitor_encap *m) return; fp (out, " Mon m=%p, next=%p, node=%p, bi=%p%s", - m, m->next, m->node, m->bi, HVTY_NEWLINE); + m, m->next, m->node, m->bi, HVTYNL); } void @@ -841,7 +841,7 @@ rfapiShowItNode (void *stream, struct route_node *rn) fp (out, "%s/%d @%p #%d%s", rfapi_ntop (rn->p.family, &rn->p.u.prefix, buf, BUFSIZ), - rn->p.prefixlen, rn, rn->lock, HVTY_NEWLINE); + rn->p.prefixlen, rn, rn->lock, HVTYNL); for (bi = rn->info; bi; bi = bi->next) { @@ -869,7 +869,7 @@ rfapiShowImportTable ( if (rfapiStream2Vty (stream, &fp, &vty, &out, &vty_newline) == 0) return; - fp (out, "Import Table [%s]%s", label, HVTY_NEWLINE); + fp (out, "Import Table [%s]%s", label, HVTYNL); for (rn = route_top (rt); rn; rn = route_next (rn)) { @@ -885,7 +885,7 @@ rfapiShowImportTable ( } fp (out, "%s/%d @%p #%d%s", buf, rn->p.prefixlen, rn, rn->lock - 1, /* account for loop iterator locking */ - HVTY_NEWLINE); + HVTYNL); for (bi = rn->info; bi; bi = bi->next) { @@ -995,10 +995,10 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match) if (!printedheader) { ++printedheader; - fp (out, "%s", VTY_NEWLINE); + fp (out, "%s", VTYNL); fp (out, "%-15s %-15s %-15s %-10s%s", "VN Address", "UN Address", - "Target", "Remaining", VTY_NEWLINE); + "Target", "Remaining", VTYNL); } if (!printedquerier) @@ -1024,7 +1024,7 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match) } fp (out, " %-15s %-10s%s", inet_ntop (m->p.family, &m->p.u.prefix, buf_pfx, BUFSIZ), - buf_remain, VTY_NEWLINE); + buf_remain, VTYNL); } } @@ -1070,10 +1070,10 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match) if (!printedheader) { ++printedheader; - fp (out, "%s", VTY_NEWLINE); + fp (out, "%s", VTYNL); fp (out, "%-15s %-15s %-17s %10s %-10s%s", "VN Address", "UN Address", - "Target", "LNI", "Remaining", VTY_NEWLINE); + "Target", "LNI", "Remaining", VTYNL); } if (!printedquerier) @@ -1100,16 +1100,16 @@ rfapiShowVncQueries (void *stream, struct prefix *pfx_match) fp (out, " %-17s %10d %-10s%s", rfapi_ntop (pfx_mac.family, &pfx_mac.u.prefix, buf_pfx, BUFSIZ), mon_eth->logical_net_id, buf_remain, - VTY_NEWLINE); + VTYNL); } } } if (queries_total) { - fp (out, "%s", VTY_NEWLINE); + fp (out, "%s", VTYNL); fp (out, "Displayed %d out of %d total queries%s", - queries_displayed, queries_total, VTY_NEWLINE); + queries_displayed, queries_total, VTYNL); } return CMD_SUCCESS; } @@ -1277,7 +1277,7 @@ rfapiPrintRemoteRegBi ( } fp (out, "%-10s ", buf_age); } - fp (out, "%s", HVTY_NEWLINE); + fp (out, "%s", HVTYNL); if (rn->p.family == AF_ETHERNET) { @@ -1314,7 +1314,7 @@ rfapiPrintRemoteRegBi ( } } if (nlines > 1) - fp (out, "%s", HVTY_NEWLINE); + fp (out, "%s", HVTYNL); return 1; } @@ -1438,12 +1438,12 @@ rfapiShowRemoteRegistrationsIt ( if (pLni) { fp (out, "%s[%s] L2VPN Network 0x%x (%u) RT={%s}", - HVTY_NEWLINE, type, *pLni, (*pLni & 0xfff), s); + HVTYNL, type, *pLni, (*pLni & 0xfff), s); } else { fp (out, "%s[%s] Prefix RT={%s}", - HVTY_NEWLINE, type, s); + HVTYNL, type, s); } XFREE (MTYPE_ECOMMUNITY_STR, s); @@ -1454,7 +1454,7 @@ rfapiShowRemoteRegistrationsIt ( "VRF" : "NVE group"), it->rfg->name); } - fp (out, "%s", HVTY_NEWLINE); + fp (out, "%s", HVTYNL); if (show_expiring) { #if RFAPI_REGISTRATIONS_REPORT_AGE @@ -1473,7 +1473,7 @@ rfapiShowRemoteRegistrationsIt ( fp (out, "%-20s %-15s %-15s %4s %-10s %-10s%s", (pLni ? "L2 Address/IP" : "Prefix"), "VN Address", "UN Address", "Cost", - "Lifetime", agetype, HVTY_NEWLINE); + "Lifetime", agetype, HVTYNL); } printed += rfapiPrintRemoteRegBi (bgp, stream, rn, bi); } @@ -1509,9 +1509,9 @@ rfapiShowRemoteRegistrationsIt ( } fp (out, "Displayed %d out of %d %s%s", - printed, total, type, HVTY_NEWLINE); + printed, total, type, HVTYNL); #if DEBUG_SHOW_EXTRA - fp(out, "IT table above: it=%p%s", it, HVTY_NEWLINE); + fp(out, "IT table above: it=%p%s", it, HVTYNL); #endif } return printed; @@ -1751,7 +1751,7 @@ rfapiPrintAdvertisedInfo ( } bn = bgp_afi_node_get (bgp->rib[afi][safi], afi, safi, p, prd); - vty_out (vty, " bn=%p%s", bn, HVTY_NEWLINE); + vty_out (vty, " bn=%p%s", bn, HVTYNL); for (bi = bn->info; bi; bi = bi->next) { @@ -1768,7 +1768,7 @@ rfapiPrintAdvertisedInfo ( if (!printed) { - vty_out (vty, " --?--%s", HVTY_NEWLINE); + vty_out (vty, " --?--%s", HVTYNL); return; } @@ -1798,9 +1798,9 @@ rfapiPrintDescriptor (struct vty *vty, struct rfapi_descriptor *rfd) rfapiPrintRd (vty, &rfd->rd); vty_out (vty, " %d", rfd->response_lifetime); vty_out (vty, " %s", (rfd->rfg ? rfd->rfg->name : "<orphaned>")); - vty_out (vty, "%s", HVTY_NEWLINE); + vty_out (vty, "%s", HVTYNL); - vty_out (vty, " Peer %p #%d%s", rfd->peer, rfd->peer->lock, HVTY_NEWLINE); + vty_out (vty, " Peer %p #%d%s", rfd->peer, rfd->peer->lock, HVTYNL); /* export RT list */ if (rfd->rt_export_list) @@ -1808,12 +1808,12 @@ rfapiPrintDescriptor (struct vty *vty, struct rfapi_descriptor *rfd) s = ecommunity_ecom2str (rfd->rt_export_list, ECOMMUNITY_FORMAT_ROUTE_MAP, 0); - vty_out (vty, " Export %s%s", s, HVTY_NEWLINE); + vty_out (vty, " Export %s%s", s, HVTYNL); XFREE (MTYPE_ECOMMUNITY_STR, s); } else { - vty_out (vty, " Export (nil)%s", HVTY_NEWLINE); + vty_out (vty, " Export (nil)%s", HVTYNL); } /* import RT list */ @@ -1821,12 +1821,12 @@ rfapiPrintDescriptor (struct vty *vty, struct rfapi_descriptor *rfd) { s = ecommunity_ecom2str (rfd->import_table->rt_import_list, ECOMMUNITY_FORMAT_ROUTE_MAP, 0); - vty_out (vty, " Import %s%s", s, HVTY_NEWLINE); + vty_out (vty, " Import %s%s", s, HVTYNL); XFREE (MTYPE_ECOMMUNITY_STR, s); } else { - vty_out (vty, " Import (nil)%s", HVTY_NEWLINE); + vty_out (vty, " Import (nil)%s", HVTYNL); } for (afi = AFI_IP; afi < AFI_MAX; ++afi) @@ -1853,7 +1853,7 @@ rfapiPrintDescriptor (struct vty *vty, struct rfapi_descriptor *rfd) prefix2str (&adb->u.s.prefix_ip, buf, BUFSIZ); buf[BUFSIZ - 1] = 0; /* guarantee NUL-terminated */ - vty_out (vty, " Adv Pfx: %s%s", buf, HVTY_NEWLINE); + vty_out (vty, " Adv Pfx: %s%s", buf, HVTYNL); rfapiPrintAdvertisedInfo (vty, rfd, SAFI_MPLS_VPN, &adb->u.s.prefix_ip); } } @@ -1868,13 +1868,13 @@ rfapiPrintDescriptor (struct vty *vty, struct rfapi_descriptor *rfd) prefix2str (&adb->u.s.prefix_eth, buf, BUFSIZ); buf[BUFSIZ - 1] = 0; /* guarantee NUL-terminated */ - vty_out (vty, " Adv Pfx: %s%s", buf, HVTY_NEWLINE); + vty_out (vty, " Adv Pfx: %s%s", buf, HVTYNL); /* TBD update the following function to print ethernet info */ /* Also need to pass/use rd */ rfapiPrintAdvertisedInfo (vty, rfd, SAFI_MPLS_VPN, &adb->u.s.prefix_ip); } - vty_out (vty, "%s", HVTY_NEWLINE); + vty_out (vty, "%s", HVTYNL); } /* @@ -1925,7 +1925,7 @@ rfapiPrintMatchingDescriptors (struct vty *vty, vty_out (vty, "%s %s %s %s %s %s %s %s%s", "descriptor", "un-addr", "vn-addr", "callback", "cookie", - "RD", "lifetime", "group", HVTY_NEWLINE); + "RD", "lifetime", "group", HVTYNL); } rfapiPrintDescriptor (vty, rfd); printed = 1; @@ -1941,7 +1941,7 @@ rfapiCliGetPrefixAddr (struct vty *vty, const char *str, struct prefix *p) { if (!str2prefix (str, p)) { - vty_out (vty, "Malformed address \"%s\"%s", str, HVTY_NEWLINE); + vty_out (vty, "Malformed address \"%s\"%s", str, HVTYNL); return CMD_WARNING; } switch (p->family) @@ -1949,19 +1949,19 @@ rfapiCliGetPrefixAddr (struct vty *vty, const char *str, struct prefix *p) case AF_INET: if (p->prefixlen != 32) { - vty_out (vty, "Not a host address: \"%s\"%s", str, HVTY_NEWLINE); + vty_out (vty, "Not a host address: \"%s\"%s", str, HVTYNL); return CMD_WARNING; } break; case AF_INET6: if (p->prefixlen != 128) { - vty_out (vty, "Not a host address: \"%s\"%s", str, HVTY_NEWLINE); + vty_out (vty, "Not a host address: \"%s\"%s", str, HVTYNL); return CMD_WARNING; } break; default: - vty_out (vty, "Invalid address \"%s\"%s", str, HVTY_NEWLINE); + vty_out (vty, "Invalid address \"%s\"%s", str, HVTYNL); return CMD_WARNING; } return 0; @@ -2066,7 +2066,7 @@ rfapiPrintNhl (void *stream, struct rfapi_next_hop_entry *next_hops) truncate: line[BUFSIZ - 1] = 0; - fp (out, "%s%s", line, HVTY_NEWLINE); + fp (out, "%s%s", line, HVTYNL); /* * options @@ -2088,18 +2088,18 @@ rfapiPrintNhl (void *stream, struct rfapi_next_hop_entry *next_hops) fp (out, "%sL2 %s LBL=0x%06x NETID=0x%06x NVEID=%d%s", offset, pbuf, (vo->v.l2addr.label & 0x00ffffff), (vo->v.l2addr.logical_net_id & 0x00ffffff), - vo->v.l2addr.local_nve_id, HVTY_NEWLINE); + vo->v.l2addr.local_nve_id, HVTYNL); break; case RFAPI_VN_OPTION_TYPE_LOCAL_NEXTHOP: prefix2str (&vo->v.local_nexthop.addr, pbuf, sizeof (pbuf)); fp (out, "%sLNH %s cost=%d%s", - offset, pbuf, vo->v.local_nexthop.cost, HVTY_NEWLINE); + offset, pbuf, vo->v.local_nexthop.cost, HVTYNL); break; default: fp (out, "%svn option type %d (unknown)%s", - offset, vo->type, HVTY_NEWLINE); + offset, vo->type, HVTYNL); break; } } @@ -3701,7 +3701,7 @@ clear_vnc_prefix (struct rfapi_local_reg_delete_arg *cda) static void print_cleared_stats (struct rfapi_local_reg_delete_arg *cda) { - struct vty *vty = cda->vty; /* for benefit of VTY_NEWLINE */ + struct vty *vty = cda->vty; /* for benefit of VTYNL */ /* Our special element-deleting function counts nves */ if (cda->nves) diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c index 25b52edb9..a32ccb58b 100644 --- a/eigrpd/eigrp_dump.c +++ b/eigrpd/eigrp_dump.c @@ -211,11 +211,11 @@ show_ip_eigrp_interface_header (struct vty *vty, struct eigrp *eigrp) { vty_outln (vty, "%s%s%d%s%s%s %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s%s %-39s %-12s %-7s %-14s %-12s %-8s", - VTY_NEWLINE, - "EIGRP interfaces for AS(",eigrp->AS,")",VTY_NEWLINE,VTY_NEWLINE, + VTYNL, + "EIGRP interfaces for AS(",eigrp->AS,")",VTYNL,VTYNL, "Interface", "Bandwidth", "Delay", "Peers", "Xmit Queue", "Mean", "Pacing Time", "Multicast", "Pending", "Hello", "Holdtime", - VTY_NEWLINE,"","Un/Reliable","SRTT","Un/Reliable","Flow Timer", + VTYNL,"","Un/Reliable","SRTT","Un/Reliable","Flow Timer", "Routes"); } @@ -258,10 +258,10 @@ void show_ip_eigrp_neighbor_header (struct vty *vty, struct eigrp *eigrp) { vty_outln (vty, "%s%s%d%s%s%s%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s%s %-41s %-6s %-8s %-6s %-4s %-6s %-5s ", - VTY_NEWLINE, - "EIGRP neighbors for AS(",eigrp->AS,")",VTY_NEWLINE,VTY_NEWLINE, + VTYNL, + "EIGRP neighbors for AS(",eigrp->AS,")",VTYNL,VTYNL, "H", "Address", "Interface", "Hold", "Uptime", - "SRTT", "RTO", "Q", "Seq", VTY_NEWLINE + "SRTT", "RTO", "Q", "Seq", VTYNL ,"","(sec)","","(ms)","","Cnt","Num"); } @@ -299,10 +299,10 @@ show_ip_eigrp_topology_header (struct vty *vty, struct eigrp *eigrp) router_id.s_addr = eigrp->router_id; vty_outln (vty, "%sEIGRP Topology Table for AS(%d)/ID(%s)%s", - VTY_NEWLINE, eigrp->AS, inet_ntoa(router_id), VTY_NEWLINE); + VTYNL, eigrp->AS, inet_ntoa(router_id), VTYNL); vty_outln (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, " "R - Reply%s r - reply Status, s - sia Status%s", - VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL); } void @@ -380,7 +380,7 @@ DEFUN (show_debugging_eigrp, lookup_msg(eigrp_packet_type_str, i + 1, NULL), IS_DEBUG_EIGRP_PACKET (i, PACKET_DETAIL) ? " detail" : ""); if (IS_DEBUG_EIGRP_PACKET (i, RECV)) - vty_outln (vty, " EIGRP packet %s receive%s debugging is on%s", + vty_outln (vty, " EIGRP packet %s receive%s debugging is on", lookup_msg(eigrp_packet_type_str, i + 1, NULL), IS_DEBUG_EIGRP_PACKET (i, PACKET_DETAIL) ? " detail" : ""); } diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 73b714c61..b3bd1146f 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -968,7 +968,7 @@ show_vty_unknown_tlv (struct vty *vty, struct subtlv_header *tlvh) vty_out (vty, " %#.2x", v[i]); if (rtn == 8) { - vty_out (vty, "%s [%.2x]", VTY_NEWLINE, i + 1); + vty_out (vty, "%s [%.2x]", VTYNL, i + 1); rtn = 1; } else @@ -1299,7 +1299,7 @@ show_mpls_te_sub (struct vty *vty, struct interface *ifp) show_vty_subtlv_res_bw (vty, &mtc->res_bw); show_vty_subtlv_ava_bw (vty, &mtc->ava_bw); show_vty_subtlv_use_bw (vty, &mtc->use_bw); - vty_outln (vty, "---------------%s", VTY_NEWLINE); + vty_outln (vty, "---------------%s", VTYNL); } else { diff --git a/isisd/isisd.c b/isisd/isisd.c index 7a1d2c0b6..b0d6144ed 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -1561,7 +1561,7 @@ show_isis_database (struct vty *vty, const char *argv, int ui_level) area->dynhostname); vty_outln (vty, " %u LSPs%s", - lsp_count, VTY_NEWLINE); + lsp_count, VTYNL); } } } diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c index 60779c46e..ba1f4891e 100644 --- a/ldpd/ldp_vty_exec.c +++ b/ldpd/ldp_vty_exec.c @@ -211,7 +211,7 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg, vty_out(vty, "%-8s %-15s ", "Targeted", addr); if (strlen(addr) > 15) - vty_out(vty, "%s%46s", VTY_NEWLINE, " "); + vty_out(vty, "%s%46s", VTYNL, " "); break; } vty_outln (vty, "%9u", adj->holdtime); @@ -232,23 +232,23 @@ show_discovery_detail_adj(struct vty *vty, char *buffer, struct ctl_adj *adj) size_t buflen = strlen(buffer); snprintf(buffer + buflen, LDPBUFSIZ - buflen, - " LSR Id: %s:0%s", inet_ntoa(adj->id), VTY_NEWLINE); + " LSR Id: %s:0%s", inet_ntoa(adj->id), VTYNL); buflen = strlen(buffer); snprintf(buffer + buflen, LDPBUFSIZ - buflen, " Source address: %s%s", - log_addr(adj->af, &adj->src_addr), VTY_NEWLINE); + log_addr(adj->af, &adj->src_addr), VTYNL); buflen = strlen(buffer); snprintf(buffer + buflen, LDPBUFSIZ - buflen, " Transport address: %s%s", - log_addr(adj->af, &adj->trans_addr), VTY_NEWLINE); + log_addr(adj->af, &adj->trans_addr), VTYNL); buflen = strlen(buffer); snprintf(buffer + buflen, LDPBUFSIZ - buflen, " Hello hold time: %u secs (due in %u secs)%s", - adj->holdtime, adj->holdtime_remaining, VTY_NEWLINE); + adj->holdtime, adj->holdtime_remaining, VTYNL); buflen = strlen(buffer); snprintf(buffer + buflen, LDPBUFSIZ - buflen, " Dual-stack capability TLV: %s%s", - (adj->ds_tlv) ? "yes" : "no", VTY_NEWLINE); + (adj->ds_tlv) ? "yes" : "no", VTYNL); } static int @@ -280,7 +280,7 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg, buflen = strlen(ifaces_buffer); snprintf(ifaces_buffer + buflen, LDPBUFSIZ - buflen, " %s: %s%s", iface->name, (iface->no_adj) ? - "(no adjacencies)" : "", VTY_NEWLINE); + "(no adjacencies)" : "", VTYNL); break; case IMSG_CTL_SHOW_DISC_TNBR: tnbr = imsg->data; @@ -294,7 +294,7 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg, snprintf(tnbrs_buffer + buflen, LDPBUFSIZ - buflen, " %s -> %s: %s%s", log_addr(tnbr->af, trans_addr), log_addr(tnbr->af, &tnbr->addr), (tnbr->no_adj) ? - "(no adjacencies)" : "", VTY_NEWLINE); + "(no adjacencies)" : "", VTYNL); break; case IMSG_CTL_SHOW_DISC_ADJ: adj = imsg->data; @@ -511,7 +511,7 @@ show_nbr_msg(struct vty *vty, struct imsg *imsg, struct show_params *params) af_name(nbr->af), inet_ntoa(nbr->id), nbr_state_name(nbr->nbr_state), addr); if (strlen(addr) > 15) - vty_out(vty, "%s%48s", VTY_NEWLINE, " "); + vty_out(vty, "%s%48s", VTYNL, " "); vty_outln (vty, " %8s", log_time(nbr->uptime)); break; case IMSG_CTL_END: @@ -531,12 +531,12 @@ show_nbr_detail_adj(struct vty *vty, char *buffer, struct ctl_adj *adj) switch (adj->type) { case HELLO_LINK: snprintf(buffer + buflen, LDPBUFSIZ - buflen, - " Interface: %s%s", adj->ifname, VTY_NEWLINE); + " Interface: %s%s", adj->ifname, VTYNL); break; case HELLO_TARGETED: snprintf(buffer + buflen, LDPBUFSIZ - buflen, " Targeted Hello: %s%s", log_addr(adj->af, - &adj->src_addr), VTY_NEWLINE); + &adj->src_addr), VTYNL); break; } } @@ -873,7 +873,7 @@ show_nbr_capabilities(struct vty *vty, struct ctl_nbr *nbr) " - Dynamic Announcement (0x0506)%s" " - Typed Wildcard (0x050B)%s" " - Unrecognized Notification (0x0603)", - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL, VTYNL); vty_outln (vty, " Capabilities Received:"); if (nbr->flags & F_NBR_CAP_DYNAMIC) vty_outln (vty," - Dynamic Announcement (0x0506)"); @@ -1021,7 +1021,7 @@ show_lib_msg(struct vty *vty, struct imsg *imsg, struct show_params *params) vty_out(vty, "%-4s %-20s", af_name(rt->af), dstnet); if (strlen(dstnet) > 20) - vty_out(vty, "%s%25s", VTY_NEWLINE, " "); + vty_out(vty, "%s%25s", VTYNL, " "); vty_outln (vty, " %-15s %-11s %-13s %6s", inet_ntoa(rt->nexthop), log_label(rt->local_label), log_label(rt->remote_label), rt->in_use ? "yes" : "no"); @@ -1077,7 +1077,7 @@ show_lib_detail_msg(struct vty *vty, struct imsg *imsg, struct show_params *para upstream = 1; buflen = strlen(sent_buffer); snprintf(sent_buffer + buflen, LDPBUFSIZ - buflen, - "%12s%s:0%s", "", inet_ntoa(rt->nexthop), VTY_NEWLINE); + "%12s%s:0%s", "", inet_ntoa(rt->nexthop), VTYNL); break; case IMSG_CTL_SHOW_LIB_RCVD: downstream = 1; @@ -1085,7 +1085,7 @@ show_lib_detail_msg(struct vty *vty, struct imsg *imsg, struct show_params *para snprintf(rcvd_buffer + buflen, LDPBUFSIZ - buflen, "%12s%s:0, label %s%s%s", "", inet_ntoa(rt->nexthop), log_label(rt->remote_label), - rt->in_use ? " (in use)" : "", VTY_NEWLINE); + rt->in_use ? " (in use)" : "", VTYNL); break; case IMSG_CTL_SHOW_LIB_END: if (upstream) { @@ -1698,8 +1698,8 @@ ldp_vty_show_capabilities(struct vty *vty, int json) "Supported LDP Capabilities%s" " * Dynamic Announcement (0x0506)%s" " * Typed Wildcard (0x050B)%s" - " * Unrecognized Notification (0x0603)%s", VTY_NEWLINE, - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); + " * Unrecognized Notification (0x0603)%s", VTYNL, + VTYNL, VTYNL, VTYNL); return (0); } diff --git a/lib/command.c b/lib/command.c index 574e7e0b4..9f62fef2d 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1349,7 +1349,7 @@ DEFUN (show_version, vty_outln (vty, "%s %s (%s).", FRR_FULL_NAME, FRR_VERSION, host.name ? host.name : ""); vty_outln (vty, "%s%s", FRR_COPYRIGHT, GIT_INFO); - vty_outln (vty, "configured with:%s %s", VTY_NEWLINE, + vty_outln (vty, "configured with:%s %s", VTYNL, FRR_CONFIG_ARGS); return CMD_SUCCESS; @@ -1385,9 +1385,9 @@ command argument (e.g. 'show ?') and describes each possible%s\ argument.%s\ 2. Partial help is provided when an abbreviated argument is entered%s\ and you want to know what arguments match the input%s\ - (e.g. 'show me?'.)%s", VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); + (e.g. 'show me?'.)%s", VTYNL, VTYNL, VTYNL, + VTYNL, VTYNL, VTYNL, VTYNL, VTYNL, + VTYNL, VTYNL, VTYNL, VTYNL); return CMD_SUCCESS; } @@ -1488,7 +1488,7 @@ vty_write_config (struct vty *vty) if (vty->type == VTY_TERM) { - vty_outln (vty, "%sCurrent configuration:",VTY_NEWLINE); + vty_outln (vty, "%sCurrent configuration:",VTYNL); vty_outln (vty, "!"); } diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c index 1eb01c4ef..5fc77475b 100644 --- a/lib/grammar_sandbox.c +++ b/lib/grammar_sandbox.c @@ -414,9 +414,9 @@ DEFUN (grammar_findambig, if (same) { vty_outln (vty, "'%s' AMBIGUOUS:", cur->cmd); - vty_outln (vty, " %s%s '%s'", prev->el->name, VTY_NEWLINE, + vty_outln (vty, " %s%s '%s'", prev->el->name, VTYNL, prev->el->string); - vty_outln (vty, " %s%s '%s'", cur->el->name, VTY_NEWLINE, + vty_outln (vty, " %s%s '%s'", cur->el->name, VTYNL, cur->el->string); vty_outln (vty, ""); ambig++; @@ -743,14 +743,14 @@ DEFUN_NOSH (no_interface, if (ifp == NULL) { - vty_out (vty, "%% Interface %s does not exist%s", ifname, VTY_NEWLINE); + vty_out (vty, "%% Interface %s does not exist%s", ifname, VTYNL); return CMD_WARNING; } if (CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE)) { vty_out (vty, "%% Only inactive interfaces can be deleted%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -798,7 +798,7 @@ DEFUN (show_address, if (p->family == AF_INET) vty_out (vty, "%s/%d%s", inet_ntoa (p->u.prefix4), p->prefixlen, - VTY_NEWLINE); + VTYNL); } } return CMD_SUCCESS; @@ -823,8 +823,8 @@ DEFUN (show_address_vrf_all, if (!vrf->iflist || !listcount (vrf->iflist)) continue; - vty_out (vty, "%sVRF %u%s%s", VTY_NEWLINE, vrf->vrf_id, VTY_NEWLINE, - VTY_NEWLINE); + vty_out (vty, "%sVRF %u%s%s", VTYNL, vrf->vrf_id, VTYNL, + VTYNL); for (ALL_LIST_ELEMENTS_RO (vrf->iflist, node, ifp)) { @@ -834,7 +834,7 @@ DEFUN (show_address_vrf_all, if (p->family == AF_INET) vty_out (vty, "%s/%d%s", inet_ntoa (p->u.prefix4), p->prefixlen, - VTY_NEWLINE); + VTYNL); } } } diff --git a/lib/memory_vty.c b/lib/memory_vty.c index 56621869f..5983efbdc 100644 --- a/lib/memory_vty.c +++ b/lib/memory_vty.c @@ -110,7 +110,7 @@ DEFUN (show_modules, vty_outln (vty, "%-12s %-25s %s%s", "Module Name", "Version", "Description", - VTY_NEWLINE); + VTYNL); while (plug) { const struct frrmod_info *i = plug->info; @@ -325,7 +325,7 @@ DEFUN_NOSH (ns_netns, if (ns->name && strcmp (ns->name, pathname) != 0) { vty_out (vty, "NS %u is already configured with NETNS %s%s", - ns->ns_id, ns->name, VTY_NEWLINE); + ns->ns_id, ns->name, VTYNL); return CMD_WARNING; } @@ -335,7 +335,7 @@ DEFUN_NOSH (ns_netns, if (!ns_enable (ns)) { vty_out (vty, "Can not associate NS %u with NETNS %s%s", - ns->ns_id, ns->name, VTY_NEWLINE); + ns->ns_id, ns->name, VTYNL); return CMD_WARNING; } diff --git a/lib/plist.c b/lib/plist.c index 9b4bda7ed..4a223d126 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1863,7 +1863,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty) vty_outln (vty, ""); write++; } - /* vty_out (vty, "!%s", VTY_NEWLINE); */ + /* vty_out (vty, "!%s", VTYNL); */ } for (plist = master->str.head; plist; plist = plist->next) diff --git a/lib/route_types.pl b/lib/route_types.pl index 27ca95078..29bcd3a67 100755 --- a/lib/route_types.pl +++ b/lib/route_types.pl @@ -123,7 +123,7 @@ sub codelist { push @lines, " \" > - selected route, * - FIB route%s%s\", \\\n"; my @nl = (); for (my $c = 0; $c < @lines + 1; $c++) { - push @nl, "VTY_NEWLINE" + push @nl, "VTYNL" } return join("", @lines) ." ". join(", ", @nl); } diff --git a/lib/routemap.c b/lib/routemap.c index a22e7a655..fa6f2691d 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -1003,7 +1003,7 @@ vty_show_route_map_entry (struct vty *vty, struct route_map *map) /* Description */ if (index->description) - vty_outln (vty, " Description:%s %s", VTY_NEWLINE, + vty_outln (vty, " Description:%s %s", VTYNL, index->description); /* Match clauses */ diff --git a/lib/smux.c b/lib/smux.c index 86fd9d548..6f4b45f9a 100644 --- a/lib/smux.c +++ b/lib/smux.c @@ -1278,7 +1278,7 @@ smux_peer_oid (struct vty *vty, const char *oid_str, const char *passwd_str) ret = smux_str2oid (oid_str, oid, &oid_len); if (ret != 0) { - vty_out (vty, "object ID malformed%s", VTY_NEWLINE); + vty_out (vty, "object ID malformed%s", VTYNL); return CMD_WARNING; } @@ -475,7 +475,7 @@ DEFUN_NOSH (vrf, { vty_out (vty, "%% VRF name %s is invalid: length exceeds " "%d characters%s", - vrfname, VRF_NAMSIZ, VTY_NEWLINE); + vrfname, VRF_NAMSIZ, VTYNL); return CMD_WARNING; } @@ -501,14 +501,14 @@ DEFUN_NOSH (no_vrf, if (vrfp == NULL) { - vty_out (vty, "%% VRF %s does not exist%s", vrfname, VTY_NEWLINE); + vty_out (vty, "%% VRF %s does not exist%s", vrfname, VTYNL); return CMD_WARNING; } if (CHECK_FLAG (vrfp->status, VRF_ACTIVE)) { vty_out (vty, "%% Only inactive VRFs can be deleted%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -115,12 +115,12 @@ extern vrf_id_t vrf_name_to_id (const char *); struct vrf *vrf; \ if (!(vrf = vrf_lookup_by_name(NAME))) \ { \ - vty_out (vty, "%% VRF %s not found%s", NAME, VTY_NEWLINE);\ + vty_out (vty, "%% VRF %s not found%s", NAME, VTYNL);\ return CMD_WARNING; \ } \ if (vrf->vrf_id == VRF_UNKNOWN) \ { \ - vty_out (vty, "%% VRF %s not active%s", NAME, VTY_NEWLINE);\ + vty_out (vty, "%% VRF %s not active%s", NAME, VTYNL);\ return CMD_WARNING; \ } \ (V) = vrf->vrf_id; \ @@ -169,7 +169,7 @@ vty_outln (struct vty *vty, const char *format, ...) len = vty_out_variadic (vty, format, args); va_end (args); - return len + vty_out (vty, "%s", VTY_NEWLINE); + return len + vty_out (vty, "%s", VTYNL); } static int @@ -954,7 +954,7 @@ vty_complete_command (struct vty *vty) vty_redraw_line (vty); break; case CMD_ERR_NO_MATCH: - /* vty_out (vty, "%% There is no matched command.%s", VTY_NEWLINE); */ + /* vty_out (vty, "%% There is no matched command.%s", VTYNL); */ vty_prompt (vty); vty_redraw_line (vty); break; @@ -1148,7 +1148,7 @@ vty_describe_command (struct vty *vty) #if 0 vty_out (vty, " %-*s %s%s", width desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, - desc->str ? desc->str : "", VTY_NEWLINE); + desc->str ? desc->str : "", VTYNL); #endif /* 0 */ } @@ -1775,8 +1775,8 @@ vty_create (int vty_sock, union sockunion *su) /* Say hello to the world. */ vty_hello (vty); if (! no_password_check) - vty_outln (vty, "%sUser Access Verification%s", VTY_NEWLINE, - VTY_NEWLINE); + vty_outln (vty, "%sUser Access Verification%s", VTYNL, + VTYNL); /* Setting up terminal. */ vty_will_echo (vty); @@ -2336,7 +2336,7 @@ vty_timeout (struct thread *thread) /* Clear buffer*/ buffer_reset (vty->obuf); - vty_outln (vty, "%sVty connection is timed out.", VTY_NEWLINE); + vty_outln (vty, "%sVty connection is timed out.", VTYNL); /* Close connection. */ vty->status = VTY_CLOSE; @@ -2719,7 +2719,7 @@ DEFUN_NOSH (config_who, if ((v = vector_slot (vtyvec, i)) != NULL) vty_out (vty, "%svty[%d] connected from %s.%s", v->config ? "*" : " ", - i, v->address, VTY_NEWLINE); + i, v->address, VTYNL); return CMD_SUCCESS; } @@ -2961,7 +2961,7 @@ DEFUN_NOSH (show_history, } if (vty->hist[index] != NULL) - vty_out (vty, " %s%s", vty->hist[index], VTY_NEWLINE); + vty_out (vty, " %s%s", vty->hist[index], VTYNL); index++; } @@ -156,7 +156,7 @@ static inline void vty_push_context(struct vty *vty, #define VTY_CHECK_CONTEXT(ptr) \ if (!ptr) { \ vty_out (vty, "Current configuration object was deleted " \ - "by another process.%s", VTY_NEWLINE); \ + "by another process.%s", VTYNL); \ return CMD_WARNING; \ } @@ -180,7 +180,7 @@ struct vty_arg #define INTEGRATE_DEFAULT_CONFIG "frr.conf" /* Small macro to determine newline is newline only or linefeed needed. */ -#define VTY_NEWLINE ((vty->type == VTY_TERM) ? "\r\n" : "\n") +#define VTYNL ((vty->type == VTY_TERM) ? "\r\n" : "\n") /* Default time out value */ #define VTY_TIMEOUT_DEFAULT 600 diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c index 403e996fe..b1b9ea54f 100644 --- a/nhrpd/nhrp_vty.c +++ b/nhrpd/nhrp_vty.c @@ -682,10 +682,10 @@ static void show_ip_opennhrp_cache(struct nhrp_cache *c, void *pctx) "Flags:%s%s%s" "Protocol-Address: %s/%zu", nhrp_cache_type_str[c->cur.type], - VTY_NEWLINE, + VTYNL, (c->cur.peer && c->cur.peer->online) ? " up": "", c->used ? " used": "", - VTY_NEWLINE, + VTYNL, sockunion2str(&c->remote_addr, buf, sizeof buf), 8 * family2addrsize(sockunion_family(&c->remote_addr))); @@ -731,7 +731,7 @@ DEFUN(show_ip_nhrp, show_ip_nhrp_cmd, } else if (argv[3]->text[0] == 's') { nhrp_shortcut_foreach(ctx.afi, show_ip_nhrp_shortcut, &ctx); } else { - vty_outln (vty, "Status: ok%s", VTY_NEWLINE); + vty_outln (vty, "Status: ok%s", VTYNL); ctx.count++; for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) nhrp_cache_foreach(ifp, show_ip_opennhrp_cache, &ctx); diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h index 6595e7045..41082e451 100644 --- a/ospf6d/ospf6d.h +++ b/ospf6d/ospf6d.h @@ -90,11 +90,11 @@ extern struct thread_master *master; #define OSPF6_ROUTER_ID_STR "Specify Router-ID\n" #define OSPF6_LS_ID_STR "Specify Link State ID\n" -#define VNL VTY_NEWLINE +#define VNL VTYNL #define OSPF6_CMD_CHECK_RUNNING() \ if (ospf6 == NULL) \ { \ - vty_out (vty, "OSPFv3 is not running%s", VTY_NEWLINE); \ + vty_out (vty, "OSPFv3 is not running%s", VTYNL); \ return CMD_SUCCESS; \ } diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index 7df456789..c6724bdec 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -1568,8 +1568,8 @@ show_debugging_ospf_common (struct vty *vty, struct ospf *ospf) int i; if (ospf->instance) - vty_outln (vty, "%sOSPF Instance: %d%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE); + vty_outln (vty, "%sOSPF Instance: %d%s", VTYNL, ospf->instance, + VTYNL); vty_outln (vty, "OSPF debugging status:"); diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index 20b9a8928..aafc0a98e 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -2585,7 +2585,7 @@ show_mpls_te_link_sub (struct vty *vty, struct interface *ifp) show_vty_link_subtlv_ava_bw (vty, &lp->ava_bw.header); if (TLV_TYPE(lp->use_bw) != 0) show_vty_link_subtlv_use_bw (vty, &lp->use_bw.header); - vty_outln (vty, "---------------%s", VTY_NEWLINE); + vty_outln (vty, "---------------%s", VTYNL); } else { diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index e5ba4bf11..1639949c8 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -100,7 +100,7 @@ str2metric (const char *str, int *metric) *metric = strtol (str, NULL, 10); if (*metric < 0 && *metric > 16777214) { - /* vty_out (vty, "OSPF metric value is invalid%s", VTY_NEWLINE); */ + /* vty_out (vty, "OSPF metric value is invalid%s", VTYNL); */ return 0; } @@ -150,7 +150,7 @@ DEFUN_NOSH (router_ospf, ospf = ospf_lookup(); if (!ospf) { - vty_out (vty, "There isn't active ospf instance %s", VTY_NEWLINE); + vty_out (vty, "There isn't active ospf instance %s", VTYNL); return CMD_WARNING; } @@ -213,7 +213,7 @@ DEFUN (ospf_router_id, ret = inet_aton (argv[idx_ipv4]->arg, &router_id); if (!ret) { - vty_out (vty, "Please specify Router ID by A.B.C.D%s", VTY_NEWLINE); + vty_out (vty, "Please specify Router ID by A.B.C.D%s", VTYNL); return CMD_WARNING; } @@ -223,7 +223,7 @@ DEFUN (ospf_router_id, if (area->full_nbrs) { vty_out (vty, "For this router-id change to take effect," - " save config and restart ospfd%s", VTY_NEWLINE); + " save config and restart ospfd%s", VTYNL); return CMD_SUCCESS; } @@ -248,7 +248,7 @@ DEFUN_HIDDEN (ospf_router_id_old, ret = inet_aton (argv[idx_ipv4]->arg, &router_id); if (!ret) { - vty_out (vty, "Please specify Router ID by A.B.C.D%s", VTY_NEWLINE); + vty_out (vty, "Please specify Router ID by A.B.C.D%s", VTYNL); return CMD_WARNING; } @@ -258,7 +258,7 @@ DEFUN_HIDDEN (ospf_router_id_old, if (area->full_nbrs) { vty_out (vty, "For this router-id change to take effect," - " save config and restart ospfd%s", VTY_NEWLINE); + " save config and restart ospfd%s", VTYNL); return CMD_SUCCESS; } @@ -285,7 +285,7 @@ DEFUN (no_ospf_router_id, if (area->full_nbrs) { vty_out (vty, "For this router-id change to take effect," - " save config and restart ospfd%s", VTY_NEWLINE); + " save config and restart ospfd%s", VTYNL); return CMD_SUCCESS; } @@ -390,7 +390,7 @@ DEFUN (ospf_passive_interface, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -460,7 +460,7 @@ DEFUN (no_ospf_passive_interface, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -511,14 +511,14 @@ DEFUN (ospf_network_area, if (ospf->instance) { vty_out (vty, "The network command is not supported in multi-instance ospf%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } if (ospf->if_ospf_cli_count > 0) { vty_out (vty, "Please remove all ip ospf area x.x.x.x commands first.%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -529,7 +529,7 @@ DEFUN (ospf_network_area, ret = ospf_network_set (ospf, &p, area_id, format); if (ret == 0) { - vty_out (vty, "There is already same network statement.%s", VTY_NEWLINE); + vty_out (vty, "There is already same network statement.%s", VTYNL); return CMD_WARNING; } @@ -556,7 +556,7 @@ DEFUN (no_ospf_network_area, if (ospf->instance) { vty_out (vty, "The network command is not supported in multi-instance ospf%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -568,7 +568,7 @@ DEFUN (no_ospf_network_area, if (ret == 0) { vty_out (vty, "Can't find specified network area configuration.%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -813,7 +813,7 @@ ospf_find_vl_data (struct ospf *ospf, struct ospf_vl_config_data *vl_config) { vty_out (vty, "Configuring VLs over the backbone is not allowed%s", - VTY_NEWLINE); + VTYNL); return NULL; } area = ospf_area_get (ospf, area_id); @@ -825,12 +825,12 @@ ospf_find_vl_data (struct ospf *ospf, struct ospf_vl_config_data *vl_config) vty_out (vty, "Area %s is %s%s", inet_ntoa (area_id), area->external_routing == OSPF_AREA_NSSA?"nssa":"stub", - VTY_NEWLINE); + VTYNL); else vty_out (vty, "Area %ld is %s%s", (u_long)ntohl (area_id.s_addr), area->external_routing == OSPF_AREA_NSSA?"nssa":"stub", - VTY_NEWLINE); + VTYNL); return NULL; } @@ -876,7 +876,7 @@ ospf_vl_set_security (struct ospf_vl_data *vl_data, != NULL) { vty_out (vty, "OSPF: Key %d already exists%s", - vl_config->crypto_key_id, VTY_NEWLINE); + vl_config->crypto_key_id, VTYNL); return CMD_WARNING; } ck = ospf_crypt_key_new (); @@ -894,7 +894,7 @@ ospf_vl_set_security (struct ospf_vl_data *vl_data, vl_config->crypto_key_id) == NULL) { vty_out (vty, "OSPF: Key %d does not exist%s", - vl_config->crypto_key_id, VTY_NEWLINE); + vl_config->crypto_key_id, VTYNL); return CMD_WARNING; } @@ -1037,7 +1037,7 @@ DEFUN (ospf_area_vlink, &vl_config.area_id_fmt); if (ret < 0) { - vty_out (vty, "OSPF area ID is invalid%s", VTY_NEWLINE); + vty_out (vty, "OSPF area ID is invalid%s", VTYNL); return CMD_WARNING; } @@ -1045,7 +1045,7 @@ DEFUN (ospf_area_vlink, if (! ret) { vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -1060,7 +1060,7 @@ DEFUN (ospf_area_vlink, for (i=5; i < argc; i++) { - /* vty_out (vty, "argv[%d]->arg - %s%s", i, argv[i]->text, VTY_NEWLINE); */ + /* vty_out (vty, "argv[%d]->arg - %s%s", i, argv[i]->text, VTYNL); */ switch (argv[i]->arg[0]) { @@ -1157,14 +1157,14 @@ DEFUN (no_ospf_area_vlink, ret = str2area_id (argv[idx_ipv4_number]->arg, &vl_config.area_id, &format); if (ret < 0) { - vty_out (vty, "OSPF area ID is invalid%s", VTY_NEWLINE); + vty_out (vty, "OSPF area ID is invalid%s", VTYNL); return CMD_WARNING; } area = ospf_area_lookup_by_area_id (ospf, vl_config.area_id); if (!area) { - vty_out (vty, "Area does not exist%s", VTY_NEWLINE); + vty_out (vty, "Area does not exist%s", VTYNL); return CMD_WARNING; } @@ -1172,7 +1172,7 @@ DEFUN (no_ospf_area_vlink, if (! ret) { vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -1193,7 +1193,7 @@ DEFUN (no_ospf_area_vlink, /* Deal with other parameters */ for (i=6; i < argc; i++) { - /* vty_out (vty, "argv[%d] - %s%s", i, argv[i], VTY_NEWLINE); */ + /* vty_out (vty, "argv[%d] - %s%s", i, argv[i], VTYNL); */ switch (argv[i]->arg[0]) { @@ -1257,14 +1257,14 @@ DEFUN (ospf_area_vlink_intervals, ret = str2area_id (area_id, &vl_config.area_id, &vl_config.area_id_fmt); if (ret < 0) { - vty_out (vty, "OSPF area ID is invalid%s", VTY_NEWLINE); + vty_out (vty, "OSPF area ID is invalid%s", VTYNL); return CMD_WARNING; } ret = inet_aton (router_id, &vl_config.vl_peer); if (! ret) { - vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTY_NEWLINE); + vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTYNL); return CMD_WARNING; } @@ -1303,14 +1303,14 @@ DEFUN (no_ospf_area_vlink_intervals, ret = str2area_id (area_id, &vl_config.area_id, &vl_config.area_id_fmt); if (ret < 0) { - vty_out (vty, "OSPF area ID is invalid%s", VTY_NEWLINE); + vty_out (vty, "OSPF area ID is invalid%s", VTYNL); return CMD_WARNING; } ret = inet_aton (router_id, &vl_config.vl_peer); if (! ret) { - vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTY_NEWLINE); + vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTYNL); return CMD_WARNING; } @@ -1368,7 +1368,7 @@ DEFUN (ospf_area_shortcut, if (ospf->abr_type != OSPF_ABR_SHORTCUT) vty_out (vty, "Shortcut area setting will take effect " "only when the router is configured as Shortcut ABR%s", - VTY_NEWLINE); + VTYNL); return CMD_SUCCESS; } @@ -1422,7 +1422,7 @@ DEFUN (ospf_area_stub, if (ret == 0) { vty_out (vty, "First deconfigure all virtual link through this area%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -1452,7 +1452,7 @@ DEFUN (ospf_area_stub_no_summary, if (ret == 0) { vty_out (vty, "%% Area cannot be stub as it contains a virtual link%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -1519,7 +1519,7 @@ ospf_area_nssa_cmd_handler (struct vty *vty, int argc, struct cmd_token **argv, if (ret == 0) { vty_out (vty, "%% Area cannot be nssa as it contains a virtual link%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -1658,7 +1658,7 @@ DEFUN (ospf_area_default_cost, if (area->external_routing == OSPF_AREA_DEFAULT) { - vty_out (vty, "The area is neither stub, nor NSSA%s", VTY_NEWLINE); + vty_out (vty, "The area is neither stub, nor NSSA%s", VTYNL); return CMD_WARNING; } @@ -1701,7 +1701,7 @@ DEFUN (no_ospf_area_default_cost, if (area->external_routing == OSPF_AREA_DEFAULT) { - vty_out (vty, "The area is neither stub, nor NSSA%s", VTY_NEWLINE); + vty_out (vty, "The area is neither stub, nor NSSA%s", VTYNL); return CMD_WARNING; } @@ -2205,7 +2205,7 @@ DEFUN (ospf_timers_min_ls_interval, if (argc < 5) { - vty_out (vty, "Insufficient arguments%s", VTY_NEWLINE); + vty_out (vty, "Insufficient arguments%s", VTYNL); return CMD_WARNING; } @@ -2247,7 +2247,7 @@ DEFUN (ospf_timers_min_ls_arrival, if (argc < 4) { - vty_out (vty, "Insufficient arguments%s", VTY_NEWLINE); + vty_out (vty, "Insufficient arguments%s", VTYNL); return CMD_WARNING; } @@ -2292,7 +2292,7 @@ DEFUN (ospf_timers_throttle_spf, if (argc < 6) { - vty_out (vty, "Insufficient arguments%s", VTY_NEWLINE); + vty_out (vty, "Insufficient arguments%s", VTYNL); return CMD_WARNING; } @@ -2335,7 +2335,7 @@ DEFUN (ospf_timers_lsa, if (argc < 4) { - vty_out (vty, "Insufficient number of arguments%s", VTY_NEWLINE); + vty_out (vty, "Insufficient number of arguments%s", VTYNL); return CMD_WARNING; } @@ -2549,7 +2549,7 @@ DEFUN (ospf_auto_cost_reference_bandwidth, refbw = strtol (argv[idx_number]->arg, NULL, 10); if (refbw < 1 || refbw > 4294967) { - vty_out (vty, "reference-bandwidth value is invalid%s", VTY_NEWLINE); + vty_out (vty, "reference-bandwidth value is invalid%s", VTYNL); return CMD_WARNING; } @@ -2580,8 +2580,8 @@ DEFUN (no_ospf_auto_cost_reference_bandwidth, return CMD_SUCCESS; ospf->ref_bandwidth = OSPF_DEFAULT_REF_BANDWIDTH; - vty_out (vty, "%% OSPF: Reference bandwidth is changed.%s", VTY_NEWLINE); - vty_out (vty, " Please ensure reference bandwidth is consistent across all routers%s", VTY_NEWLINE); + vty_out (vty, "%% OSPF: Reference bandwidth is changed.%s", VTYNL); + vty_out (vty, " Please ensure reference bandwidth is consistent across all routers%s", VTYNL); for (ALL_LIST_ELEMENTS (om->iflist, node, nnode, ifp)) ospf_if_recalculate_output_cost (ifp); @@ -2608,7 +2608,7 @@ DEFUN (ospf_write_multiplier, write_oi_count = strtol (argv[idx_number]->arg, NULL, 10); if (write_oi_count < 1 || write_oi_count > 100) { - vty_out (vty, "write-multiplier value is invalid%s", VTY_NEWLINE); + vty_out (vty, "write-multiplier value is invalid%s", VTYNL); return CMD_WARNING; } @@ -2677,7 +2677,7 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar if (use_json) json_object_boolean_true_add(json_area, "backbone"); else - vty_out (vty, " (Backbone)%s", VTY_NEWLINE); + vty_out (vty, " (Backbone)%s", VTYNL); } else { @@ -2714,11 +2714,11 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar area->no_summary ? ", no summary" : "", area->shortcut_configured ? "; " : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); vty_out (vty, " Shortcutting mode: %s", ospf_shortcut_mode_descr_str[area->shortcut_configured]); vty_out (vty, ", S-bit consensus: %s%s", - area->shortcut_capability ? "ok" : "no", VTY_NEWLINE); + area->shortcut_capability ? "ok" : "no", VTYNL); } } @@ -2731,7 +2731,7 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar else vty_out (vty, " Number of interfaces in this area: Total: %d, " "Active: %d%s", listcount (area->oiflist), - area->act_ints, VTY_NEWLINE); + area->act_ints, VTYNL); if (area->external_routing == OSPF_AREA_NSSA) { @@ -2759,29 +2759,29 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar } else { - vty_out (vty, " It is an NSSA configuration. %s Elected NSSA/ABR performs type-7/type-5 LSA translation. %s", VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, " It is an NSSA configuration. %s Elected NSSA/ABR performs type-7/type-5 LSA translation. %s", VTYNL, VTYNL); if (! IS_OSPF_ABR (area->ospf)) vty_out (vty, " It is not ABR, therefore not Translator. %s", - VTY_NEWLINE); + VTYNL); else if (area->NSSATranslatorState) { vty_out (vty, " We are an ABR and "); if (area->NSSATranslatorRole == OSPF_NSSA_ROLE_CANDIDATE) vty_out (vty, "the NSSA Elected Translator. %s", - VTY_NEWLINE); + VTYNL); else if (area->NSSATranslatorRole == OSPF_NSSA_ROLE_ALWAYS) vty_out (vty, "always an NSSA Translator. %s", - VTY_NEWLINE); + VTYNL); } else { vty_out (vty, " We are an ABR, but "); if (area->NSSATranslatorRole == OSPF_NSSA_ROLE_CANDIDATE) vty_out (vty, "not the NSSA Elected Translator. %s", - VTY_NEWLINE); + VTYNL); else vty_out (vty, "never an NSSA Translator. %s", - VTY_NEWLINE); + VTYNL); } } } @@ -2806,14 +2806,14 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar else { vty_out (vty, " Originating stub / maximum-distance Router-LSA%s", - VTY_NEWLINE); + VTYNL); if (CHECK_FLAG(area->stub_router_state, OSPF_AREA_ADMIN_STUB_ROUTED)) vty_out (vty, " Administratively activated (indefinitely)%s", - VTY_NEWLINE); + VTYNL); if (area->t_stub_router) vty_out (vty, " Active from startup, %s remaining%s", ospf_timer_dump (area->t_stub_router, timebuf, - sizeof(timebuf)), VTY_NEWLINE); + sizeof(timebuf)), VTYNL); } } @@ -2851,42 +2851,42 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar { /* Show number of fully adjacent neighbors. */ vty_out (vty, " Number of fully adjacent neighbors in this area:" - " %d%s", area->full_nbrs, VTY_NEWLINE); + " %d%s", area->full_nbrs, VTYNL); /* Show authentication type. */ vty_out (vty, " Area has "); if (area->auth_type == OSPF_AUTH_NULL) - vty_out (vty, "no authentication%s", VTY_NEWLINE); + vty_out (vty, "no authentication%s", VTYNL); else if (area->auth_type == OSPF_AUTH_SIMPLE) - vty_out (vty, "simple password authentication%s", VTY_NEWLINE); + vty_out (vty, "simple password authentication%s", VTYNL); else if (area->auth_type == OSPF_AUTH_CRYPTOGRAPHIC) - vty_out (vty, "message digest authentication%s", VTY_NEWLINE); + vty_out (vty, "message digest authentication%s", VTYNL); if (!OSPF_IS_AREA_BACKBONE (area)) vty_out (vty, " Number of full virtual adjacencies going through" - " this area: %d%s", area->full_vls, VTY_NEWLINE); + " this area: %d%s", area->full_vls, VTYNL); /* Show SPF calculation times. */ vty_out (vty, " SPF algorithm executed %d times%s", - area->spf_calculation, VTY_NEWLINE); + area->spf_calculation, VTYNL); /* Show number of LSA. */ - vty_out (vty, " Number of LSA %ld%s", area->lsdb->total, VTY_NEWLINE); + vty_out (vty, " Number of LSA %ld%s", area->lsdb->total, VTYNL); vty_out (vty, " Number of router LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (area->lsdb, OSPF_ROUTER_LSA), - ospf_lsdb_checksum (area->lsdb, OSPF_ROUTER_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (area->lsdb, OSPF_ROUTER_LSA), VTYNL); vty_out (vty, " Number of network LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (area->lsdb, OSPF_NETWORK_LSA), - ospf_lsdb_checksum (area->lsdb, OSPF_NETWORK_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (area->lsdb, OSPF_NETWORK_LSA), VTYNL); vty_out (vty, " Number of summary LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (area->lsdb, OSPF_SUMMARY_LSA), - ospf_lsdb_checksum (area->lsdb, OSPF_SUMMARY_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (area->lsdb, OSPF_SUMMARY_LSA), VTYNL); vty_out (vty, " Number of ASBR summary LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (area->lsdb, OSPF_ASBR_SUMMARY_LSA), - ospf_lsdb_checksum (area->lsdb, OSPF_ASBR_SUMMARY_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (area->lsdb, OSPF_ASBR_SUMMARY_LSA), VTYNL); vty_out (vty, " Number of NSSA LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (area->lsdb, OSPF_AS_NSSA_LSA), - ospf_lsdb_checksum (area->lsdb, OSPF_AS_NSSA_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (area->lsdb, OSPF_AS_NSSA_LSA), VTYNL); } if (use_json) @@ -2900,16 +2900,16 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar { vty_out (vty, " Number of opaque link LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (area->lsdb, OSPF_OPAQUE_LINK_LSA), - ospf_lsdb_checksum (area->lsdb, OSPF_OPAQUE_LINK_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (area->lsdb, OSPF_OPAQUE_LINK_LSA), VTYNL); vty_out (vty, " Number of opaque area LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (area->lsdb, OSPF_OPAQUE_AREA_LSA), - ospf_lsdb_checksum (area->lsdb, OSPF_OPAQUE_AREA_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (area->lsdb, OSPF_OPAQUE_AREA_LSA), VTYNL); } if (use_json) json_object_object_add(json_areas, inet_ntoa (area->area_id), json_area); else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } static int @@ -2936,8 +2936,8 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) } else { - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } } @@ -2950,7 +2950,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) { vty_out (vty, " OSPF Routing Process, Router ID: %s%s", inet_ntoa (ospf->router_id), - VTY_NEWLINE); + VTYNL); } /* Graceful shutdown */ @@ -2966,7 +2966,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) { vty_out (vty, " Deferred shutdown in progress, %s remaining%s", ospf_timer_dump (ospf->t_deferred_shutdown, - timebuf, sizeof (timebuf)), VTY_NEWLINE); + timebuf, sizeof (timebuf)), VTYNL); } } @@ -2982,11 +2982,11 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) } else { - vty_out (vty, " Supports only single TOS (TOS0) routes%s", VTY_NEWLINE); - vty_out (vty, " This implementation conforms to RFC2328%s", VTY_NEWLINE); + vty_out (vty, " Supports only single TOS (TOS0) routes%s", VTYNL); + vty_out (vty, " This implementation conforms to RFC2328%s", VTYNL); vty_out (vty, " RFC1583Compatibility flag is %s%s", CHECK_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE) ? - "enabled" : "disabled", VTY_NEWLINE); + "enabled" : "disabled", VTYNL); } if (use_json) @@ -3000,7 +3000,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) { vty_out (vty, " OpaqueCapability flag is %s%s", CHECK_FLAG (ospf->config, OSPF_OPAQUE_CAPABLE) ? "enabled" : "disabled", - VTY_NEWLINE); + VTYNL); } /* Show stub-router configuration */ @@ -3018,13 +3018,13 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) else { vty_out (vty, " Stub router advertisement is configured%s", - VTY_NEWLINE); + VTYNL); if (ospf->stub_router_startup_time != OSPF_STUB_ROUTER_UNCONFIGURED) vty_out (vty, " Enabled for %us after start-up%s", - ospf->stub_router_startup_time, VTY_NEWLINE); + ospf->stub_router_startup_time, VTYNL); if (ospf->stub_router_shutdown_time != OSPF_STUB_ROUTER_UNCONFIGURED) vty_out (vty, " Enabled for %us prior to full shutdown%s", - ospf->stub_router_shutdown_time, VTY_NEWLINE); + ospf->stub_router_shutdown_time, VTYNL); } } @@ -3042,10 +3042,10 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) " Minimum hold time between consecutive SPFs %d millisec(s)%s" " Maximum hold time between consecutive SPFs %d millisec(s)%s" " Hold time multiplier is currently %d%s", - ospf->spf_delay, VTY_NEWLINE, - ospf->spf_holdtime, VTY_NEWLINE, - ospf->spf_max_holdtime, VTY_NEWLINE, - ospf->spf_hold_multiplier, VTY_NEWLINE); + ospf->spf_delay, VTYNL, + ospf->spf_holdtime, VTYNL, + ospf->spf_max_holdtime, VTYNL, + ospf->spf_hold_multiplier, VTYNL); } if (use_json) @@ -3071,13 +3071,13 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) monotime_since(&ospf->ts_spf, &result); vty_out (vty, "last executed %s ago%s", ospf_timeval_dump (&result, timebuf, sizeof (timebuf)), - VTY_NEWLINE); + VTYNL); vty_out (vty, " Last SPF duration %s%s", ospf_timeval_dump (&ospf->ts_spf_duration, timebuf, sizeof (timebuf)), - VTY_NEWLINE); + VTYNL); } else - vty_out (vty, "has not been run%s", VTY_NEWLINE); + vty_out (vty, "has not been run%s", VTYNL); } if (use_json) @@ -3101,20 +3101,20 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) vty_out (vty, " SPF timer %s%s%s", (ospf->t_spf_calc ? "due in " : "is "), ospf_timer_dump (ospf->t_spf_calc, timebuf, sizeof (timebuf)), - VTY_NEWLINE); + VTYNL); vty_out (vty, " LSA minimum interval %d msecs%s", - ospf->min_ls_interval, VTY_NEWLINE); + ospf->min_ls_interval, VTYNL); vty_out (vty, " LSA minimum arrival %d msecs%s", - ospf->min_ls_arrival, VTY_NEWLINE); + ospf->min_ls_arrival, VTYNL); /* Show write multiplier values */ vty_out (vty, " Write Multiplier set to %d %s", - ospf->write_oi_count, VTY_NEWLINE); + ospf->write_oi_count, VTYNL); /* Show refresh parameters. */ vty_out (vty, " Refresh timer %d secs%s", - ospf->lsa_refresh_interval, VTY_NEWLINE); + ospf->lsa_refresh_interval, VTYNL); } /* Show ABR/ASBR flags. */ @@ -3124,7 +3124,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) json_object_string_add(json, "abrType", ospf_abr_type_descr_str[ospf->abr_type]); else vty_out (vty, " This router is an ABR, ABR type is: %s%s", - ospf_abr_type_descr_str[ospf->abr_type], VTY_NEWLINE); + ospf_abr_type_descr_str[ospf->abr_type], VTYNL); } if (CHECK_FLAG (ospf->flags, OSPF_FLAG_ASBR)) { @@ -3132,7 +3132,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) json_object_string_add(json, "asbrRouter", "injectingExternalRoutingInformation"); else vty_out (vty, " This router is an ASBR " - "(injecting external routing information)%s", VTY_NEWLINE); + "(injecting external routing information)%s", VTYNL); } /* Show Number of AS-external-LSAs. */ @@ -3147,7 +3147,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) { vty_out (vty, " Number of external LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (ospf->lsdb, OSPF_AS_EXTERNAL_LSA), - ospf_lsdb_checksum (ospf->lsdb, OSPF_AS_EXTERNAL_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (ospf->lsdb, OSPF_AS_EXTERNAL_LSA), VTYNL); } if (use_json) @@ -3161,7 +3161,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) { vty_out (vty, " Number of opaque AS LSA %ld. Checksum Sum 0x%08x%s", ospf_lsdb_count (ospf->lsdb, OSPF_OPAQUE_AS_LSA), - ospf_lsdb_checksum (ospf->lsdb, OSPF_OPAQUE_AS_LSA), VTY_NEWLINE); + ospf_lsdb_checksum (ospf->lsdb, OSPF_OPAQUE_AS_LSA), VTYNL); } /* Show number of areas attached. */ @@ -3169,7 +3169,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) json_object_int_add(json, "attachedAreaCounter", listcount (ospf->areas)); else vty_out (vty, " Number of areas attached to this router: %d%s", - listcount (ospf->areas), VTY_NEWLINE); + listcount (ospf->areas), VTYNL); if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES)) { @@ -3178,14 +3178,14 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) if (use_json) json_object_boolean_true_add(json, "adjacencyChangesLoggedAll"); else - vty_out(vty, " All adjacency changes are logged%s",VTY_NEWLINE); + vty_out(vty, " All adjacency changes are logged%s",VTYNL); } else { if (use_json) json_object_boolean_true_add(json, "adjacencyChangesLogged"); else - vty_out(vty, " Adjacency changes are logged%s",VTY_NEWLINE); + vty_out(vty, " Adjacency changes are logged%s",VTYNL); } } /* Show each area status. */ @@ -3195,11 +3195,11 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) if (use_json) { json_object_object_add(json, "areas", json_areas); - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s",VTY_NEWLINE); + vty_out (vty, "%s",VTYNL); return CMD_SUCCESS; } @@ -3267,11 +3267,10 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface } else { - vty_out (vty, "%s is %s%s", ifp->name, - ((is_up = if_is_operative(ifp)) ? "up" : "down"), VTY_NEWLINE); - vty_out (vty, " ifindex %u, MTU %u bytes, BW %u Mbit %s%s", - ifp->ifindex, ifp->mtu, bandwidth, if_flag_dump(ifp->flags), - VTY_NEWLINE); + vty_outln (vty, "%s is %s", ifp->name, + ((is_up = if_is_operative(ifp)) ? "up" : "down")); + vty_outln (vty, " ifindex %u, MTU %u bytes, BW %u Mbit %s", + ifp->ifindex, ifp->mtu, bandwidth, if_flag_dump(ifp->flags)) } /* Is interface OSPF enabled? */ @@ -3294,13 +3293,13 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface { if (ospf_oi_count(ifp) == 0) { - vty_out (vty, " OSPF not enabled on this interface%s", VTY_NEWLINE); + vty_out (vty, " OSPF not enabled on this interface%s", VTYNL); return; } else if (!is_up) { vty_out (vty, " OSPF is enabled, but not running on this interface%s", - VTY_NEWLINE); + VTYNL); return; } } @@ -3376,27 +3375,25 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface } else { - vty_out (vty, " Area %s%s", ospf_area_desc_string (oi->area), - VTY_NEWLINE); + vty_outln (vty, " Area %s", ospf_area_desc_string (oi->area)); - vty_out (vty, " MTU mismatch detection:%s%s", - OSPF_IF_PARAM(oi, mtu_ignore) ? "disabled" : "enabled", VTY_NEWLINE); + vty_outln (vty, " MTU mismatch detection: %s", + OSPF_IF_PARAM(oi, mtu_ignore) ? "disabled" : "enabled"); - vty_out (vty, " Router ID %s, Network Type %s, Cost: %d%s", - inet_ntoa (ospf->router_id), ospf_network_type_str[oi->type], - oi->output_cost, VTY_NEWLINE); + vty_outln (vty, " Router ID %s, Network Type %s, Cost: %d", + inet_ntoa (ospf->router_id), ospf_network_type_str[oi->type], + oi->output_cost); - vty_out (vty, " Transmit Delay is %d sec, State %s, Priority %d%s", - OSPF_IF_PARAM (oi,transmit_delay), lookup_msg(ospf_ism_state_msg, oi->state, NULL), - PRIORITY (oi), VTY_NEWLINE); + vty_outln (vty, " Transmit Delay is %d sec, State %s, Priority %d", + OSPF_IF_PARAM (oi,transmit_delay), lookup_msg(ospf_ism_state_msg, oi->state, NULL), + PRIORITY (oi)); } /* Show DR information. */ if (DR (oi).s_addr == 0) { if (!use_json) - vty_out (vty, " No backup designated router on this network%s", - VTY_NEWLINE); + vty_outln (vty, " No backup designated router on this network"); } else { @@ -3417,8 +3414,8 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface { vty_out (vty, " Backup Designated Router (ID) %s,", inet_ntoa (nbr->router_id)); - vty_out (vty, " Interface Address %s%s", - inet_ntoa (nbr->address.u.prefix4), VTY_NEWLINE); + vty_outln (vty, " Interface Address %s", + inet_ntoa (nbr->address.u.prefix4)); } } } @@ -3430,7 +3427,7 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface json_object_int_add(json_interface_sub, "networkLsaSequence", ntohl (oi->params->network_lsa_seqnum)); else vty_out (vty, " Saved Network-LSA sequence number 0x%x%s", - ntohl (oi->params->network_lsa_seqnum), VTY_NEWLINE); + ntohl (oi->params->network_lsa_seqnum), VTYNL); } if (use_json) @@ -3457,7 +3454,7 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface } else vty_out (vty, " <None>"); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } if (use_json) @@ -3482,7 +3479,7 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface OSPF_IF_PARAM (oi, v_wait), OSPF_IF_PARAM (oi, v_wait), OSPF_IF_PARAM (oi, retransmit_interval), - VTY_NEWLINE); + VTYNL); } if (OSPF_IF_PASSIVE_STATUS (oi) == OSPF_IF_ACTIVE) @@ -3498,14 +3495,14 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface else vty_out (vty, " Hello due in %s%s", ospf_timer_dump (oi->t_hello, timebuf, sizeof(timebuf)), - VTY_NEWLINE); + VTYNL); } else /* passive-interface is set */ { if (use_json) json_object_boolean_true_add(json_interface_sub, "timerPassiveIface"); else - vty_out (vty, " No Hellos (Passive interface)%s", VTY_NEWLINE); + vty_out (vty, " No Hellos (Passive interface)%s", VTYNL); } if (use_json) @@ -3516,7 +3513,7 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface else vty_out (vty, " Neighbor Count is %d, Adjacent neighbor count is %d%s", ospf_nbr_count (oi, 0), ospf_nbr_count (oi, NSM_Full), - VTY_NEWLINE); + VTYNL); ospf_bfd_interface_show(vty, ifp, json_interface_sub, use_json); } } @@ -3540,8 +3537,8 @@ show_ip_ospf_interface_common (struct vty *vty, struct ospf *ospf, int argc, if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } if (argc == iface_argv) @@ -3569,7 +3566,7 @@ show_ip_ospf_interface_common (struct vty *vty, struct ospf *ospf, int argc, if (use_json) json_object_boolean_true_add(json, "noSuchIface"); else - vty_out (vty, "No such interface name%s", VTY_NEWLINE); + vty_out (vty, "No such interface name%s", VTYNL); } else { @@ -3585,11 +3582,11 @@ show_ip_ospf_interface_common (struct vty *vty, struct ospf *ospf, int argc, if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -3646,10 +3643,10 @@ static void show_ip_ospf_neighbour_header (struct vty *vty) { vty_out (vty, "%s%-15s %3s %-15s %9s %-15s %-20s %5s %5s %5s%s", - VTY_NEWLINE, + VTYNL, "Neighbor ID", "Pri", "State", "Dead Time", "Address", "Interface", "RXmtL", "RqstL", "DBsmL", - VTY_NEWLINE); + VTYNL); } static void @@ -3713,7 +3710,7 @@ show_ip_ospf_neighbor_sub (struct vty *vty, struct ospf_interface *oi, json_obje vty_out (vty, "%-20s %5ld %5ld %5d%s", IF_NAME (oi), ospf_ls_retransmit_count (nbr), ospf_ls_request_count (nbr), ospf_db_summary_count (nbr), - VTY_NEWLINE); + VTYNL); } } } @@ -3738,8 +3735,8 @@ show_ip_ospf_neighbor_common (struct vty *vty, struct ospf *ospf, u_char use_jso if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi)) @@ -3747,11 +3744,11 @@ show_ip_ospf_neighbor_common (struct vty *vty, struct ospf *ospf, u_char use_jso if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -3818,8 +3815,8 @@ show_ip_ospf_neighbor_all_common (struct vty *vty, struct ospf *ospf, u_char use if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi)) @@ -3851,7 +3848,7 @@ show_ip_ospf_neighbor_all_common (struct vty *vty, struct ospf *ospf, u_char use "-", nbr_nbma->priority, "Down", "-"); vty_out (vty, "%-15s %-20s %5d %5d %5d%s", inet_ntoa (nbr_nbma->addr), IF_NAME (oi), - 0, 0, 0, VTY_NEWLINE); + 0, 0, 0, VTYNL); } } } @@ -3859,11 +3856,11 @@ show_ip_ospf_neighbor_all_common (struct vty *vty, struct ospf *ospf, u_char use if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -3928,8 +3925,8 @@ show_ip_ospf_neighbor_int_common (struct vty *vty, struct ospf *ospf, int arg_ba if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } ifp = if_lookup_by_name (argv[arg_base]->arg, VRF_DEFAULT); @@ -3938,7 +3935,7 @@ show_ip_ospf_neighbor_int_common (struct vty *vty, struct ospf *ospf, int arg_ba if (use_json) json_object_boolean_true_add(json, "noSuchIface"); else - vty_out (vty, "No such interface.%s", VTY_NEWLINE); + vty_out (vty, "No such interface.%s", VTYNL); return CMD_WARNING; } @@ -3954,11 +3951,11 @@ show_ip_ospf_neighbor_int_common (struct vty *vty, struct ospf *ospf, int arg_ba if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -4022,7 +4019,7 @@ show_ip_ospf_nbr_nbma_detail_sub (struct vty *vty, struct ospf_interface *oi, st json_object_string_add(json_sub, "ifaceAddress", inet_ntoa (nbr_nbma->addr)); else vty_out (vty, " interface address %s%s", - inet_ntoa (nbr_nbma->addr), VTY_NEWLINE); + inet_ntoa (nbr_nbma->addr), VTYNL); /* Show Area ID. */ if (use_json) @@ -4032,7 +4029,7 @@ show_ip_ospf_nbr_nbma_detail_sub (struct vty *vty, struct ospf_interface *oi, st } else vty_out (vty, " In the area %s via interface %s%s", - ospf_area_desc_string (oi->area), IF_NAME (oi), VTY_NEWLINE); + ospf_area_desc_string (oi->area), IF_NAME (oi), VTYNL); /* Show neighbor priority and state. */ if (use_json) @@ -4048,13 +4045,13 @@ show_ip_ospf_nbr_nbma_detail_sub (struct vty *vty, struct ospf_interface *oi, st if (use_json) json_object_int_add(json_sub, "stateChangeCounter", nbr_nbma->state_change); else - vty_out (vty, " %d state changes%s", nbr_nbma->state_change, VTY_NEWLINE); + vty_out (vty, " %d state changes%s", nbr_nbma->state_change, VTYNL); /* Show PollInterval */ if (use_json) json_object_int_add(json_sub, "pollInterval", nbr_nbma->v_poll); else - vty_out (vty, " Poll interval %d%s", nbr_nbma->v_poll, VTY_NEWLINE); + vty_out (vty, " Poll interval %d%s", nbr_nbma->v_poll, VTYNL); /* Show poll-interval timer. */ if (use_json) @@ -4066,7 +4063,7 @@ show_ip_ospf_nbr_nbma_detail_sub (struct vty *vty, struct ospf_interface *oi, st else vty_out (vty, " Poll timer due in %s%s", ospf_timer_dump (nbr_nbma->t_poll, timebuf, sizeof(timebuf)), - VTY_NEWLINE); + VTYNL); /* Show poll-interval timer thread. */ if (use_json) @@ -4076,7 +4073,7 @@ show_ip_ospf_nbr_nbma_detail_sub (struct vty *vty, struct ospf_interface *oi, st } else vty_out (vty, " Thread Poll Timer %s%s", - nbr_nbma->t_poll != NULL ? "on" : "off", VTY_NEWLINE); + nbr_nbma->t_poll != NULL ? "on" : "off", VTYNL); if (use_json) json_object_object_add(json, "noNbrId", json_sub); @@ -4105,7 +4102,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, json_object_string_add(json_sub, "ifaceAddress", inet_ntoa (nbr->address.u.prefix4)); else vty_out (vty, " interface address %s%s", - inet_ntoa (nbr->address.u.prefix4), VTY_NEWLINE); + inet_ntoa (nbr->address.u.prefix4), VTYNL); /* Show Area ID. */ if (use_json) @@ -4115,7 +4112,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, } else vty_out (vty, " In the area %s via interface %s%s", - ospf_area_desc_string (oi->area), oi->ifp->name, VTY_NEWLINE); + ospf_area_desc_string (oi->area), oi->ifp->name, VTYNL); /* Show neighbor priority and state. */ if (use_json) @@ -4131,7 +4128,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, if (use_json) json_object_int_add(json_sub, "stateChangeCounter", nbr->state_change); else - vty_out (vty, " %d state changes%s", nbr->state_change, VTY_NEWLINE); + vty_out (vty, " %d state changes%s", nbr->state_change, VTYNL); if (nbr->ts_last_progress.tv_sec || nbr->ts_last_progress.tv_usec) { @@ -4146,10 +4143,10 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, else { vty_out (vty, " Most recent state change statistics:%s", - VTY_NEWLINE); + VTYNL); vty_out (vty, " Progressive change %s ago%s", ospf_timeval_dump (&res, timebuf, sizeof(timebuf)), - VTY_NEWLINE); + VTYNL); } } @@ -4170,7 +4167,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, vty_out (vty, " Regressive change %s ago, due to %s%s", ospf_timeval_dump (&res, timebuf, sizeof(timebuf)), (nbr->last_regress_str ? nbr->last_regress_str : "??"), - VTY_NEWLINE); + VTYNL); } } @@ -4184,7 +4181,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, if (use_json) json_object_string_add(json_sub, "routerDesignatedBackupId", inet_ntoa (nbr->bd_router)); else - vty_out (vty, " BDR is %s%s", inet_ntoa (nbr->bd_router), VTY_NEWLINE); + vty_out (vty, " BDR is %s%s", inet_ntoa (nbr->bd_router), VTYNL); /* Show options. */ if (use_json) @@ -4194,7 +4191,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, } else vty_out (vty, " Options %d %s%s", nbr->options, - ospf_options_dump (nbr->options), VTY_NEWLINE); + ospf_options_dump (nbr->options), VTYNL); /* Show Router Dead interval timer. */ if (use_json) @@ -4211,28 +4208,28 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, else vty_out (vty, " Dead timer due in %s%s", ospf_timer_dump (nbr->t_inactivity, timebuf, sizeof (timebuf)), - VTY_NEWLINE); + VTYNL); /* Show Database Summary list. */ if (use_json) json_object_int_add(json_sub, "databaseSummaryListCounter", ospf_db_summary_count (nbr)); else vty_out (vty, " Database Summary List %d%s", - ospf_db_summary_count (nbr), VTY_NEWLINE); + ospf_db_summary_count (nbr), VTYNL); /* Show Link State Request list. */ if (use_json) json_object_int_add(json_sub, "linkStateRequestListCounter", ospf_ls_request_count (nbr)); else vty_out (vty, " Link State Request List %ld%s", - ospf_ls_request_count (nbr), VTY_NEWLINE); + ospf_ls_request_count (nbr), VTYNL); /* Show Link State Retransmission list. */ if (use_json) json_object_int_add(json_sub, "linkStateRetransmissionListCounter", ospf_ls_retransmit_count (nbr)); else vty_out (vty, " Link State Retransmission List %ld%s", - ospf_ls_retransmit_count (nbr), VTY_NEWLINE); + ospf_ls_retransmit_count (nbr), VTYNL); /* Show inactivity timer thread. */ if (use_json) @@ -4242,7 +4239,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, } else vty_out (vty, " Thread Inactivity Timer %s%s", - nbr->t_inactivity != NULL ? "on" : "off", VTY_NEWLINE); + nbr->t_inactivity != NULL ? "on" : "off", VTYNL); /* Show Database Description retransmission thread. */ if (use_json) @@ -4252,7 +4249,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, } else vty_out (vty, " Thread Database Description Retransmision %s%s", - nbr->t_db_desc != NULL ? "on" : "off", VTY_NEWLINE); + nbr->t_db_desc != NULL ? "on" : "off", VTYNL); /* Show Link State Request Retransmission thread. */ if (use_json) @@ -4262,7 +4259,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, } else vty_out (vty, " Thread Link State Request Retransmission %s%s", - nbr->t_ls_req != NULL ? "on" : "off", VTY_NEWLINE); + nbr->t_ls_req != NULL ? "on" : "off", VTYNL); /* Show Link State Update Retransmission thread. */ if (use_json) @@ -4272,7 +4269,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi, } else vty_out (vty, " Thread Link State Update Retransmission %s%s%s", - nbr->t_ls_upd != NULL ? "on" : "off", VTY_NEWLINE, VTY_NEWLINE); + nbr->t_ls_upd != NULL ? "on" : "off", VTYNL, VTYNL); if (use_json) { @@ -4304,15 +4301,15 @@ show_ip_ospf_neighbor_id_common (struct vty *vty, struct ospf *ospf, if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } ret = inet_aton (argv[arg_base]->arg, &router_id); if (!ret) { if (!use_json) - vty_out (vty, "Please specify Neighbor ID by A.B.C.D%s", VTY_NEWLINE); + vty_out (vty, "Please specify Neighbor ID by A.B.C.D%s", VTYNL); return CMD_WARNING; } @@ -4326,11 +4323,11 @@ show_ip_ospf_neighbor_id_common (struct vty *vty, struct ospf *ospf, if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -4392,8 +4389,8 @@ show_ip_ospf_neighbor_detail_common (struct vty *vty, struct ospf *ospf, u_char if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi)) @@ -4418,11 +4415,11 @@ show_ip_ospf_neighbor_detail_common (struct vty *vty, struct ospf *ospf, u_char if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -4484,8 +4481,8 @@ show_ip_ospf_neighbor_detail_all_common (struct vty *vty, struct ospf *ospf, u_c if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi)) @@ -4514,12 +4511,12 @@ show_ip_ospf_neighbor_detail_all_common (struct vty *vty, struct ospf *ospf, u_c if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else { - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return CMD_SUCCESS; @@ -4587,15 +4584,15 @@ show_ip_ospf_neighbor_int_detail_common (struct vty *vty, struct ospf *ospf, if (use_json) json_object_int_add(json, "ospfInstance", ospf->instance); else - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); } ifp = if_lookup_by_name (argv[arg_base]->arg, VRF_DEFAULT); if (!ifp) { if (!use_json) - vty_out (vty, "No such interface.%s", VTY_NEWLINE); + vty_out (vty, "No such interface.%s", VTYNL); return CMD_WARNING; } @@ -4619,11 +4616,11 @@ show_ip_ospf_neighbor_int_detail_common (struct vty *vty, struct ospf *ospf, if (use_json) { - vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTY_NEWLINE); + vty_out (vty, "%s%s", json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY), VTYNL); json_object_free(json); } else - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -4729,7 +4726,7 @@ show_lsa_summary (struct vty *vty, struct ospf_lsa *lsa, int self) default: break; } - vty_out (vty, VTY_NEWLINE); + vty_out (vty, VTYNL); } return 0; @@ -4772,15 +4769,13 @@ show_ip_ospf_database_header (struct vty *vty, struct ospf_lsa *lsa) { struct router_lsa *rlsa = (struct router_lsa*) lsa->data; - vty_out (vty, " LS age: %d%s", LS_AGE (lsa), VTY_NEWLINE); - vty_out (vty, " Options: 0x%-2x : %s%s", - lsa->data->options, - ospf_options_dump(lsa->data->options), - VTY_NEWLINE); - vty_out (vty, " LS Flags: 0x%-2x %s%s", - lsa->flags, - ((lsa->flags & OSPF_LSA_LOCAL_XLT) ? "(Translated from Type-7)" : ""), - VTY_NEWLINE); + vty_outln (vty, " LS age: %d", LS_AGE (lsa)); + vty_outln (vty, " Options: 0x%-2x : %s", lsa->data->options, + ospf_options_dump(lsa->data->options)); + vty_outln (vty, " LS Flags: 0x%-2x %s", + lsa->flags, + ((lsa->flags & OSPF_LSA_LOCAL_XLT) ? + "(Translated from Type-7)" : "")); if (lsa->data->type == OSPF_ROUTER_LSA) { @@ -4793,19 +4788,16 @@ show_ip_ospf_database_header (struct vty *vty, struct ospf_lsa *lsa) IS_ROUTER_LSA_VIRTUAL (rlsa) ? " VL-endpoint" : "", IS_ROUTER_LSA_SHORTCUT (rlsa) ? " Shortcut" : ""); - vty_out (vty, "%s", VTY_NEWLINE); + vty_outln (vty, ""); } - vty_out (vty, " LS Type: %s%s", - lookup_msg(ospf_lsa_type_msg, lsa->data->type, NULL), VTY_NEWLINE); - vty_out (vty, " Link State ID: %s %s%s", inet_ntoa (lsa->data->id), - lookup_msg(ospf_link_state_id_type_msg, lsa->data->type, NULL), VTY_NEWLINE); - vty_out (vty, " Advertising Router: %s%s", - inet_ntoa (lsa->data->adv_router), VTY_NEWLINE); - vty_out (vty, " LS Seq Number: %08lx%s", (u_long)ntohl (lsa->data->ls_seqnum), - VTY_NEWLINE); - vty_out (vty, " Checksum: 0x%04x%s", ntohs (lsa->data->checksum), - VTY_NEWLINE); - vty_out (vty, " Length: %d%s", ntohs (lsa->data->length), VTY_NEWLINE); + vty_outln (vty, " LS Type: %s", + lookup_msg(ospf_lsa_type_msg, lsa->data->type, NULL)); + vty_outln (vty, " Link State ID: %s %s", inet_ntoa (lsa->data->id), + lookup_msg(ospf_link_state_id_type_msg, lsa->data->type, NULL)); + vty_outln (vty, " Advertising Router: %s", inet_ntoa (lsa->data->adv_router)); + vty_outln (vty, " LS Seq Number: %08lx", (u_long)ntohl (lsa->data->ls_seqnum)); + vty_outln (vty, " Checksum: 0x%04x", ntohs (lsa->data->checksum)); + vty_outln (vty, " Length: %d%s", ntohs (lsa->data->length), VTYNL); } const char *link_type_desc[] = @@ -4849,15 +4841,15 @@ show_ip_ospf_database_router_links (struct vty *vty, type = rl->link[i].type; vty_out (vty, " Link connected to: %s%s", - link_type_desc[type], VTY_NEWLINE); + link_type_desc[type], VTYNL); vty_out (vty, " (Link ID) %s: %s%s", link_id_desc[type], - inet_ntoa (rl->link[i].link_id), VTY_NEWLINE); + inet_ntoa (rl->link[i].link_id), VTYNL); vty_out (vty, " (Link Data) %s: %s%s", link_data_desc[type], - inet_ntoa (rl->link[i].link_data), VTY_NEWLINE); - vty_out (vty, " Number of TOS metrics: 0%s", VTY_NEWLINE); + inet_ntoa (rl->link[i].link_data), VTYNL); + vty_out (vty, " Number of TOS metrics: 0%s", VTYNL); vty_out (vty, " TOS 0 Metric: %d%s", - ntohs (rl->link[i].metric), VTY_NEWLINE); - vty_out (vty, "%s", VTY_NEWLINE); + ntohs (rl->link[i].metric), VTYNL); + vty_out (vty, "%s", VTYNL); } } @@ -4872,10 +4864,10 @@ show_router_lsa_detail (struct vty *vty, struct ospf_lsa *lsa) show_ip_ospf_database_header (vty, lsa); vty_out (vty, " Number of Links: %d%s%s", ntohs (rl->links), - VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL); show_ip_ospf_database_router_links (vty, rl); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return 0; @@ -4894,15 +4886,15 @@ show_network_lsa_detail (struct vty *vty, struct ospf_lsa *lsa) show_ip_ospf_database_header (vty, lsa); vty_out (vty, " Network Mask: /%d%s", - ip_masklen (nl->mask), VTY_NEWLINE); + ip_masklen (nl->mask), VTYNL); length = ntohs (lsa->data->length) - OSPF_LSA_HEADER_SIZE - 4; for (i = 0; length > 0; i++, length -= 4) vty_out (vty, " Attached Router: %s%s", - inet_ntoa (nl->routers[i]), VTY_NEWLINE); + inet_ntoa (nl->routers[i]), VTYNL); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return 0; @@ -4919,10 +4911,10 @@ show_summary_lsa_detail (struct vty *vty, struct ospf_lsa *lsa) show_ip_ospf_database_header (vty, lsa); vty_out (vty, " Network Mask: /%d%s", ip_masklen (sl->mask), - VTY_NEWLINE); + VTYNL); vty_out (vty, " TOS: 0 Metric: %d%s", GET_METRIC (sl->metric), - VTY_NEWLINE); - vty_out (vty, "%s", VTY_NEWLINE); + VTYNL); + vty_out (vty, "%s", VTYNL); } return 0; @@ -4939,10 +4931,10 @@ show_summary_asbr_lsa_detail (struct vty *vty, struct ospf_lsa *lsa) show_ip_ospf_database_header (vty, lsa); vty_out (vty, " Network Mask: /%d%s", - ip_masklen (sl->mask), VTY_NEWLINE); + ip_masklen (sl->mask), VTYNL); vty_out (vty, " TOS: 0 Metric: %d%s", GET_METRIC (sl->metric), - VTY_NEWLINE); - vty_out (vty, "%s", VTY_NEWLINE); + VTYNL); + vty_out (vty, "%s", VTYNL); } return 0; @@ -4959,18 +4951,18 @@ show_as_external_lsa_detail (struct vty *vty, struct ospf_lsa *lsa) show_ip_ospf_database_header (vty, lsa); vty_out (vty, " Network Mask: /%d%s", - ip_masklen (al->mask), VTY_NEWLINE); + ip_masklen (al->mask), VTYNL); vty_out (vty, " Metric Type: %s%s", IS_EXTERNAL_METRIC (al->e[0].tos) ? - "2 (Larger than any link state path)" : "1", VTY_NEWLINE); - vty_out (vty, " TOS: 0%s", VTY_NEWLINE); + "2 (Larger than any link state path)" : "1", VTYNL); + vty_out (vty, " TOS: 0%s", VTYNL); vty_out (vty, " Metric: %d%s", - GET_METRIC (al->e[0].metric), VTY_NEWLINE); + GET_METRIC (al->e[0].metric), VTYNL); vty_out (vty, " Forward Address: %s%s", - inet_ntoa (al->e[0].fwd_addr), VTY_NEWLINE); + inet_ntoa (al->e[0].fwd_addr), VTYNL); vty_out (vty, " External Route Tag: %"ROUTE_TAG_PRI"%s%s", - (route_tag_t)ntohl (al->e[0].route_tag), VTY_NEWLINE, VTY_NEWLINE); + (route_tag_t)ntohl (al->e[0].route_tag), VTYNL, VTYNL); } return 0; @@ -5011,18 +5003,18 @@ show_as_nssa_lsa_detail (struct vty *vty, struct ospf_lsa *lsa) show_ip_ospf_database_header (vty, lsa); vty_out (vty, " Network Mask: /%d%s", - ip_masklen (al->mask), VTY_NEWLINE); + ip_masklen (al->mask), VTYNL); vty_out (vty, " Metric Type: %s%s", IS_EXTERNAL_METRIC (al->e[0].tos) ? - "2 (Larger than any link state path)" : "1", VTY_NEWLINE); - vty_out (vty, " TOS: 0%s", VTY_NEWLINE); + "2 (Larger than any link state path)" : "1", VTYNL); + vty_out (vty, " TOS: 0%s", VTYNL); vty_out (vty, " Metric: %d%s", - GET_METRIC (al->e[0].metric), VTY_NEWLINE); + GET_METRIC (al->e[0].metric), VTYNL); vty_out (vty, " NSSA: Forward Address: %s%s", - inet_ntoa (al->e[0].fwd_addr), VTY_NEWLINE); + inet_ntoa (al->e[0].fwd_addr), VTYNL); vty_out (vty, " External Route Tag: %"ROUTE_TAG_PRI"%s%s", - (route_tag_t)ntohl (al->e[0].route_tag), VTY_NEWLINE, VTY_NEWLINE); + (route_tag_t)ntohl (al->e[0].route_tag), VTYNL, VTYNL); } return 0; @@ -5042,7 +5034,7 @@ show_opaque_lsa_detail (struct vty *vty, struct ospf_lsa *lsa) show_ip_ospf_database_header (vty, lsa); show_opaque_info_detail (vty, lsa); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return 0; } @@ -5122,15 +5114,15 @@ show_lsa_detail (struct vty *vty, struct ospf *ospf, int type, case OSPF_OPAQUE_AS_LSA: vty_out (vty, " %s %s%s", show_database_desc[type], - VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL); show_lsa_detail_proc (vty, AS_LSDB (ospf, type), id, adv_router); break; default: for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area)) { vty_out (vty, "%s %s (Area %s)%s%s", - VTY_NEWLINE, show_database_desc[type], - ospf_area_desc_string (area), VTY_NEWLINE, VTY_NEWLINE); + VTYNL, show_database_desc[type], + ospf_area_desc_string (area), VTYNL, VTYNL); show_lsa_detail_proc (vty, AREA_LSDB (area, type), id, adv_router); } break; @@ -5169,7 +5161,7 @@ show_lsa_detail_adv_router (struct vty *vty, struct ospf *ospf, int type, case OSPF_OPAQUE_AS_LSA: vty_out (vty, " %s %s%s", show_database_desc[type], - VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL); show_lsa_detail_adv_router_proc (vty, AS_LSDB (ospf, type), adv_router); break; @@ -5177,8 +5169,8 @@ show_lsa_detail_adv_router (struct vty *vty, struct ospf *ospf, int type, for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area)) { vty_out (vty, "%s %s (Area %s)%s%s", - VTY_NEWLINE, show_database_desc[type], - ospf_area_desc_string (area), VTY_NEWLINE, VTY_NEWLINE); + VTYNL, show_database_desc[type], + ospf_area_desc_string (area), VTYNL, VTYNL); show_lsa_detail_adv_router_proc (vty, AREA_LSDB (area, type), adv_router); } @@ -5213,13 +5205,13 @@ show_ip_ospf_database_summary (struct vty *vty, struct ospf *ospf, int self) vty_out (vty, " %s (Area %s)%s%s", show_database_desc[type], ospf_area_desc_string (area), - VTY_NEWLINE, VTY_NEWLINE); - vty_out (vty, "%s%s", show_database_header[type], VTY_NEWLINE); + VTYNL, VTYNL); + vty_out (vty, "%s%s", show_database_header[type], VTYNL); LSDB_LOOP (AREA_LSDB (area, type), rn, lsa) show_lsa_summary (vty, lsa, self); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } } @@ -5239,18 +5231,18 @@ show_ip_ospf_database_summary (struct vty *vty, struct ospf *ospf, int self) { vty_out (vty, " %s%s%s", show_database_desc[type], - VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL); vty_out (vty, "%s%s", show_database_header[type], - VTY_NEWLINE); + VTYNL); LSDB_LOOP (AS_LSDB (ospf, type), rn, lsa) show_lsa_summary (vty, lsa, self); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } static void @@ -5259,7 +5251,7 @@ show_ip_ospf_database_maxage (struct vty *vty, struct ospf *ospf) struct route_node *rn; vty_out (vty, "%s MaxAge Link States:%s%s", - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL, VTYNL); for (rn = route_top (ospf->maxage_lsa); rn; rn = route_next (rn)) { @@ -5267,13 +5259,13 @@ show_ip_ospf_database_maxage (struct vty *vty, struct ospf *ospf) if ((lsa = rn->info) != NULL) { - vty_out (vty, "Link type: %d%s", lsa->data->type, VTY_NEWLINE); + vty_out (vty, "Link type: %d%s", lsa->data->type, VTYNL); vty_out (vty, "Link State ID: %s%s", - inet_ntoa (lsa->data->id), VTY_NEWLINE); + inet_ntoa (lsa->data->id), VTYNL); vty_out (vty, "Advertising Router: %s%s", - inet_ntoa (lsa->data->adv_router), VTY_NEWLINE); - vty_out (vty, "LSA lock count: %d%s", lsa->lock, VTY_NEWLINE); - vty_out (vty, "%s", VTY_NEWLINE); + inet_ntoa (lsa->data->adv_router), VTYNL); + vty_out (vty, "LSA lock count: %d%s", lsa->lock, VTYNL); + vty_out (vty, "%s", VTYNL); } } } @@ -5306,11 +5298,11 @@ show_ip_ospf_database_common (struct vty *vty, struct ospf *ospf, struct in_addr id, adv_router; if (ospf->instance) - vty_out (vty, "%sOSPF Instance: %d%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s", VTYNL, ospf->instance, + VTYNL); - vty_out (vty, "%s OSPF Router with ID (%s)%s%s", VTY_NEWLINE, - inet_ntoa (ospf->router_id), VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%s OSPF Router with ID (%s)%s%s", VTYNL, + inet_ntoa (ospf->router_id), VTYNL, VTYNL); /* Show all LSA. */ if (argc == arg_base + 4) @@ -5465,11 +5457,11 @@ show_ip_ospf_database_type_adv_router_common (struct vty *vty, struct ospf *ospf struct in_addr adv_router; if (ospf->instance) - vty_out (vty, "%sOSPF Instance: %d%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s", VTYNL, ospf->instance, + VTYNL); - vty_out (vty, "%s OSPF Router with ID (%s)%s%s", VTY_NEWLINE, - inet_ntoa (ospf->router_id), VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%s OSPF Router with ID (%s)%s%s", VTYNL, + inet_ntoa (ospf->router_id), VTYNL, VTYNL); if (argc != arg_base + 7) return CMD_WARNING; @@ -5581,7 +5573,7 @@ DEFUN (ip_ospf_authentication_args, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -5605,7 +5597,7 @@ DEFUN (ip_ospf_authentication_args, return CMD_SUCCESS; } - vty_out (vty, "You shouldn't get here!%s", VTY_NEWLINE); + vty_out (vty, "You shouldn't get here!%s", VTYNL); return CMD_WARNING; } @@ -5631,7 +5623,7 @@ DEFUN (ip_ospf_authentication, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -5673,14 +5665,14 @@ DEFUN (no_ip_ospf_authentication_args, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } params = ospf_lookup_if_params (ifp, addr); if (params == NULL) { - vty_out (vty, "Ip Address specified is unknown%s", VTY_NEWLINE); + vty_out (vty, "Ip Address specified is unknown%s", VTYNL); return CMD_WARNING; } params->auth_type = OSPF_AUTH_NOTSET; @@ -5703,7 +5695,7 @@ DEFUN (no_ip_ospf_authentication_args, } else { - vty_out (vty, "Unexpected input encountered%s", VTY_NEWLINE); + vty_out (vty, "Unexpected input encountered%s", VTYNL); return CMD_WARNING; } /* @@ -5763,14 +5755,14 @@ DEFUN (no_ip_ospf_authentication, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } params = ospf_lookup_if_params (ifp, addr); if (params == NULL) { - vty_out (vty, "Ip Address specified is unknown%s", VTY_NEWLINE); + vty_out (vty, "Ip Address specified is unknown%s", VTYNL); return CMD_WARNING; } @@ -5843,7 +5835,7 @@ DEFUN (ip_ospf_authentication_key, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -5889,7 +5881,7 @@ DEFUN (no_ip_ospf_authentication_key, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -5951,7 +5943,7 @@ DEFUN (ip_ospf_message_digest_key, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -5962,7 +5954,7 @@ DEFUN (ip_ospf_message_digest_key, key_id = strtol (keyid, NULL, 10); if (ospf_crypt_key_lookup (params->auth_crypt, key_id) != NULL) { - vty_out (vty, "OSPF: Key %d already exists%s", key_id, VTY_NEWLINE); + vty_out (vty, "OSPF: Key %d already exists%s", key_id, VTYNL); return CMD_WARNING; } @@ -6018,7 +6010,7 @@ DEFUN (no_ip_ospf_message_digest_key, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6031,7 +6023,7 @@ DEFUN (no_ip_ospf_message_digest_key, ck = ospf_crypt_key_lookup (params->auth_crypt, key_id); if (ck == NULL) { - vty_out (vty, "OSPF: Key %d does not exist%s", key_id, VTY_NEWLINE); + vty_out (vty, "OSPF: Key %d does not exist%s", key_id, VTYNL); return CMD_WARNING; } @@ -6086,7 +6078,7 @@ DEFUN (ip_ospf_cost, if(!inet_aton(ifaddr, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6141,7 +6133,7 @@ DEFUN (no_ip_ospf_cost, if (!inet_aton(ifaddr, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6213,7 +6205,7 @@ ospf_vty_dead_interval_set (struct vty *vty, const char *interval_str, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6240,7 +6232,7 @@ ospf_vty_dead_interval_set (struct vty *vty, const char *interval_str, else { vty_out (vty, "Please specify dead-interval or hello-multiplier%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6340,7 +6332,7 @@ DEFUN (no_ip_ospf_dead_interval, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6419,7 +6411,7 @@ DEFUN (ip_ospf_hello_interval, if(!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6466,7 +6458,7 @@ DEFUN (no_ip_ospf_hello_interval, if(!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6517,7 +6509,7 @@ DEFUN (ip_ospf_network, if (old_type == OSPF_IFTYPE_LOOPBACK) { - vty_out (vty, "This is a loopback interface. Can't set network type.%s", VTY_NEWLINE); + vty_out (vty, "This is a loopback interface. Can't set network type.%s", VTYNL); return CMD_WARNING; } @@ -6646,7 +6638,7 @@ DEFUN (ip_ospf_priority, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6708,7 +6700,7 @@ DEFUN (no_ip_ospf_priority, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6779,7 +6771,7 @@ DEFUN (ip_ospf_retransmit_interval, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6826,7 +6818,7 @@ DEFUN (no_ip_ospf_retransmit_interval, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6883,7 +6875,7 @@ DEFUN (ip_ospf_transmit_delay, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -6929,7 +6921,7 @@ DEFUN (no_ip_ospf_transmit_delay, if (!inet_aton(argv[idx]->arg, &addr)) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -7007,12 +6999,12 @@ DEFUN (ip_ospf_area, if (ret < 0) { vty_out (vty, "Please specify area by A.B.C.D|<0-4294967295>%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } if (memcmp (ifp->name, "VLINK", 5) == 0) { - vty_out (vty, "Cannot enable OSPF on a virtual link.%s", VTY_NEWLINE); + vty_out (vty, "Cannot enable OSPF on a virtual link.%s", VTYNL); return CMD_WARNING; } @@ -7021,7 +7013,7 @@ DEFUN (ip_ospf_area, { vty_out (vty, "Must remove previous area config before changing ospf area %s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -7044,7 +7036,7 @@ DEFUN (ip_ospf_area, { if (rn->info != NULL) { - vty_out (vty, "Please remove all network commands first.%s", VTY_NEWLINE); + vty_out (vty, "Please remove all network commands first.%s", VTYNL); return CMD_WARNING; } } @@ -7097,8 +7089,7 @@ DEFUN (no_ip_ospf_area, if (!OSPF_IF_PARAM_CONFIGURED(params, if_area)) { - vty_out (vty, "Can't find specified interface area configuration.%s", - VTY_NEWLINE); + vty_outln (vty, "Can't find specified interface area configuration."); return CMD_WARNING; } @@ -7234,14 +7225,14 @@ DEFUN (ospf_redistribute_instance_source, if ((source == ZEBRA_ROUTE_OSPF) && !ospf->instance) { vty_out (vty, "Instance redistribution in non-instanced OSPF not allowed%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } if ((source == ZEBRA_ROUTE_OSPF) && (ospf->instance == instance)) { vty_out (vty, "Same instance OSPF redistribution not allowed%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -7300,14 +7291,14 @@ DEFUN (no_ospf_redistribute_instance_source, if ((source == ZEBRA_ROUTE_OSPF) && !ospf->instance) { vty_out (vty, "Instance redistribution in non-instanced OSPF not allowed%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } if ((source == ZEBRA_ROUTE_OSPF) && (ospf->instance == instance)) { vty_out (vty, "Same instance OSPF redistribution not allowed%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } @@ -7672,7 +7663,7 @@ DEFUN (ip_ospf_mtu_ignore, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } params = ospf_get_if_params (ifp, addr); @@ -7715,7 +7706,7 @@ DEFUN (no_ip_ospf_mtu_ignore, if (!ret) { vty_out (vty, "Please specify interface address by A.B.C.D%s", - VTY_NEWLINE); + VTYNL); return CMD_WARNING; } params = ospf_get_if_params (ifp, addr); @@ -7895,16 +7886,16 @@ config_write_stub_router (struct vty *vty, struct ospf *ospf) if (ospf->stub_router_startup_time != OSPF_STUB_ROUTER_UNCONFIGURED) vty_out (vty, " max-metric router-lsa on-startup %u%s", - ospf->stub_router_startup_time, VTY_NEWLINE); + ospf->stub_router_startup_time, VTYNL); if (ospf->stub_router_shutdown_time != OSPF_STUB_ROUTER_UNCONFIGURED) vty_out (vty, " max-metric router-lsa on-shutdown %u%s", - ospf->stub_router_shutdown_time, VTY_NEWLINE); + ospf->stub_router_shutdown_time, VTYNL); for (ALL_LIST_ELEMENTS_RO (ospf->areas, ln, area)) { if (CHECK_FLAG (area->stub_router_state, OSPF_AREA_ADMIN_STUB_ROUTED)) { vty_out (vty, " max-metric router-lsa administrative%s", - VTY_NEWLINE); + VTYNL); break; } } @@ -7920,7 +7911,7 @@ show_ip_ospf_route_network (struct vty *vty, struct route_table *rt) struct ospf_path *path; vty_out (vty, "============ OSPF network routing table ============%s", - VTY_NEWLINE); + VTYNL); for (rn = route_top (rt); rn; rn = route_next (rn)) if ((or = rn->info) != NULL) @@ -7934,13 +7925,13 @@ show_ip_ospf_route_network (struct vty *vty, struct route_table *rt) case OSPF_PATH_INTER_AREA: if (or->type == OSPF_DESTINATION_NETWORK) vty_out (vty, "N IA %-18s [%d] area: %s%s", buf1, or->cost, - inet_ntoa (or->u.std.area_id), VTY_NEWLINE); + inet_ntoa (or->u.std.area_id), VTYNL); else if (or->type == OSPF_DESTINATION_DISCARD) - vty_out (vty, "D IA %-18s Discard entry%s", buf1, VTY_NEWLINE); + vty_out (vty, "D IA %-18s Discard entry%s", buf1, VTYNL); break; case OSPF_PATH_INTRA_AREA: vty_out (vty, "N %-18s [%d] area: %s%s", buf1, or->cost, - inet_ntoa (or->u.std.area_id), VTY_NEWLINE); + inet_ntoa (or->u.std.area_id), VTYNL); break; default: break; @@ -7953,15 +7944,15 @@ show_ip_ospf_route_network (struct vty *vty, struct route_table *rt) { if (path->nexthop.s_addr == 0) vty_out (vty, "%24s directly attached to %s%s", - "", ifindex2ifname (path->ifindex, VRF_DEFAULT), VTY_NEWLINE); + "", ifindex2ifname (path->ifindex, VRF_DEFAULT), VTYNL); else vty_out (vty, "%24s via %s, %s%s", "", inet_ntoa (path->nexthop), - ifindex2ifname (path->ifindex, VRF_DEFAULT), VTY_NEWLINE); + ifindex2ifname (path->ifindex, VRF_DEFAULT), VTYNL); } } } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } static void @@ -7974,7 +7965,7 @@ show_ip_ospf_route_router (struct vty *vty, struct route_table *rtrs) struct ospf_path *path; vty_out (vty, "============ OSPF router routing table =============%s", - VTY_NEWLINE); + VTYNL); for (rn = route_top (rtrs); rn; rn = route_next (rn)) if (rn->info) { @@ -7995,7 +7986,7 @@ show_ip_ospf_route_router (struct vty *vty, struct route_table *rtrs) vty_out (vty, "%s%s%s", (or->u.std.flags & ROUTER_LSA_BORDER ? ", ABR" : ""), (or->u.std.flags & ROUTER_LSA_EXTERNAL ? ", ASBR" : ""), - VTY_NEWLINE); + VTYNL); for (ALL_LIST_ELEMENTS_RO (or->paths, pnode, path)) { @@ -8004,17 +7995,17 @@ show_ip_ospf_route_router (struct vty *vty, struct route_table *rtrs) if (path->nexthop.s_addr == 0) vty_out (vty, "%24s directly attached to %s%s", "", ifindex2ifname (path->ifindex, VRF_DEFAULT), - VTY_NEWLINE); + VTYNL); else vty_out (vty, "%24s via %s, %s%s", "", inet_ntoa (path->nexthop), ifindex2ifname (path->ifindex, VRF_DEFAULT), - VTY_NEWLINE); + VTYNL); } } } } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } static void @@ -8026,7 +8017,7 @@ show_ip_ospf_route_external (struct vty *vty, struct route_table *rt) struct ospf_path *path; vty_out (vty, "============ OSPF external routing table ===========%s", - VTY_NEWLINE); + VTYNL); for (rn = route_top (rt); rn; rn = route_next (rn)) if ((er = rn->info) != NULL) { @@ -8038,11 +8029,11 @@ show_ip_ospf_route_external (struct vty *vty, struct route_table *rt) { case OSPF_PATH_TYPE1_EXTERNAL: vty_out (vty, "N E1 %-18s [%d] tag: %"ROUTE_TAG_PRI"%s", buf1, - er->cost, er->u.ext.tag, VTY_NEWLINE); + er->cost, er->u.ext.tag, VTYNL); break; case OSPF_PATH_TYPE2_EXTERNAL: vty_out (vty, "N E2 %-18s [%d/%d] tag: %"ROUTE_TAG_PRI"%s", buf1, er->cost, - er->u.ext.type2_cost, er->u.ext.tag, VTY_NEWLINE); + er->u.ext.type2_cost, er->u.ext.tag, VTYNL); break; } @@ -8052,28 +8043,28 @@ show_ip_ospf_route_external (struct vty *vty, struct route_table *rt) { if (path->nexthop.s_addr == 0) vty_out (vty, "%24s directly attached to %s%s", - "", ifindex2ifname (path->ifindex, VRF_DEFAULT), VTY_NEWLINE); + "", ifindex2ifname (path->ifindex, VRF_DEFAULT), VTYNL); else vty_out (vty, "%24s via %s, %s%s", "", inet_ntoa (path->nexthop), ifindex2ifname (path->ifindex, VRF_DEFAULT), - VTY_NEWLINE); + VTYNL); } } } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } static int show_ip_ospf_border_routers_common (struct vty *vty, struct ospf *ospf) { if (ospf->instance) - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); if (ospf->new_table == NULL) { - vty_out (vty, "No OSPF routing information exist%s", VTY_NEWLINE); + vty_out (vty, "No OSPF routing information exist%s", VTYNL); return CMD_SUCCESS; } @@ -8083,7 +8074,7 @@ show_ip_ospf_border_routers_common (struct vty *vty, struct ospf *ospf) /* Show Router routes. */ show_ip_ospf_route_router (vty, ospf->new_rtrs); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -8128,12 +8119,12 @@ static int show_ip_ospf_route_common (struct vty *vty, struct ospf *ospf) { if (ospf->instance) - vty_out (vty, "%sOSPF Instance: %d%s%s", VTY_NEWLINE, ospf->instance, - VTY_NEWLINE, VTY_NEWLINE); + vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance, + VTYNL, VTYNL); if (ospf->new_table == NULL) { - vty_out (vty, "No OSPF routing information exist%s", VTY_NEWLINE); + vty_out (vty, "No OSPF routing information exist%s", VTYNL); return CMD_SUCCESS; } @@ -8146,7 +8137,7 @@ show_ip_ospf_route_common (struct vty *vty, struct ospf *ospf) /* Show AS External routes. */ show_ip_ospf_route_external (vty, ospf->old_external_route); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); return CMD_SUCCESS; } @@ -8234,12 +8225,12 @@ config_write_interface (struct vty *vty) if (ifp->ifindex == IFINDEX_DELETED) continue; - vty_out (vty, "!%s", VTY_NEWLINE); + vty_out (vty, "!%s", VTYNL); vty_out (vty, "interface %s%s", ifp->name, - VTY_NEWLINE); + VTYNL); if (ifp->desc) vty_out (vty, " description %s%s", ifp->desc, - VTY_NEWLINE); + VTYNL); write++; @@ -8256,7 +8247,7 @@ config_write_interface (struct vty *vty) ospf_int_type_str[params->type]); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } @@ -8291,7 +8282,7 @@ config_write_interface (struct vty *vty) vty_out (vty, " ip ospf authentication%s", auth_str); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Simple Authentication Password print. */ @@ -8302,7 +8293,7 @@ config_write_interface (struct vty *vty) params->auth_simple); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Cryptographic Authentication Key print. */ @@ -8312,7 +8303,7 @@ config_write_interface (struct vty *vty) ck->key_id, ck->auth_key); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Interface Output Cost print. */ @@ -8321,7 +8312,7 @@ config_write_interface (struct vty *vty) vty_out (vty, " ip ospf cost %u", params->output_cost_cmd); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Hello Interval print. */ @@ -8331,7 +8322,7 @@ config_write_interface (struct vty *vty) vty_out (vty, " ip ospf hello-interval %u", params->v_hello); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } @@ -8350,7 +8341,7 @@ config_write_interface (struct vty *vty) if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Router Priority print. */ @@ -8360,7 +8351,7 @@ config_write_interface (struct vty *vty) vty_out (vty, " ip ospf priority %u", params->priority); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Retransmit Interval print. */ @@ -8371,7 +8362,7 @@ config_write_interface (struct vty *vty) params->retransmit_interval); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Transmit Delay print. */ @@ -8381,7 +8372,7 @@ config_write_interface (struct vty *vty) vty_out (vty, " ip ospf transmit-delay %u", params->transmit_delay); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } /* Area print. */ @@ -8395,7 +8386,7 @@ config_write_interface (struct vty *vty) vty_out (vty, " area %s", inet_ntoa (params->if_area)); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, VTYNL); } /* bfd print. */ @@ -8411,7 +8402,7 @@ config_write_interface (struct vty *vty) vty_out (vty, " ip ospf mtu-ignore"); if (params != IF_DEF_PARAMS (ifp)) vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } @@ -8460,7 +8451,7 @@ config_write_network_area (struct vty *vty, struct ospf *ospf) /* Network print. */ vty_out (vty, " network %s/%d area %s%s", inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen, - buf, VTY_NEWLINE); + buf, VTYNL); } return 0; @@ -8484,16 +8475,16 @@ config_write_ospf_area (struct vty *vty, struct ospf *ospf) if (area->auth_type != OSPF_AUTH_NULL) { if (area->auth_type == OSPF_AUTH_SIMPLE) - vty_out (vty, " area %s authentication%s", buf, VTY_NEWLINE); + vty_out (vty, " area %s authentication%s", buf, VTYNL); else vty_out (vty, " area %s authentication message-digest%s", - buf, VTY_NEWLINE); + buf, VTYNL); } if (area->shortcut_configured != OSPF_SHORTCUT_DEFAULT) vty_out (vty, " area %s shortcut %s%s", buf, ospf_shortcut_mode_str[area->shortcut_configured], - VTY_NEWLINE); + VTYNL); if ((area->external_routing == OSPF_AREA_STUB) || (area->external_routing == OSPF_AREA_NSSA) @@ -8521,11 +8512,11 @@ config_write_ospf_area (struct vty *vty, struct ospf *ospf) if (area->no_summary) vty_out (vty, " no-summary"); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); if (area->default_cost != 1) vty_out (vty, " area %s default-cost %d%s", buf, - area->default_cost, VTY_NEWLINE); + area->default_cost, VTYNL); } for (rn1 = route_top (area->ranges); rn1; rn1 = route_next (rn1)) @@ -8546,24 +8537,24 @@ config_write_ospf_area (struct vty *vty, struct ospf *ospf) vty_out (vty, " substitute %s/%d", inet_ntoa (range->subst_addr), range->subst_masklen); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } if (EXPORT_NAME (area)) vty_out (vty, " area %s export-list %s%s", buf, - EXPORT_NAME (area), VTY_NEWLINE); + EXPORT_NAME (area), VTYNL); if (IMPORT_NAME (area)) vty_out (vty, " area %s import-list %s%s", buf, - IMPORT_NAME (area), VTY_NEWLINE); + IMPORT_NAME (area), VTYNL); if (PREFIX_NAME_IN (area)) vty_out (vty, " area %s filter-list prefix %s in%s", buf, - PREFIX_NAME_IN (area), VTY_NEWLINE); + PREFIX_NAME_IN (area), VTYNL); if (PREFIX_NAME_OUT (area)) vty_out (vty, " area %s filter-list prefix %s out%s", buf, - PREFIX_NAME_OUT (area), VTY_NEWLINE); + PREFIX_NAME_OUT (area), VTYNL); } return 0; @@ -8587,7 +8578,7 @@ config_write_ospf_nbr_nbma (struct vty *vty, struct ospf *ospf) if (nbr_nbma->v_poll != OSPF_POLL_INTERVAL_DEFAULT) vty_out (vty, " poll-interval %d", nbr_nbma->v_poll); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } return 0; @@ -8626,17 +8617,17 @@ config_write_virtual_link (struct vty *vty, struct ospf *ospf) OSPF_IF_PARAM (oi, retransmit_interval), OSPF_IF_PARAM (oi, transmit_delay), OSPF_IF_PARAM (oi, v_wait), - VTY_NEWLINE); + VTYNL); else vty_out (vty, " area %s virtual-link %s%s", buf, - inet_ntoa (vl_data->vl_peer), VTY_NEWLINE); + inet_ntoa (vl_data->vl_peer), VTYNL); /* Auth key */ if (IF_DEF_PARAMS (vl_data->vl_oi->ifp)->auth_simple[0] != '\0') vty_out (vty, " area %s virtual-link %s authentication-key %s%s", buf, inet_ntoa (vl_data->vl_peer), IF_DEF_PARAMS (vl_data->vl_oi->ifp)->auth_simple, - VTY_NEWLINE); + VTYNL); /* md5 keys */ for (ALL_LIST_ELEMENTS_RO (IF_DEF_PARAMS (vl_data->vl_oi->ifp)->auth_crypt, n2, ck)) @@ -8644,7 +8635,7 @@ config_write_virtual_link (struct vty *vty, struct ospf *ospf) " message-digest-key %d md5 %s%s", buf, inet_ntoa (vl_data->vl_peer), - ck->key_id, ck->auth_key, VTY_NEWLINE); + ck->key_id, ck->auth_key, VTYNL); } } @@ -8684,7 +8675,7 @@ config_write_ospf_redistribute (struct vty *vty, struct ospf *ospf) if (ROUTEMAP_NAME (red)) vty_out (vty, " route-map %s", ROUTEMAP_NAME (red)); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } @@ -8696,7 +8687,7 @@ config_write_ospf_default_metric (struct vty *vty, struct ospf *ospf) { if (ospf->default_metric != -1) vty_out (vty, " default-metric %d%s", ospf->default_metric, - VTY_NEWLINE); + VTYNL); return 0; } @@ -8713,7 +8704,7 @@ config_write_ospf_distribute (struct vty *vty, struct ospf *ospf) if (DISTRIBUTE_NAME (ospf, type)) vty_out (vty, " distribute-list %s out %s%s", DISTRIBUTE_NAME (ospf, type), - zebra_route_string(type), VTY_NEWLINE); + zebra_route_string(type), VTYNL); /* default-information print. */ if (ospf->default_originate != DEFAULT_ORIGINATE_NONE) @@ -8736,7 +8727,7 @@ config_write_ospf_distribute (struct vty *vty, struct ospf *ospf) ROUTEMAP_NAME (red)); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } @@ -8751,7 +8742,7 @@ config_write_ospf_distance (struct vty *vty, struct ospf *ospf) struct ospf_distance *odistance; if (ospf->distance_all) - vty_out (vty, " distance %d%s", ospf->distance_all, VTY_NEWLINE); + vty_out (vty, " distance %d%s", ospf->distance_all, VTYNL); if (ospf->distance_intra || ospf->distance_inter @@ -8766,7 +8757,7 @@ config_write_ospf_distance (struct vty *vty, struct ospf *ospf) if (ospf->distance_external) vty_out (vty, " external %d", ospf->distance_external); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } for (rn = route_top (ospf->distance_table); rn; rn = route_next (rn)) @@ -8775,7 +8766,7 @@ config_write_ospf_distance (struct vty *vty, struct ospf *ospf) vty_out (vty, " distance %d %s/%d %s%s", odistance->distance, inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen, odistance->access_list ? odistance->access_list : "", - VTY_NEWLINE); + VTYNL); } return 0; } @@ -8795,9 +8786,9 @@ ospf_config_write (struct vty *vty) { /* `router ospf' print. */ if (ospf->instance) - vty_out (vty, "router ospf %d%s", ospf->instance, VTY_NEWLINE); + vty_out (vty, "router ospf %d%s", ospf->instance, VTYNL); else - vty_out (vty, "router ospf%s", VTY_NEWLINE); + vty_out (vty, "router ospf%s", VTYNL); write++; @@ -8807,37 +8798,37 @@ ospf_config_write (struct vty *vty) /* Router ID print. */ if (ospf->router_id_static.s_addr != 0) vty_out (vty, " ospf router-id %s%s", - inet_ntoa (ospf->router_id_static), VTY_NEWLINE); + inet_ntoa (ospf->router_id_static), VTYNL); /* ABR type print. */ if (ospf->abr_type != OSPF_ABR_DEFAULT) vty_out (vty, " ospf abr-type %s%s", - ospf_abr_type_str[ospf->abr_type], VTY_NEWLINE); + ospf_abr_type_str[ospf->abr_type], VTYNL); /* log-adjacency-changes flag print. */ if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES)) { if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_DETAIL)) - vty_out(vty, " log-adjacency-changes detail%s", VTY_NEWLINE); + vty_out(vty, " log-adjacency-changes detail%s", VTYNL); else if (!DFLT_OSPF_LOG_ADJACENCY_CHANGES) - vty_out(vty, " log-adjacency-changes%s", VTY_NEWLINE); + vty_out(vty, " log-adjacency-changes%s", VTYNL); } else if (DFLT_OSPF_LOG_ADJACENCY_CHANGES) { - vty_out(vty, " no log-adjacency-changes%s", VTY_NEWLINE); + vty_out(vty, " no log-adjacency-changes%s", VTYNL); } /* RFC1583 compatibility flag print -- Compatible with CISCO 12.1. */ if (CHECK_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE)) - vty_out (vty, " compatible rfc1583%s", VTY_NEWLINE); + vty_out (vty, " compatible rfc1583%s", VTYNL); /* auto-cost reference-bandwidth configuration. */ if (ospf->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH) { vty_out (vty, "! Important: ensure reference bandwidth " - "is consistent across all routers%s", VTY_NEWLINE); + "is consistent across all routers%s", VTYNL); vty_out (vty, " auto-cost reference-bandwidth %d%s", - ospf->ref_bandwidth, VTY_NEWLINE); + ospf->ref_bandwidth, VTYNL); } /* SPF timers print. */ @@ -8846,20 +8837,20 @@ ospf_config_write (struct vty *vty) ospf->spf_max_holdtime != OSPF_SPF_MAX_HOLDTIME_DEFAULT) vty_out (vty, " timers throttle spf %d %d %d%s", ospf->spf_delay, ospf->spf_holdtime, - ospf->spf_max_holdtime, VTY_NEWLINE); + ospf->spf_max_holdtime, VTYNL); /* LSA timers print. */ if (ospf->min_ls_interval != OSPF_MIN_LS_INTERVAL) vty_out (vty, " timers throttle lsa all %d%s", - ospf->min_ls_interval, VTY_NEWLINE); + ospf->min_ls_interval, VTYNL); if (ospf->min_ls_arrival != OSPF_MIN_LS_ARRIVAL) vty_out (vty, " timers lsa min-arrival %d%s", - ospf->min_ls_arrival, VTY_NEWLINE); + ospf->min_ls_arrival, VTYNL); /* Write multiplier print. */ if (ospf->write_oi_count != OSPF_WRITE_INTERFACE_COUNT_DEFAULT) vty_out (vty, " ospf write-multiplier %d%s", - ospf->write_oi_count, VTY_NEWLINE); + ospf->write_oi_count, VTYNL); /* Max-metric router-lsa print */ config_write_stub_router (vty, ospf); @@ -8867,14 +8858,14 @@ ospf_config_write (struct vty *vty) /* SPF refresh parameters print. */ if (ospf->lsa_refresh_interval != OSPF_LSA_REFRESH_INTERVAL_DEFAULT) vty_out (vty, " refresh timer %d%s", - ospf->lsa_refresh_interval, VTY_NEWLINE); + ospf->lsa_refresh_interval, VTYNL); /* Redistribute information print. */ config_write_ospf_redistribute (vty, ospf); /* passive-interface print. */ if (ospf->passive_interface_default == OSPF_IF_PASSIVE) - vty_out (vty, " passive-interface default%s", VTY_NEWLINE); + vty_out (vty, " passive-interface default%s", VTYNL); for (ALL_LIST_ELEMENTS_RO (om->iflist, node, ifp)) if (OSPF_IF_PARAM_CONFIGURED (IF_DEF_PARAMS (ifp), passive_interface) @@ -8883,7 +8874,7 @@ ospf_config_write (struct vty *vty) { vty_out (vty, " %spassive-interface %s%s", IF_DEF_PARAMS (ifp)->passive_interface ? "" : "no ", - ifp->name, VTY_NEWLINE); + ifp->name, VTYNL); } for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi)) { @@ -8901,7 +8892,7 @@ ospf_config_write (struct vty *vty) vty_out (vty, " %spassive-interface %s %s%s", oi->params->passive_interface ? "" : "no ", oi->ifp->name, - inet_ntoa (oi->address->u.prefix4), VTY_NEWLINE); + inet_ntoa (oi->address->u.prefix4), VTYNL); } /* Network area print. */ @@ -9132,7 +9123,7 @@ DEFUN (clear_ip_ospf_interface, else /* Interface name is specified. */ { if ((ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT)) == NULL) - vty_out (vty, "No such interface name%s", VTY_NEWLINE); + vty_out (vty, "No such interface name%s", VTYNL); else ospf_interface_clear(ifp); } diff --git a/ospfd/ospf_vty.h b/ospfd/ospf_vty.h index 6a34e99de..0bb5b6f3f 100644 --- a/ospfd/ospf_vty.h +++ b/ospfd/ospf_vty.h @@ -28,7 +28,7 @@ retv = str2area_id ((STR), &(V), &(F)); \ if (retv < 0) \ { \ - vty_out (vty, "%% Invalid OSPF area ID%s", VTY_NEWLINE); \ + vty_out (vty, "%% Invalid OSPF area ID%s", VTYNL); \ return CMD_WARNING; \ } \ } @@ -39,13 +39,13 @@ retv = str2area_id ((STR), &(V), &(F)); \ if (retv < 0) \ { \ - vty_out (vty, "%% Invalid OSPF area ID%s", VTY_NEWLINE); \ + vty_out (vty, "%% Invalid OSPF area ID%s", VTYNL); \ return CMD_WARNING; \ } \ if (OSPF_IS_AREA_ID_BACKBONE ((V))) \ { \ vty_out (vty, "%% You can't configure %s to backbone%s", \ - NAME, VTY_NEWLINE); \ + NAME, VTYNL); \ } \ } diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index dc784fb8e..0e0933adf 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -225,7 +225,7 @@ static void pim_show_assert_internal(struct vty *vty) "ECA: Evaluate CouldAssert%s" "ATD: AssertTrackingDesired%s" "eATD: Evaluate AssertTrackingDesired%s", - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL, VTYNL, VTYNL); vty_outln (vty, "Interface Address Source Group CA eCA ATD eATD"); @@ -1573,7 +1573,7 @@ pim_show_state(struct vty *vty, const char *src_or_group, const char *group, u_c } else { vty_out(vty, "Codes: J -> Pim Join, I -> IGMP Report, S -> Source, * -> Inherited from (*,G)"); vty_outln (vty, "%sInstalled Source Group IIF OIL", - VTY_NEWLINE); + VTYNL); } for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) { @@ -2157,12 +2157,12 @@ static void show_rpf_refresh_stats(struct vty *vty, time_t now, json_object *jso "RPF Cache Refresh Last: %s%s" "Nexthop Lookups: %lld%s" "Nexthop Lookups Avoided: %lld", - qpim_rpf_cache_refresh_delay_msec, VTY_NEWLINE, - pim_time_timer_remain_msec(qpim_rpf_cache_refresher), VTY_NEWLINE, - (long long)qpim_rpf_cache_refresh_requests, VTY_NEWLINE, - (long long)qpim_rpf_cache_refresh_events, VTY_NEWLINE, - refresh_uptime, VTY_NEWLINE, - (long long) qpim_nexthop_lookups, VTY_NEWLINE, + qpim_rpf_cache_refresh_delay_msec, VTYNL, + pim_time_timer_remain_msec(qpim_rpf_cache_refresher), VTYNL, + (long long)qpim_rpf_cache_refresh_requests, VTYNL, + (long long)qpim_rpf_cache_refresh_events, VTYNL, + refresh_uptime, VTYNL, + (long long) qpim_nexthop_lookups, VTYNL, (long long)nexthop_lookups_avoided); } } @@ -2181,8 +2181,8 @@ static void show_scan_oil_stats(struct vty *vty, time_t now) "Scan OIL - Last: %s Events: %lld%s" "MFC Add - Last: %s Events: %lld%s" "MFC Del - Last: %s Events: %lld", - uptime_scan_oil, (long long) qpim_scan_oil_events, VTY_NEWLINE, - uptime_mroute_add, (long long) qpim_mroute_add_events, VTY_NEWLINE, + uptime_scan_oil, (long long) qpim_scan_oil_events, VTYNL, + uptime_mroute_add, (long long) qpim_mroute_add_events, VTYNL, uptime_mroute_del, (long long)qpim_mroute_del_events); } @@ -3221,7 +3221,7 @@ static void show_multicast_interfaces(struct vty *vty) pim_ifp->mroute_vif_index, errno, safe_strerror(errno), - VTY_NEWLINE); + VTYNL); } ifaddr = pim_ifp->primary_address; diff --git a/ripd/ripd.c b/ripd/ripd.c index 4505c718b..c05104b29 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -3479,7 +3479,7 @@ DEFUN (show_ip_rip, " (n) - normal, (s) - static, (d) - default, (r) - redistribute,%s" " (i) - interface%s%s" " Network Next Hop Metric From Tag Time", - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL, VTYNL, VTYNL, VTYNL); for (np = route_top (rip->table); np; np = route_next (np)) if ((list = np->info) != NULL) diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index ff6af2b1d..51f1a4009 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -194,7 +194,7 @@ ripng_peer_display (struct vty *vty) for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer)) { vty_outln (vty, " %s %s%14s %10d %10d %10d %s", inet6_ntoa (peer->addr), - VTY_NEWLINE, " ", + VTYNL, " ", peer->recv_badpackets, peer->recv_badroutes, ZEBRA_RIPNG_DISTANCE_DEFAULT, ripng_peer_uptime(peer, timebuf, RIPNG_UPTIME_LEN)); diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 80c3eba21..78bf350c9 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -2009,8 +2009,8 @@ DEFUN (show_ipv6_ripng, " (n) - normal, (s) - static, (d) - default, (r) - redistribute,%s" " (i) - interface, (a/S) - aggregated/Suppressed%s%s" " Network Next Hop Via Metric Tag Time", - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, - VTY_NEWLINE, VTY_NEWLINE); + VTYNL, VTYNL, VTYNL, + VTYNL, VTYNL); for (rp = route_top (ripng->table); rp; rp = route_next (rp)) { @@ -2425,7 +2425,7 @@ DEFUN (ripng_update_timer, update = strtoul (argv[0], &endptr, 10); if (update == ULONG_MAX || *endptr != '\0') { - vty_out (vty, "update timer value error%s", VTY_NEWLINE); + vty_out (vty, "update timer value error%s", VTYNL); return CMD_WARNING; } @@ -2460,7 +2460,7 @@ DEFUN (ripng_timeout_timer, timeout = strtoul (argv[0], &endptr, 10); if (timeout == ULONG_MAX || *endptr != '\0') { - vty_out (vty, "timeout timer value error%s", VTY_NEWLINE); + vty_out (vty, "timeout timer value error%s", VTYNL); return CMD_WARNING; } @@ -2493,7 +2493,7 @@ DEFUN (ripng_garbage_timer, garbage = strtoul (argv[0], &endptr, 10); if (garbage == ULONG_MAX || *endptr != '\0') { - vty_out (vty, "garbage timer value error%s", VTY_NEWLINE); + vty_out (vty, "garbage timer value error%s", VTYNL); return CMD_WARNING; } @@ -2577,16 +2577,16 @@ DEFUN (show_ipv6_protocols, if (! ripng) return CMD_SUCCESS; - vty_out (vty, "Routing Protocol is \"ripng\"%s", VTY_NEWLINE); + vty_out (vty, "Routing Protocol is \"ripng\"%s", VTYNL); vty_out (vty, "Sending updates every %ld seconds, next due in %d seconds%s", ripng->update_time, 0, - VTY_NEWLINE); + VTYNL); vty_out (vty, "Timerout after %ld seconds, garbage correct %ld%s", ripng->timeout_time, ripng->garbage_time, - VTY_NEWLINE); + VTYNL); vty_out (vty, "Outgoing update filter list for all interfaces is not set"); vty_out (vty, "Incoming update filter list for all interfaces is not set"); @@ -2767,13 +2767,13 @@ ripng_config_write (struct vty *vty) #if 0 if (ripng->update_time != RIPNG_UPDATE_TIMER_DEFAULT) vty_out (vty, " update-timer %d%s", ripng->update_time, - VTY_NEWLINE); + VTYNL); if (ripng->timeout_time != RIPNG_TIMEOUT_TIMER_DEFAULT) vty_out (vty, " timeout-timer %d%s", ripng->timeout_time, - VTY_NEWLINE); + VTYNL); if (ripng->garbage_time != RIPNG_GARBAGE_TIMER_DEFAULT) vty_out (vty, " garbage-timer %d%s", ripng->garbage_time, - VTY_NEWLINE); + VTYNL); #endif /* 0 */ write += config_write_distribute (vty); diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c index 79f09b9d4..810d9fda7 100644 --- a/tests/lib/test_heavy.c +++ b/tests/lib/test_heavy.c @@ -63,7 +63,7 @@ slow_func (struct vty *vty, const char *str, const int i) printf ("%s: hard error\n", __func__); if ((i % ITERS_PRINT) == 0) - printf ("%s did %d, x = %g%s", str, i, x, VTY_NEWLINE); + printf ("%s did %d, x = %g%s", str, i, x, VTYNL); } static void diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 900928120..2b5cf37ad 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2503,7 +2503,7 @@ DEFUN (vtysh_write_terminal, fp = stdout; vty_outln (vty, "Building configuration..."); - vty_outln (vty, "%sCurrent configuration:",VTY_NEWLINE); + vty_outln (vty, "%sCurrent configuration:",VTYNL); vty_outln (vty, "!"); for (i = 0; i < array_size(vtysh_client); i++) diff --git a/zebra/debug.c b/zebra/debug.c index 98770371d..ba2a9ad2a 100644 --- a/zebra/debug.c +++ b/zebra/debug.c @@ -39,10 +39,10 @@ DEFUN (show_debugging_zebra, "Debugging information\n" "Zebra configuration\n") { - vty_out (vty, "Zebra debugging status:%s", VTY_NEWLINE); + vty_out (vty, "Zebra debugging status:%s", VTYNL); if (IS_ZEBRA_DEBUG_EVENT) - vty_out (vty, " Zebra event debugging is on%s", VTY_NEWLINE); + vty_out (vty, " Zebra event debugging is on%s", VTYNL); if (IS_ZEBRA_DEBUG_PACKET) { @@ -50,40 +50,40 @@ DEFUN (show_debugging_zebra, { vty_out (vty, " Zebra packet%s debugging is on%s", IS_ZEBRA_DEBUG_DETAIL ? " detail" : "", - VTY_NEWLINE); + VTYNL); } else { if (IS_ZEBRA_DEBUG_SEND) vty_out (vty, " Zebra packet send%s debugging is on%s", IS_ZEBRA_DEBUG_DETAIL ? " detail" : "", - VTY_NEWLINE); + VTYNL); else vty_out (vty, " Zebra packet receive%s debugging is on%s", IS_ZEBRA_DEBUG_DETAIL ? " detail" : "", - VTY_NEWLINE); + VTYNL); } } if (IS_ZEBRA_DEBUG_KERNEL) - vty_out (vty, " Zebra kernel debugging is on%s", VTY_NEWLINE); + vty_out (vty, " Zebra kernel debugging is on%s", VTYNL); if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND) - vty_out (vty, " Zebra kernel netlink message dumps (send) are on%s", VTY_NEWLINE); + vty_out (vty, " Zebra kernel netlink message dumps (send) are on%s", VTYNL); if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV) - vty_out (vty, " Zebra kernel netlink message dumps (recv) are on%s", VTY_NEWLINE); + vty_out (vty, " Zebra kernel netlink message dumps (recv) are on%s", VTYNL); /* Check here using flags as the 'macro' does an OR */ if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB)) - vty_out (vty, " Zebra RIB debugging is on%s", VTY_NEWLINE); + vty_out (vty, " Zebra RIB debugging is on%s", VTYNL); if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED)) - vty_out (vty, " Zebra RIB detailed debugging is on%s", VTY_NEWLINE); + vty_out (vty, " Zebra RIB detailed debugging is on%s", VTYNL); if (IS_ZEBRA_DEBUG_FPM) - vty_out (vty, " Zebra FPM debugging is on%s", VTY_NEWLINE); + vty_out (vty, " Zebra FPM debugging is on%s", VTYNL); if (IS_ZEBRA_DEBUG_NHT) - vty_out (vty, " Zebra next-hop tracking debugging is on%s", VTY_NEWLINE); + vty_out (vty, " Zebra next-hop tracking debugging is on%s", VTYNL); if (IS_ZEBRA_DEBUG_MPLS) - vty_out (vty, " Zebra MPLS debugging is on%s", VTY_NEWLINE); + vty_out (vty, " Zebra MPLS debugging is on%s", VTYNL); return CMD_SUCCESS; } @@ -353,7 +353,7 @@ config_write_debug (struct vty *vty) if (IS_ZEBRA_DEBUG_EVENT) { - vty_out (vty, "debug zebra events%s", VTY_NEWLINE); + vty_out (vty, "debug zebra events%s", VTYNL); write++; } if (IS_ZEBRA_DEBUG_PACKET) @@ -362,7 +362,7 @@ config_write_debug (struct vty *vty) { vty_out (vty, "debug zebra packet%s%s", IS_ZEBRA_DEBUG_DETAIL ? " detail" : "", - VTY_NEWLINE); + VTYNL); write++; } else @@ -370,53 +370,53 @@ config_write_debug (struct vty *vty) if (IS_ZEBRA_DEBUG_SEND) vty_out (vty, "debug zebra packet send%s%s", IS_ZEBRA_DEBUG_DETAIL ? " detail" : "", - VTY_NEWLINE); + VTYNL); else vty_out (vty, "debug zebra packet recv%s%s", IS_ZEBRA_DEBUG_DETAIL ? " detail" : "", - VTY_NEWLINE); + VTYNL); write++; } } if (IS_ZEBRA_DEBUG_KERNEL) { - vty_out (vty, "debug zebra kernel%s", VTY_NEWLINE); + vty_out (vty, "debug zebra kernel%s", VTYNL); write++; } if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV) { - vty_out (vty, "debug zebra kernel msgdump recv%s", VTY_NEWLINE); + vty_out (vty, "debug zebra kernel msgdump recv%s", VTYNL); write++; } if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND) { - vty_out (vty, "debug zebra kernel msgdump send%s", VTY_NEWLINE); + vty_out (vty, "debug zebra kernel msgdump send%s", VTYNL); write++; } /* Check here using flags as the 'macro' does an OR */ if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB)) { - vty_out (vty, "debug zebra rib%s", VTY_NEWLINE); + vty_out (vty, "debug zebra rib%s", VTYNL); write++; } if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED)) { - vty_out (vty, "debug zebra rib detailed%s", VTY_NEWLINE); + vty_out (vty, "debug zebra rib detailed%s", VTYNL); write++; } if (IS_ZEBRA_DEBUG_FPM) { - vty_out (vty, "debug zebra fpm%s", VTY_NEWLINE); + vty_out (vty, "debug zebra fpm%s", VTYNL); write++; } if (IS_ZEBRA_DEBUG_NHT) { - vty_out (vty, "debug zebra nht%s", VTY_NEWLINE); + vty_out (vty, "debug zebra nht%s", VTYNL); write++; } if (IS_ZEBRA_DEBUG_MPLS) { - vty_out (vty, "debug zebra mpls%s", VTY_NEWLINE); + vty_out (vty, "debug zebra mpls%s", VTYNL); write++; } return write; diff --git a/zebra/interface.c b/zebra/interface.c index f3da3ae97..41c8c4949 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1077,7 +1077,7 @@ if_dump_vty (struct vty *vty, struct interface *ifp) ifp->ifindex, ifp->metric, ifp->mtu, ifp->speed); if (ifp->mtu6 != ifp->mtu) vty_out (vty, "mtu6 %d ", ifp->mtu6); - vty_outln (vty, "%s flags: %s", VTY_NEWLINE, + vty_outln (vty, "%s flags: %s", VTYNL, if_flag_dump(ifp->flags)); /* Hardware address. */ @@ -1458,8 +1458,8 @@ DEFUN (show_interface_desc_vrf_all, RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) if (!list_isempty (vrf->iflist)) { - vty_outln (vty, "%s\tVRF %u%s", VTY_NEWLINE, vrf->vrf_id, - VTY_NEWLINE); + vty_outln (vty, "%s\tVRF %u%s", VTYNL, vrf->vrf_id, + VTYNL); if_show_description (vty, vrf->vrf_id); } diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index d4c583112..3e408c929 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -1451,8 +1451,8 @@ zfpm_show_stats (struct vty *vty) zfpm_stats_t total_stats; time_t elapsed; - vty_outln (vty, "%s%-40s %10s Last %2d secs%s", VTY_NEWLINE, "Counter", - "Total", ZFPM_STATS_IVL_SECS, VTY_NEWLINE); + vty_outln (vty, "%s%-40s %10s Last %2d secs%s", VTYNL, "Counter", + "Total", ZFPM_STATS_IVL_SECS, VTYNL); /* * Compute the total stats up to this instant. @@ -1490,7 +1490,7 @@ zfpm_show_stats (struct vty *vty) elapsed = zfpm_get_elapsed_time (zfpm_g->last_stats_clear_time); - vty_outln (vty, "%sStats were cleared %lu seconds ago", VTY_NEWLINE, + vty_outln (vty, "%sStats were cleared %lu seconds ago", VTYNL, (unsigned long)elapsed); } diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 66b1cc78c..5dc504b41 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -996,7 +996,7 @@ print_nh (struct nexthop *nexthop, struct vty *vty) default: break; } - vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, "%s", VTYNL); } static void @@ -1011,18 +1011,18 @@ print_rnh (struct route_node *rn, struct vty *vty) rnh = rn->info; vty_out(vty, "%s%s%s", inet_ntop(rn->p.family, &rn->p.u.prefix, buf, BUFSIZ), CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED) ? "(Connected)" : "", - VTY_NEWLINE); + VTYNL); if (rnh->state) { vty_out(vty, " resolved via %s%s", - zebra_route_string(rnh->state->type), VTY_NEWLINE); + zebra_route_string(rnh->state->type), VTYNL); for (nexthop = rnh->state->nexthop; nexthop; nexthop = nexthop->next) print_nh(nexthop, vty); } else vty_out(vty, " unresolved%s%s", CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED) ? "(Connected)" : "", - VTY_NEWLINE); + VTYNL); vty_out(vty, " Client list:"); for (ALL_LIST_ELEMENTS_RO(rnh->client_list, node, client)) @@ -1030,5 +1030,5 @@ print_rnh (struct route_node *rn, struct vty *vty) client->sock, rnh->filtered[client->proto] ? "(filtered)" : ""); if (!list_isempty(rnh->zebra_static_route_list)) vty_out(vty, " zebra%s", rnh->filtered[ZEBRA_ROUTE_STATIC] ? "(filtered)" : ""); - vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, "%s", VTYNL); } diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 49d0868cb..e760ae684 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -665,7 +665,7 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast) vty_out (vty, "Routing entry for %s%s%s", srcdest_rnode2str(rn, buf, sizeof(buf)), mcast_info, - VTY_NEWLINE); + VTYNL); vty_out (vty, " Known via \"%s", zebra_route_string (re->type)); if (re->instance) vty_out (vty, "[%d]", re->instance); @@ -688,7 +688,7 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast) vty_out (vty, ", blackhole"); if (CHECK_FLAG (re->flags, ZEBRA_FLAG_REJECT)) vty_out (vty, ", reject"); - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); if (re->type == ZEBRA_ROUTE_RIP || re->type == ZEBRA_ROUTE_OSPF @@ -716,7 +716,7 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast) vty_out (vty, "%02dw%dd%02dh", tm->tm_yday/7, tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour); - vty_out (vty, " ago%s", VTY_NEWLINE); + vty_out (vty, " ago%s", VTYNL); } for (ALL_NEXTHOPS_RO(re->nexthop, nexthop, tnexthop, recursing)) @@ -795,9 +795,9 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast) nexthop->nh_label->label, buf, sizeof buf, 1)); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } @@ -1085,7 +1085,7 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct route_entry *r tm->tm_yday/7, tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour); } - vty_out (vty, "%s", VTY_NEWLINE); + vty_out (vty, "%s", VTYNL); } } @@ -1190,7 +1190,7 @@ do_show_ip_route (struct vty *vty, const char *vrf_name, afi_t afi, safi_t safi, vty_out (vty, SHOW_ROUTE_V6_HEADER); if (zvrf_id (zvrf) != VRF_DEFAULT) - vty_outln (vty, "%sVRF %s:", VTY_NEWLINE, + vty_outln (vty, "%sVRF %s:", VTYNL, zvrf_name(zvrf)); first = 0; @@ -1251,7 +1251,7 @@ DEFUN (show_ip_nht_vrf_all, RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) if ((zvrf = vrf->info) != NULL) { - vty_outln (vty, "%sVRF %s:", VTY_NEWLINE, zvrf_name(zvrf)); + vty_outln (vty, "%sVRF %s:", VTYNL, zvrf_name(zvrf)); zebra_print_rnh_table(zvrf_id (zvrf), AF_INET, vty, RNH_NEXTHOP_TYPE); } @@ -1291,7 +1291,7 @@ DEFUN (show_ipv6_nht_vrf_all, RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) if ((zvrf = vrf->info) != NULL) { - vty_outln (vty, "%sVRF %s:", VTY_NEWLINE, zvrf_name(zvrf)); + vty_outln (vty, "%sVRF %s:", VTYNL, zvrf_name(zvrf)); zebra_print_rnh_table(zvrf_id (zvrf), AF_INET6, vty, RNH_NEXTHOP_TYPE); } |