summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bgpd/bgp_damp.c4
-rw-r--r--bgpd/bgp_debug.c4
-rw-r--r--bgpd/bgp_filter.c2
-rw-r--r--bgpd/bgp_mplsvpn.c2
-rw-r--r--bgpd/bgp_nexthop.c2
-rw-r--r--bgpd/bgp_open.c2
-rw-r--r--bgpd/bgp_route.c36
-rw-r--r--bgpd/bgp_updgrp.c2
-rw-r--r--bgpd/bgp_vpn.c2
-rw-r--r--bgpd/bgpd.c20
-rw-r--r--bgpd/rfapi/bgp_rfapi_cfg.c10
-rw-r--r--bgpd/rfapi/rfapi_vty.c18
-rw-r--r--bgpd/rfapi/vnc_debug.c2
-rw-r--r--bgpd/rfp-example/librfp/rfp_example.c2
-rw-r--r--isisd/isis_adjacency.c16
-rw-r--r--isisd/isis_circuit.c12
-rw-r--r--isisd/isis_lsp.c2
-rw-r--r--isisd/isis_redist.c4
-rw-r--r--isisd/isis_spf.c12
-rw-r--r--isisd/isis_te.c2
-rw-r--r--isisd/isisd.c18
-rw-r--r--ldpd/ldp_debug.c2
-rw-r--r--ldpd/ldp_vty_conf.c10
-rw-r--r--ldpd/ldp_vty_exec.c20
-rw-r--r--lib/bfd.c2
-rw-r--r--lib/command.c16
-rw-r--r--lib/distribute.c8
-rw-r--r--lib/filter.c10
-rw-r--r--lib/grammar_sandbox.c8
-rw-r--r--lib/keychain.c4
-rw-r--r--lib/plist.c10
-rw-r--r--lib/thread.c2
-rw-r--r--lib/vty.c20
-rw-r--r--nhrpd/nhrp_vty.c2
-rw-r--r--ospf6d/ospf6_top.c4
-rw-r--r--ospfd/ospf_apiserver.c2
-rw-r--r--ospfd/ospf_dump.c2
-rw-r--r--ospfd/ospf_vty.c6
-rw-r--r--pimd/pim_cmd.c74
-rw-r--r--pimd/pim_vty.c2
-rw-r--r--ripd/rip_interface.c2
-rw-r--r--ripd/ripd.c4
-rw-r--r--ripngd/ripngd.c8
-rw-r--r--vtysh/vtysh.c4
-rw-r--r--zebra/interface.c16
-rw-r--r--zebra/redistribute.c2
-rw-r--r--zebra/rtadv.c2
-rw-r--r--zebra/zebra_mpls.c8
-rw-r--r--zebra/zebra_vty.c8
-rw-r--r--zebra/zserv.c6
50 files changed, 219 insertions, 219 deletions
diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 80cd77045..d276de6eb 100644
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -652,7 +652,7 @@ bgp_damp_info_vty (struct vty *vty, struct bgp_info *binfo,
vty_out (vty, ", reuse in %s",
bgp_get_reuse_time (penalty, timebuf, BGP_UPTIME_LEN, 0, json_path));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
@@ -707,7 +707,7 @@ bgp_show_dampening_parameters (struct vty *vty, afi_t afi, safi_t safi)
(long long)damp->max_suppress_time / 60);
vty_out (vty, "Max supress penalty: %u\n",
damp->ceiling);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
else
vty_out (vty, "dampening not enabled for %s\n",
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index 23f49f2c7..b2c91c913 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -254,7 +254,7 @@ bgp_debug_list_print (struct vty *vty, const char *desc, struct list *list)
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Print the command to enable the debug for each peer/prefix this debug is
@@ -1747,7 +1747,7 @@ DEFUN (show_debugging_bgp,
if (BGP_DEBUG (allow_martians, ALLOW_MARTIANS))
vty_out (vty, " BGP allow martian next hop debugging is on\n");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
index 9b11cd58b..8968e22b0 100644
--- a/bgpd/bgp_filter.c
+++ b/bgpd/bgp_filter.c
@@ -538,7 +538,7 @@ DEFUN (no_ip_as_path,
if (asfilter == NULL)
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return CMD_WARNING;
}
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 979ff6bfe..0a4d589b8 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -703,7 +703,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
rd_vnc_eth.macaddr.octet[4],
rd_vnc_eth.macaddr.octet[5]);
#endif
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
rd_header = 0;
}
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 3b7f2e2fc..e2d93e9f3 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -444,7 +444,7 @@ bgp_show_nexthops (struct vty *vty, struct bgp *bgp, int detail)
}
tbuf = time(NULL) - (bgp_clock() - bnc->last_update);
vty_out (vty, " Last update: %s", ctime(&tbuf));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 86befd3e8..d6ed441df 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -167,7 +167,7 @@ bgp_capability_vty_out (struct vty *vty, struct peer *peer, u_char use_json, jso
vty_out (vty, "SAFI Unknown %d ", mpc.safi);
break;
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
else if (hdr->code >= 128)
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index c7e26a0a6..b4bdab316 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -6526,7 +6526,7 @@ route_vty_out (struct vty *vty, struct prefix *p,
}
else
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
#if ENABLE_BGP_VNC
/* prints an additional line, indented, with VNC info, if present */
if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP))
@@ -6663,7 +6663,7 @@ route_vty_out_tmp (struct vty *vty, struct prefix *p, struct attr *attr, safi_t
json_object_object_add(json_ar, inet_ntop (p->family, &p->u.prefix, buf_cut, BUFSIZ), json_net);
}
else
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
void
@@ -6767,7 +6767,7 @@ route_vty_out_tag (struct vty *vty, struct prefix *p,
else
{
vty_out (vty, "notag/%d", label);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -6855,7 +6855,7 @@ route_vty_out_overlay (struct vty *vty, struct prefix *p,
}
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* dampening route */
@@ -6919,7 +6919,7 @@ damp_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo,
vty_out (vty, "%s", bgp_origin_str[attr->origin]);
}
if (!use_json)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* flap route */
@@ -7019,7 +7019,7 @@ flap_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo,
vty_out (vty, "%s", bgp_origin_str[attr->origin]);
}
if (!use_json)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
static void
@@ -7193,7 +7193,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
}
if (!json_paths)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
/* Line2 display Next-hop, Neighbor, Router-id */
/* Display the nexthop */
@@ -7343,7 +7343,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
}
if (!json_paths)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
/* display the link-local nexthop */
if (attr->extra && attr->extra->mp_nexthop_len == BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL)
@@ -7562,7 +7562,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
json_object_object_add(json_path, "bestpath", json_bestpath);
if (!json_paths)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
/* Line 4 display Community */
if (attr->community)
@@ -7649,7 +7649,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
}
if (!json_paths)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (binfo->extra && binfo->extra->damp_info)
@@ -7724,7 +7724,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
{
if (!first)
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -7764,7 +7764,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
json_object_array_add(json_paths, json_path);
}
else
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
#define BGP_SHOW_HEADER_CSV "Flags, Network, Next Hop, Metric, LocPrf, Weight, Path"
@@ -8249,7 +8249,7 @@ route_vty_out_detail_header (struct vty *vty, struct bgp *bgp,
{
if (first)
vty_out (vty, " Not advertised to any peer");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -9245,7 +9245,7 @@ bgp_table_stats (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi)
vty_out (vty, "%12llu", ts.counts[i]);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return CMD_SUCCESS;
}
@@ -10672,7 +10672,7 @@ bgp_config_write_network_vpn (struct vty *vty, struct bgp *bgp,
if (bgp_static->backdoor)
vty_out (vty, " backdoor");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return 0;
}
@@ -10719,7 +10719,7 @@ bgp_config_write_network_evpn (struct vty *vty, struct bgp *bgp,
vty_out (vty, " network %s rd %s ethtag %u tag %u esi %s gwip %s routermac %s",
buf, rdbuf, p->u.prefix_evpn.eth_tag,
decode_label (&bgp_static->label), esi, buf2 , macrouter);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (macrouter)
XFREE (MTYPE_TMP, macrouter);
if (esi)
@@ -10794,7 +10794,7 @@ bgp_config_write_network (struct vty *vty, struct bgp *bgp,
vty_out (vty, " backdoor");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Aggregate-address configuration. */
@@ -10828,7 +10828,7 @@ bgp_config_write_network (struct vty *vty, struct bgp *bgp,
if (bgp_aggregate->summary_only)
vty_out (vty, " summary-only");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return 0;
diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index fac446a79..b8971dcd6 100644
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -584,7 +584,7 @@ update_group_show_walkcb (struct update_group *updgrp, void *arg)
{
if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id))
continue;
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " Update-subgroup %" PRIu64 ":\n", subgrp->id);
vty_out (vty, " Created: %s", timestamp_string (subgrp->uptime));
diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c
index e829c9cf2..e1fed31a1 100644
--- a/bgpd/bgp_vpn.c
+++ b/bgpd/bgp_vpn.c
@@ -170,7 +170,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd,
rd_vnc_eth.macaddr.octet[5]);
#endif
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
rd_header = 0;
}
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index ca948b2f1..2dd81d407 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6626,7 +6626,7 @@ bgp_config_write_peer_global (struct vty *vty, struct bgp *bgp,
if_ras_printed = TRUE;
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* remote-as and peer-group */
@@ -7016,7 +7016,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
vty_out (vty, " send");
else
vty_out (vty, " receive");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Route reflector client. */
@@ -7163,7 +7163,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
" neighbor %s default-originate", addr);
if (peer->default_rmap[afi][safi].name)
vty_out (vty, " route-map %s", peer->default_rmap[afi][safi].name);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Soft reconfiguration inbound. */
@@ -7191,7 +7191,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
vty_out (vty, " warning-only");
if (peer->pmax_restart[afi][safi])
vty_out (vty, " restart %u", peer->pmax_restart[afi][safi]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Route server client. */
@@ -7329,7 +7329,7 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
if (safi == SAFI_EVPN)
vty_out (vty, "l2vpn evpn");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
*write = 1;
}
@@ -7416,7 +7416,7 @@ bgp_config_write (struct vty *vty)
(bgp->inst_type == BGP_INSTANCE_TYPE_VIEW) ?
"view" : "vrf", bgp->name);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
/* No Synchronization */
if (bgp_option_check (BGP_OPT_CONFIG_CISCO))
@@ -7487,7 +7487,7 @@ bgp_config_write (struct vty *vty)
for (i = 0; i < bgp->confed_peers_cnt; i++)
vty_out(vty, " %u", bgp->confed_peers[i]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* BGP enforce-first-as. */
@@ -7508,14 +7508,14 @@ bgp_config_write (struct vty *vty)
vty_out (vty, " bgp max-med on-startup %u", bgp->v_maxmed_onstartup);
if (bgp->maxmed_onstartup_value != BGP_MAXMED_VALUE_DEFAULT)
vty_out (vty, " %u", bgp->maxmed_onstartup_value);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (bgp->v_maxmed_admin != BGP_MAXMED_ADMIN_UNCONFIGURED)
{
vty_out (vty, " bgp max-med administrative");
if (bgp->maxmed_admin_value != BGP_MAXMED_VALUE_DEFAULT)
vty_out (vty, " %u", bgp->maxmed_admin_value);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* write quanta */
@@ -7570,7 +7570,7 @@ bgp_config_write (struct vty *vty)
vty_out (vty, " confed");
if (bgp_flag_check (bgp, BGP_FLAG_MED_MISSING_AS_WORST))
vty_out (vty, " missing-as-worst");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* BGP network import check. */
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 233734f14..495765ba6 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -2620,7 +2620,7 @@ bgp_rfapi_delete_nve_group (
vty_out (vty, " un=");
rfapiPrintRfapiIpAddr (vty, &rfd->un_addr);
if (vty)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
list_delete (orphaned_nves);
}
@@ -4459,7 +4459,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp)
{
vty_out (vty, "%hu ", (uint16_t) ((uintptr_t) data));
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (rfg->rt_import_list && rfg->rt_export_list &&
@@ -4546,7 +4546,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp)
vty_out (vty, "%d", hc->default_response_lifetime);
else
vty_out (vty, "infinite");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (hc->default_rt_import_list && hc->default_rt_export_list &&
ecommunity_cmp (hc->default_rt_import_list,
@@ -4661,7 +4661,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp)
vty_out (vty, "%d", rfg->response_lifetime);
else
vty_out (vty, "infinite");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (rfg->rt_import_list && rfg->rt_export_list &&
@@ -5031,7 +5031,7 @@ bgp_rfapi_show_summary (struct bgp *bgp, struct vty *vty)
(hc->rfp_cfg.ftd_advertisement_interval == RFAPI_RFP_CFG_DEFAULT_FTD_ADVERTISEMENT_INTERVAL ? "(default)" : ""));
vty_out (vty, "%-39s %d seconds\n", "Default RFP response lifetime:",
hc->default_response_lifetime);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return;
}
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 9cb6ccbd9..2137aaad3 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -2516,7 +2516,7 @@ register_add (
}
vnc_zlog_debug_verbose ("%s: rfapi_register failed", __func__);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "Registration failed.\n");
vty_out (vty,
"Confirm that either the VN or UN address matches a configured NVE group.\n");
@@ -4459,10 +4459,10 @@ rfapi_vty_show_nve_summary (struct vty *vty, show_nve_summary_t show_type)
h->stat.count_registrations_failed);
vty_out (vty, "%-8s %-8u", "Total:",
h->stat.count_registrations);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
vty_out (vty, "%-24s ", "Prefixes registered:");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
rfapiCountAllItRoutes (&active_local_routes,
&active_remote_routes,
@@ -4474,16 +4474,16 @@ rfapi_vty_show_nve_summary (struct vty *vty, show_nve_summary_t show_type)
{
vty_out (vty, " %-20s ", "Locally:");
vty_out (vty, "%-8s %-8u ", "Active:", active_local_routes);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
vty_out (vty, " %-20s ", "Remotely:");
vty_out (vty, "%-8s %-8u", "Active:", active_remote_routes);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " %-20s ", "In Holddown:");
vty_out (vty, "%-8s %-8u", "Active:", holddown_remote_routes);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " %-20s ", "Imported:");
vty_out (vty, "%-8s %-8u", "Active:", imported_remote_routes);
break;
@@ -4502,7 +4502,7 @@ rfapi_vty_show_nve_summary (struct vty *vty, show_nve_summary_t show_type)
default:
break;
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return 0;
@@ -4616,7 +4616,7 @@ DEFUN (vnc_show_summary,
if (!check_and_display_is_vnc_running (vty))
return CMD_SUCCESS;
bgp_rfapi_show_summary (bgp_get_default (), vty);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
rfapi_vty_show_nve_summary (vty, SHOW_NVE_SUMMARY_ACTIVE_NVES);
rfapi_vty_show_nve_summary (vty, SHOW_NVE_SUMMARY_QUERIES);
rfapi_vty_show_nve_summary (vty, SHOW_NVE_SUMMARY_RESPONSES);
@@ -4713,7 +4713,7 @@ rfapi_show_registrations (
}
if (!printed)
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
index 58b762a63..21627a20a 100644
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@ -173,7 +173,7 @@ DEFUN (show_debugging_bgp_vnc,
vncdebug[i].name);
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c
index a0ba82908..451be7770 100644
--- a/bgpd/rfp-example/librfp/rfp_example.c
+++ b/bgpd/rfp-example/librfp/rfp_example.c
@@ -197,7 +197,7 @@ rfp_cfg_write_cb (struct vty *vty, void *rfp_start_val)
if (rfi->config_var != 0)
{
vty_out (vty, " rfp example-config-value %u", rfi->config_var);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index 513a3871c..e4a4e0c42 100644
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -402,13 +402,13 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
else
vty_out (vty, "- ");
vty_out (vty, "%-10s", snpa_print (adj->snpa));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (detail == ISIS_UI_LEVEL_DETAIL)
{
level = adj->level;
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (adj->circuit)
vty_out (vty, " Interface: %s", adj->circuit->interface->name);
else
@@ -421,13 +421,13 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
time2string (adj->last_upd + adj->hold_time - now));
else
vty_out (vty, ", Expires in %s", time2string (adj->hold_time));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " Adjacency flaps: %u", adj->flaps);
vty_out (vty, ", Last: %s ago", time2string (now - adj->last_flap));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " Circuit type: %s", circuit_t2string (adj->circuit_t));
vty_out (vty, ", Speaks: %s", nlpid2string (&adj->nlpids));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (adj->mt_count != 1 || adj->mt_set[0] != ISIS_MT_IPV4_UNICAST)
{
vty_out (vty, " Topologies:\n");
@@ -445,7 +445,7 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
vty_out (vty, ", LAN id: %s.%02x",
sysid_print (adj->lanid), adj->lanid[ISIS_SYS_ID_LEN]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " LAN Priority: %u", adj->prio[adj->level - 1]);
vty_out (vty, ", %s, DIS flaps: %u, Last: %s ago",
@@ -455,7 +455,7 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
(adj->dis_record[ISIS_LEVELS + level - 1].
last_dis_change)));
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (adj->area_addrs && listcount (adj->area_addrs) > 0)
{
@@ -480,7 +480,7 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
vty_out (vty, " %s\n", ip6);
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return;
}
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index aeaedbe3e..d07ea27c4 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -878,7 +878,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
vty_out (vty, "%-9s", circuit_state2string (circuit->state));
vty_out (vty, "%-9s", circuit_type2string (circuit->circ_type));
vty_out (vty, "%-9s", circuit_t2string (circuit->is_type));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (detail == ISIS_UI_LEVEL_DETAIL)
@@ -894,12 +894,12 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
else
vty_out (vty, ", Active");
vty_out (vty, ", Circuit Id: 0x%x", circuit->circuit_id);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " Type: %s", circuit_type2string (circuit->circ_type));
vty_out (vty, ", Level: %s", circuit_t2string (circuit->is_type));
if (circuit->circ_type == CIRCUIT_T_BROADCAST)
vty_out (vty, ", SNPA: %-10s", snpa_print (circuit->u.bc.snpa));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (circuit->is_type & IS_LEVEL_1)
{
vty_out (vty, " Level-1 Information:\n");
@@ -928,7 +928,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
}
else
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
if (circuit->is_type & IS_LEVEL_2)
@@ -959,7 +959,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
}
else
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
if (circuit->ip_addrs && listcount (circuit->ip_addrs) > 0)
@@ -990,7 +990,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return;
}
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index c320ff79a..ed376058b 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -1079,7 +1079,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.mt_ipv4_reachs, lnode, mt_ipv4_reachs))
lsp_print_mt_ipv4_reach(mt_ipv4_reachs->list, vty, mt_ipv4_reachs->mtid);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return;
}
diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c
index f4af3aef2..9846686ef 100644
--- a/isisd/isis_redist.c
+++ b/isisd/isis_redist.c
@@ -796,7 +796,7 @@ isis_redist_config_write(struct vty *vty, struct isis_area *area,
vty_out(vty, " metric %u", redist->metric);
if (redist->map_name)
vty_out(vty, " route-map %s", redist->map_name);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
}
@@ -814,7 +814,7 @@ isis_redist_config_write(struct vty *vty, struct isis_area *area,
vty_out(vty, " metric %u", redist->metric);
if (redist->map_name)
vty_out(vty, " route-map %s", redist->map_name);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index a85cef640..4b5592c15 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -1336,7 +1336,7 @@ isis_print_paths (struct vty *vty, struct list *paths, u_char *root_sysid)
for (ALL_LIST_ELEMENTS_RO (vertex->Adj_N, anode, adj)) {
if (adj) {
if (rows) {
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "%-20s %-12s %-6s ", "", "", "");
}
vty_out (vty, "%-20s %-9s ",
@@ -1356,7 +1356,7 @@ isis_print_paths (struct vty *vty, struct list *paths, u_char *root_sysid)
int rows = 0;
for (ALL_LIST_ELEMENTS_RO (vertex->parents, pnode, pvertex)) {
if (rows) {
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "%-72s", "");
}
vty_out (vty, "%s(%d)",
@@ -1367,7 +1367,7 @@ isis_print_paths (struct vty *vty, struct list *paths, u_char *root_sysid)
vty_out (vty, " NULL ");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
@@ -1409,7 +1409,7 @@ DEFUN (show_isis_topology,
vty_out (vty, "IS-IS paths to level-%d routers that speak IP\n",
level);
isis_print_paths (vty, area->spftree[level-1]->paths, isis->sysid);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (area->ipv6_circuits > 0 && area->spftree6[level-1]
&& area->spftree6[level-1]->paths->count > 0)
@@ -1418,11 +1418,11 @@ DEFUN (show_isis_topology,
"IS-IS paths to level-%d routers that speak IPv6\n",
level);
isis_print_paths (vty, area->spftree6[level-1]->paths, isis->sysid);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return CMD_SUCCESS;
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index 613fe8e4f..47377bd7a 100644
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -974,7 +974,7 @@ show_vty_unknown_tlv (struct vty *vty, struct subtlv_header *tlvh)
else
rtn++;
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
else
vty_out (vty, " Unknown TLV: [type(%#.2x), length(%#.2x)]\n",
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 7436d9f93..f64f98a7d 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1374,7 +1374,7 @@ DEFUN (show_isis_summary,
vty_out (vty, "Up time : ");
vty_out_timestr(vty, isis->uptime);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (isis->area_list)
vty_out (vty, "Number of areas : %d\n",isis->area_list->count);
@@ -1409,12 +1409,12 @@ DEFUN (show_isis_summary,
area->min_spf_interval[level - 1]);
if (area->spf_delay_ietf[level - 1])
vty_out (vty, " (not used, IETF SPF delay activated)");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " IPv4 route computation:\n");
vty_out (vty, " last run elapsed : ");
vty_out_timestr(vty, spftree->last_run_timestamp);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " last run duration : %u usec\n",
(u_int32_t)spftree->last_run_duration);
@@ -1427,7 +1427,7 @@ DEFUN (show_isis_summary,
vty_out (vty, " last run elapsed : ");
vty_out_timestr(vty, spftree->last_run_timestamp);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " last run duration : %llu msec\n",
(unsigned long long)spftree->last_run_duration);
@@ -1436,7 +1436,7 @@ DEFUN (show_isis_summary,
spftree->runcount);
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -2174,7 +2174,7 @@ isis_config_write (struct vty *vty)
else
vty_out(vty, "send-only");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
else if (area->area_passwd.type == ISIS_PASSWD_TYPE_CLEARTXT)
@@ -2188,7 +2188,7 @@ isis_config_write (struct vty *vty)
else
vty_out(vty, "send-only");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
if (area->domain_passwd.type == ISIS_PASSWD_TYPE_HMAC_MD5)
@@ -2203,7 +2203,7 @@ isis_config_write (struct vty *vty)
else
vty_out(vty, "send-only");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
else if (area->domain_passwd.type == ISIS_PASSWD_TYPE_CLEARTXT)
@@ -2218,7 +2218,7 @@ isis_config_write (struct vty *vty)
else
vty_out(vty, "send-only");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
diff --git a/ldpd/ldp_debug.c b/ldpd/ldp_debug.c
index bf2de7b68..269b01406 100644
--- a/ldpd/ldp_debug.c
+++ b/ldpd/ldp_debug.c
@@ -127,7 +127,7 @@ ldp_vty_show_debugging(struct vty *vty)
vty_out (vty," LDP messages debugging is on (outbound)\n");
if (LDP_DEBUG(zebra, ZEBRA))
vty_out (vty, " LDP zebra debugging is on\n");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (CMD_SUCCESS);
}
diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c
index 753ac802d..0443d62ca 100644
--- a/ldpd/ldp_vty_conf.c
+++ b/ldpd/ldp_vty_conf.c
@@ -155,7 +155,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf,
if (af_conf->acl_thello_accept_from[0] != '\0')
vty_out(vty, " from %s",
af_conf->acl_thello_accept_from);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (af_conf->thello_holdtime != TARGETED_DFLT_HOLDTIME &&
@@ -182,7 +182,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf,
else
vty_out(vty, " for %s",
af_conf->acl_label_allocate_for);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (af_conf->acl_label_advertise_for[0] != '\0' ||
@@ -194,7 +194,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf,
if (af_conf->acl_label_advertise_for[0] != '\0')
vty_out(vty, " for %s",
af_conf->acl_label_advertise_for);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (af_conf->flags & F_LDPD_AF_EXPNULL) {
@@ -202,7 +202,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf,
if (af_conf->acl_label_expnull_for[0] != '\0')
vty_out(vty, " for %s",
af_conf->acl_label_expnull_for);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (af_conf->acl_label_accept_for[0] != '\0' ||
@@ -214,7 +214,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf,
if (af_conf->acl_label_accept_for[0] != '\0')
vty_out(vty, " for %s",
af_conf->acl_label_accept_for);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (af_conf->flags & F_LDPD_AF_NO_GTSM)
diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c
index 368edebe5..476b9b173 100644
--- a/ldpd/ldp_vty_exec.c
+++ b/ldpd/ldp_vty_exec.c
@@ -135,7 +135,7 @@ show_interface_msg(struct vty *vty, struct imsg *imsg,
iface->adj_cnt);
break;
case IMSG_CTL_END:
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
@@ -217,7 +217,7 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg,
vty_out (vty, "%9u\n", adj->holdtime);
break;
case IMSG_CTL_END:
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
@@ -326,7 +326,7 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg,
vty_out(vty, "%s", ifaces_buffer);
vty_out (vty, " Targeted Hellos:\n");
vty_out(vty, "%s", tnbrs_buffer);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
@@ -620,7 +620,7 @@ show_nbr_detail_msg(struct vty *vty, struct imsg *imsg,
vty_out (vty, " IPv6:\n");
vty_out(vty, "%s", v6adjs_buffer);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
break;
case IMSG_CTL_END:
return (1);
@@ -898,10 +898,10 @@ show_nbr_capabilities_msg(struct vty *vty, struct imsg *imsg, struct show_params
vty_out (vty, "Peer LDP Identifier: %s:0\n",
inet_ntoa(nbr->id));
show_nbr_capabilities(vty, nbr);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
break;
case IMSG_CTL_END:
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
@@ -1027,7 +1027,7 @@ show_lib_msg(struct vty *vty, struct imsg *imsg, struct show_params *params)
rt->in_use ? "yes" : "no");
break;
case IMSG_CTL_END:
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
@@ -1099,7 +1099,7 @@ show_lib_detail_msg(struct vty *vty, struct imsg *imsg, struct show_params *para
vty_out (vty, "%-8sNo remote bindings\n","");
break;
case IMSG_CTL_END:
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
@@ -1261,7 +1261,7 @@ show_l2vpn_binding_msg(struct vty *vty, struct imsg *imsg,
vty_out (vty," Remote Label: unassigned\n");
break;
case IMSG_CTL_END:
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
@@ -1345,7 +1345,7 @@ show_l2vpn_pw_msg(struct vty *vty, struct imsg *imsg, struct show_params *params
(pw->status ? "UP" : "DOWN"));
break;
case IMSG_CTL_END:
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return (1);
default:
break;
diff --git a/lib/bfd.c b/lib/bfd.c
index f429ef3e7..4fbb93ebd 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -461,7 +461,7 @@ bfd_show_info(struct vty *vty, struct bfd_info *bfd_info, int multihop,
if (use_json)
json_object_object_add(json_obj, "peerBfdInfo", json_bfd);
else
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/*
diff --git a/lib/command.c b/lib/command.c
index fb560cb61..ad197468a 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -463,7 +463,7 @@ config_write_host (struct vty *vty)
if (zlog_default->maxlvl[ZLOG_DEST_FILE] != zlog_default->default_lvl)
vty_out (vty, " %s",
zlog_priority[zlog_default->maxlvl[ZLOG_DEST_FILE]]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (zlog_default->maxlvl[ZLOG_DEST_STDOUT] != ZLOG_DISABLED)
@@ -472,7 +472,7 @@ config_write_host (struct vty *vty)
if (zlog_default->maxlvl[ZLOG_DEST_STDOUT] != zlog_default->default_lvl)
vty_out (vty, " %s",
zlog_priority[zlog_default->maxlvl[ZLOG_DEST_STDOUT]]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (zlog_default->maxlvl[ZLOG_DEST_MONITOR] == ZLOG_DISABLED)
@@ -487,7 +487,7 @@ config_write_host (struct vty *vty)
if (zlog_default->maxlvl[ZLOG_DEST_SYSLOG] != zlog_default->default_lvl)
vty_out (vty, " %s",
zlog_priority[zlog_default->maxlvl[ZLOG_DEST_SYSLOG]]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (zlog_default->facility != LOG_DAEMON)
@@ -1421,7 +1421,7 @@ permute (struct graph_node *start, struct vty *vty)
}
if (gn == start)
vty_out (vty, "...");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
else
{
@@ -2012,7 +2012,7 @@ DEFUN (show_logging,
vty_out (vty, "level %s, facility %s, ident %s",
zlog_priority[zl->maxlvl[ZLOG_DEST_SYSLOG]],
facility_name(zl->facility), zl->ident);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "Stdout logging: ");
if (zl->maxlvl[ZLOG_DEST_STDOUT] == ZLOG_DISABLED)
@@ -2020,7 +2020,7 @@ DEFUN (show_logging,
else
vty_out (vty, "level %s",
zlog_priority[zl->maxlvl[ZLOG_DEST_STDOUT]]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "Monitor logging: ");
if (zl->maxlvl[ZLOG_DEST_MONITOR] == ZLOG_DISABLED)
@@ -2028,7 +2028,7 @@ DEFUN (show_logging,
else
vty_out (vty, "level %s",
zlog_priority[zl->maxlvl[ZLOG_DEST_MONITOR]]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "File logging: ");
if ((zl->maxlvl[ZLOG_DEST_FILE] == ZLOG_DISABLED) ||
@@ -2038,7 +2038,7 @@ DEFUN (show_logging,
vty_out (vty, "level %s, filename %s",
zlog_priority[zl->maxlvl[ZLOG_DEST_FILE]],
zl->filename);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "Protocol name: %s\n",
zl->protoname);
diff --git a/lib/distribute.c b/lib/distribute.c
index 8bf961e97..691b67e83 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -393,7 +393,7 @@ config_show_distribute (struct vty *vty)
DISTRIBUTE_V6_OUT, has_print);
}
if (has_print)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
else
vty_out (vty, " not set\n");
@@ -414,7 +414,7 @@ config_show_distribute (struct vty *vty)
has_print = distribute_print(vty, dist->prefix, 1,
DISTRIBUTE_V6_OUT, has_print);
if (has_print)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
else
vty_out (vty, " nothing\n");
}
@@ -437,7 +437,7 @@ config_show_distribute (struct vty *vty)
DISTRIBUTE_V6_IN, has_print);
}
if (has_print)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
else
vty_out (vty, " not set\n");
@@ -458,7 +458,7 @@ config_show_distribute (struct vty *vty)
has_print = distribute_print(vty, dist->prefix, 1,
DISTRIBUTE_V6_IN, has_print);
if (has_print)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
else
vty_out (vty, " nothing\n");
}
diff --git a/lib/filter.c b/lib/filter.c
index ae4b0b3b0..9967308f6 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -1727,7 +1727,7 @@ filter_show (struct vty *vty, const char *name, afi_t afi)
vty_out (vty, " %s", inet_ntoa (filter->addr));
if (filter->addr_mask.s_addr != 0)
vty_out (vty, ", wildcard bits %s", inet_ntoa (filter->addr_mask));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -1770,7 +1770,7 @@ filter_show (struct vty *vty, const char *name, afi_t afi)
vty_out (vty, " %s", inet_ntoa (filter->addr));
if (filter->addr_mask.s_addr != 0)
vty_out (vty, ", wildcard bits %s", inet_ntoa (filter->addr_mask));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -1855,7 +1855,7 @@ config_write_access_cisco (struct vty *vty, struct filter *mfilter)
vty_out (vty, " %s", inet_ntoa (filter->mask));
vty_out (vty, " %s", inet_ntoa (filter->mask_mask));
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
else
{
@@ -1866,7 +1866,7 @@ config_write_access_cisco (struct vty *vty, struct filter *mfilter)
vty_out (vty, " %s", inet_ntoa (filter->addr));
if (filter->addr_mask.s_addr != 0)
vty_out (vty, " %s", inet_ntoa (filter->addr_mask));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -1889,7 +1889,7 @@ config_write_access_zebra (struct vty *vty, struct filter *mfilter)
p->prefixlen,
filter->exact ? " exact-match" : "");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
static int
diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c
index c3e1898f1..edf55fba9 100644
--- a/lib/grammar_sandbox.c
+++ b/lib/grammar_sandbox.c
@@ -418,14 +418,14 @@ DEFUN (grammar_findambig,
prev->el->string);
vty_out (vty, " %s%s '%s'\n", cur->el->name, VTYNL,
cur->el->string);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
ambig++;
}
prev = cur;
}
list_delete (commands);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
} while (scan && scannode < LINK_PARAMS_NODE);
vty_out (vty, "%d ambiguous commands found.\n", ambig);
@@ -543,7 +543,7 @@ pretty_print_graph (struct vty *vty, struct graph_node *start, int level,
if (numto)
{
if (numto > 1)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
for (unsigned int i = 0; i < vector_active (start->to); i++)
{
struct graph_node *adj = vector_slot (start->to, i);
@@ -569,7 +569,7 @@ pretty_print_graph (struct vty *vty, struct graph_node *start, int level,
}
}
else
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
static void
diff --git a/lib/keychain.c b/lib/keychain.c
index aaa8178c8..9b7b0877e 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -990,7 +990,7 @@ keychain_config_write (struct vty *vty)
keychain_strftime (buf, BUFSIZ, &key->accept.end);
vty_out (vty, " %s", buf);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (key->send.start)
@@ -1007,7 +1007,7 @@ keychain_config_write (struct vty *vty)
keychain_strftime (buf, BUFSIZ, &key->send.end);
vty_out (vty, " %s", buf);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
vty_out (vty, "!\n");
diff --git a/lib/plist.c b/lib/plist.c
index 9f20a412e..3a9d26064 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1234,7 +1234,7 @@ vty_show_prefix_entry (struct vty *vty, afi_t afi, struct prefix_list *plist,
vty_out (vty, " (hit count: %ld, refcount: %ld)",
pentry->hitcnt, pentry->refcnt);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -1346,7 +1346,7 @@ vty_show_prefix_list_prefix (struct vty *vty, afi_t afi, const char *name,
vty_out (vty, " (hit count: %ld, refcount: %ld)",
pentry->hitcnt, pentry->refcnt);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (type == first_match_display)
return CMD_SUCCESS;
@@ -1858,7 +1858,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty)
if (pentry->le)
vty_out (vty, " le %d", pentry->le);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
/* vty_out (vty, "!%s", VTYNL); */
@@ -1901,7 +1901,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty)
if (pentry->le)
vty_out (vty, " le %d", pentry->le);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write++;
}
}
@@ -2071,7 +2071,7 @@ prefix_bgp_show_prefix_list (struct vty *vty, afi_t afi, char *name, u_char use_
if (pentry->le)
vty_out (vty, " le %d", pentry->le);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
return plist->count;
diff --git a/lib/thread.c b/lib/thread.c
index 10727dd07..df524d4ae 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -147,7 +147,7 @@ cpu_record_print(struct vty *vty, thread_type filter)
memset (underline, '-', sizeof (underline));
underline[sizeof(underline)] = '\0';
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out(vty, "Showing statistics for pthread %s\n", name);
vty_out(vty, "-------------------------------%s\n", underline);
vty_out(vty, "%21s %18s %18s\n", "", "CPU (user+system):", "Real (wall-clock):");
diff --git a/lib/vty.c b/lib/vty.c
index 8ff8280d4..0c7a5524c 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -714,7 +714,7 @@ vty_backward_word (struct vty *vty)
static void
vty_down_level (struct vty *vty)
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
cmd_exit (vty);
vty_prompt (vty);
vty->cp = 0;
@@ -724,7 +724,7 @@ vty_down_level (struct vty *vty)
static void
vty_end_config (struct vty *vty)
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
switch (vty->node)
{
@@ -929,7 +929,7 @@ vty_complete_command (struct vty *vty)
cmd_free_strvec (vline);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
switch (ret)
{
case CMD_ERR_AMBIGUOUS:
@@ -969,11 +969,11 @@ vty_complete_command (struct vty *vty)
for (i = 0; matched[i] != NULL; i++)
{
if (i != 0 && ((i % 6) == 0))
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "%-10s ", matched[i]);
XFREE (MTYPE_COMPLETION, matched[i]);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_prompt (vty);
vty_redraw_line (vty);
@@ -1052,7 +1052,7 @@ vty_describe_command (struct vty *vty)
describe = cmd_describe_command (vline, vty, &ret);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
/* Ambiguous error. */
switch (ret)
@@ -1125,7 +1125,7 @@ vty_describe_command (struct vty *vty)
vty_out(vty, " %s", item);
XFREE(MTYPE_COMPLETION, item);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
vector_free(varcomps);
}
@@ -1170,7 +1170,7 @@ vty_stop_input (struct vty *vty)
{
vty->cp = vty->length = 0;
vty_clear_buf (vty);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
switch (vty->node)
{
@@ -1294,7 +1294,7 @@ vty_telnet_option (struct vty *vty, unsigned char *buf, int nbytes)
break;
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
#endif /* TELNET_OPTION_DEBUG */
@@ -1590,7 +1590,7 @@ vty_read (struct thread *thread)
break;
case '\n':
case '\r':
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_execute (vty);
break;
case '\t':
diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index ba1ef7ece..a11d109f3 100644
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -868,7 +868,7 @@ static int interface_config_write(struct vty *vty)
if (nifp->ipsec_fallback_profile)
vty_out(vty, " fallback-profile %s",
nifp->ipsec_fallback_profile);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (nifp->source)
vty_out (vty, " tunnel source %s\n",
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index f5abead8c..fd91410fa 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -859,7 +859,7 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
vty_out (vty, " Adjacency changes are logged\n");
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
for (ALL_LIST_ELEMENTS_RO (o->area_list, n, oa))
ospf6_area_show (vty, oa);
@@ -990,7 +990,7 @@ ospf6_distance_config_write (struct vty *vty)
if (ospf6->distance_external)
vty_out (vty, " external %u", ospf6->distance_external);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
for (rn = route_top (ospf6->distance_table); rn; rn = route_next (rn))
diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index c2e158931..2b72abcd7 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -2201,7 +2201,7 @@ ospf_apiserver_show_info (struct vty *vty, struct ospf_lsa *lsa)
{
vty_out (vty, "0x%x ", olsa->data[i]);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
else
{
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 7d0c9d6ba..61b4a2ff1 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -1653,7 +1653,7 @@ show_debugging_ospf_common (struct vty *vty, struct ospf *ospf)
if (IS_DEBUG_OSPF (nssa, NSSA) == OSPF_DEBUG_NSSA)
vty_out (vty, " OSPF NSSA debugging is on\n");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index b2f9b21f4..b0405f098 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -4726,7 +4726,7 @@ show_lsa_summary (struct vty *vty, struct ospf_lsa *lsa, int self)
default:
break;
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return 0;
@@ -4788,7 +4788,7 @@ 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, VTYNL);
+ vty_out (vty, "\n");
}
vty_out (vty, " LS Type: %s\n",
lookup_msg(ospf_lsa_type_msg, lsa->data->type, NULL));
@@ -8362,7 +8362,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, VTYNL);
+ vty_out (vty, "\n");
}
/* bfd print. */
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 85e276aa0..a69e617b4 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -505,8 +505,8 @@ static void pim_print_ifp_flags(struct vty *vty, struct interface *ifp, int mloo
vty_out (vty, "Multicast Loop : %d\n", mloop);
vty_out (vty, "Promiscuous : %s\n",
(ifp->flags & IFF_PROMISC) ? "yes" : "no");
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
}
static void igmp_show_interfaces(struct vty *vty, u_char uj)
@@ -665,8 +665,8 @@ static void igmp_show_interfaces_single(struct vty *vty, const char *ifname, u_c
inet_ntoa(pim_ifp->primary_address));
vty_out (vty, "Uptime : %s\n", uptime);
vty_out (vty, "Version : %d\n", pim_ifp->igmp_version);
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
vty_out (vty, "Querier\n");
vty_out (vty, "-------\n");
@@ -675,8 +675,8 @@ static void igmp_show_interfaces_single(struct vty *vty, const char *ifname, u_c
vty_out (vty, "Start Count : %d\n", igmp->startup_query_count);
vty_out (vty, "Query Timer : %s\n", query_hhmmss);
vty_out (vty, "Other Timer : %s\n", other_hhmmss);
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
vty_out (vty, "Timers\n");
vty_out (vty, "------\n");
@@ -695,8 +695,8 @@ static void igmp_show_interfaces_single(struct vty *vty, const char *ifname, u_c
vty_out (vty, "Robustness Variable : %d\n",
igmp->querier_robustness_variable);
vty_out (vty, "Startup Query Interval : %ds\n", sqi);
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
pim_print_ifp_flags(vty, ifp, mloop);
}
@@ -941,7 +941,7 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch
} else {
vty_out (vty, "Address : %s\n", inet_ntoa(ifaddr));
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
// PIM neighbors
print_header = 1;
@@ -962,8 +962,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch
}
if (!print_header) {
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
}
vty_out (vty, "Designated Router\n");
@@ -973,8 +973,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch
vty_out (vty, "Uptime : %s\n", dr_uptime);
vty_out (vty, "Elections : %d\n", pim_ifp->pim_dr_election_count);
vty_out (vty, "Changes : %d\n", pim_ifp->pim_dr_election_changes);
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
// FHR
print_header = 1;
@@ -998,8 +998,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch
}
if (!print_header) {
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
}
vty_out (vty, "Hellos\n");
@@ -1014,8 +1014,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch
vty_out (vty, "Send Failed : %d\n",
pim_ifp->pim_ifstat_hello_sendfail);
vty_out (vty, "Generation ID : %08x\n", pim_ifp->pim_generation_id);
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
pim_print_ifp_flags(vty, ifp, mloop);
@@ -1029,8 +1029,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch
pim_if_effective_override_interval_msec(ifp));
vty_out (vty, "Join Prune Override Interval : %d msec\n",
pim_if_jp_override_interval_msec(ifp));
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
vty_out (vty, "LAN Prune Delay\n");
vty_out (vty, "---------------\n");
@@ -1042,8 +1042,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch
pim_ifp->pim_override_interval_msec);
vty_out (vty, "Override Interval (Highest) : %d msec\n",
pim_ifp->pim_neighbors_highest_override_interval_msec);
- vty_out (vty, VTYNL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
+ vty_out (vty, "\n");
}
}
@@ -1153,7 +1153,7 @@ static void pim_show_interface_traffic (struct vty *vty, u_char uj)
json = json_object_new_object ();
else
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n", "Interface",
" HELLO", " JOIN", " PRUNE", " REGISTER",
" REGISTER-STOP", " ASSERT");
@@ -1227,7 +1227,7 @@ static void pim_show_interface_traffic_single (struct vty *vty, const char *ifna
json = json_object_new_object ();
else
{
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n", "Interface",
" HELLO", " JOIN", " PRUNE", " REGISTER",
" REGISTER-STOP", " ASSERT");
@@ -1537,7 +1537,7 @@ static void pim_show_neighbors_single(struct vty *vty, const char *neighbor, u_c
vty_out (vty, " Hello Option - T-bit : %s\n",
option_t_bit ? "yes" : "no");
pim_bfd_show_info (vty, neigh->bfd_info, json_ifp, uj, 0);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
}
@@ -1690,7 +1690,7 @@ pim_show_state(struct vty *vty, const char *src_or_group, const char *group, u_c
}
if (!uj)
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
@@ -1699,7 +1699,7 @@ pim_show_state(struct vty *vty, const char *src_or_group, const char *group, u_c
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else {
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
@@ -2200,7 +2200,7 @@ static void pim_show_rpf(struct vty *vty, u_char uj)
show_rpf_refresh_stats(vty, now, json);
} else {
show_rpf_refresh_stats(vty, now, json);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty,
"Source Group RpfIface RpfAddress RibNextHop Metric Pref\n");
}
@@ -2277,7 +2277,7 @@ pim_print_pnc_cache_walkcb (struct hash_backet *backet, void *arg)
vty_out (vty, "%-15s ", inet_ntoa (pnc->rpf.rpf_addr.u.prefix4));
vty_out (vty, "%-14s ", ifp ? ifp->name : "NULL");
vty_out (vty, "%s ", inet_ntoa (nh_node->gate.ipv4));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return CMD_SUCCESS;
}
@@ -3196,7 +3196,7 @@ static void show_multicast_interfaces(struct vty *vty)
struct listnode *node;
struct interface *ifp;
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty,
"Interface Address ifi Vif PktsIn PktsOut BytesIn BytesOut\n");
@@ -3256,16 +3256,16 @@ DEFUN (show_ip_multicast,
vty_out (vty, "Mroute socket uptime: %s\n",
uptime);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
pim_zebra_zclient_update (vty);
pim_zlookup_show_ip_multicast (vty);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "Maximum highest VifIndex: %d\n",
PIM_MAX_USABLE_VIFS);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "Upstream Join Timer: %d secs\n",
qpim_t_periodic);
vty_out (vty, "Join/Prune Holdtime: %d secs\n",
@@ -3275,11 +3275,11 @@ DEFUN (show_ip_multicast,
vty_out (vty, "PIM ECMP Rebalance: %s\n",
qpim_ecmp_rebalance_enable ? "Enable" : "Disable");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
show_rpf_refresh_stats(vty, now, NULL);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
show_scan_oil_stats(vty, now);
@@ -3587,7 +3587,7 @@ static void show_mroute_count(struct vty *vty)
struct channel_oil *c_oil;
struct static_route *s_route;
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty,
"Source Group LastUsed Packets Bytes WrongIf \n");
@@ -6515,7 +6515,7 @@ ip_msdp_show_peers_detail(struct vty *vty, const char *peer, u_char uj)
mp->ka_tx_cnt, mp->ka_rx_cnt);
vty_out (vty, " SAs : %10d %10d\n",
mp->sa_tx_cnt, mp->sa_rx_cnt);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
@@ -6684,7 +6684,7 @@ ip_msdp_show_sa_entry_detail(struct pim_msdp_sa *sa, const char *src_str,
vty_out (vty, " SPT Setup : %s\n", spt_str);
vty_out (vty, " Uptime : %s\n", timebuf);
vty_out (vty, " State Timer : %s\n", statetimer);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index ccfd44696..81b49c630 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -254,7 +254,7 @@ int pim_interface_config_write(struct vty *vty)
vty_out(vty, " ip pim hello %d", pim_ifp->pim_hello_period);
if (pim_ifp->pim_default_holdtime != -1)
vty_out(vty, " %d", pim_ifp->pim_default_holdtime);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* update source */
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index d713fe6fe..bff8a4ce2 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -1882,7 +1882,7 @@ rip_interface_config_write (struct vty *vty)
vty_out (vty, " auth-length old-ripd");
else
vty_out (vty, " auth-length rfc");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (ri->auth_str)
diff --git a/ripd/ripd.c b/ripd/ripd.c
index e590d4839..5bbab7e4c 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3534,7 +3534,7 @@ DEFUN (show_ip_rip,
vty_out (vty, "%3"ROUTE_TAG_PRI, (route_tag_t)rinfo->tag);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
return CMD_SUCCESS;
}
@@ -3576,7 +3576,7 @@ DEFUN (show_ip_rip_status,
/* Redistribute information. */
vty_out (vty, " Redistributing:");
config_write_rip_redistribute (vty, 0);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " Default version control: send version %s,",
lookup_msg(ri_version_msg,rip->version_send, NULL));
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index 2519b75f4..4b5567f77 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2026,7 +2026,7 @@ DEFUN (show_ipv6_ripng,
vty_out (vty, "R(a) %s/%d ",
inet6_ntoa (p->prefix), p->prefixlen);
#endif /* DEBUG */
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "%*s", 18, " ");
vty_out (vty, "%*s", 28, " ");
@@ -2051,7 +2051,7 @@ DEFUN (show_ipv6_ripng,
ripng_route_subtype_print(rinfo),
inet6_ntoa (p->prefix), p->prefixlen);
#endif /* DEBUG */
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "%*s", 18, " ");
len = vty_out (vty, "%s", inet6_ntoa (rinfo->nexthop));
@@ -2089,7 +2089,7 @@ DEFUN (show_ipv6_ripng,
ripng_vty_out_uptime (vty, rinfo);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
@@ -2128,7 +2128,7 @@ DEFUN (show_ipv6_ripng_status,
/* Redistribute information. */
vty_out (vty, " Redistributing:");
ripng_redistribute_write (vty, 0);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, " Default version control: send version %d,", ripng->version);
vty_out (vty, " receive version %d \n",ripng->version);
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 794708683..02606b88a 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -815,7 +815,7 @@ vtysh_rl_describe (void)
fprintf (stdout, " %s", item);
XFREE (MTYPE_COMPLETION, item);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
vector_free (varcomps);
}
@@ -2832,7 +2832,7 @@ DEFUN (vtysh_show_daemons,
for (i = 0; i < array_size(vtysh_client); i++)
if ( vtysh_client[i].fd >= 0 )
vty_out(vty, " %s", vtysh_client[i].name);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
diff --git a/zebra/interface.c b/zebra/interface.c
index 291a79274..550f6fc24 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -944,7 +944,7 @@ connected_dump_vty (struct vty *vty, struct connected *connected)
if (connected->label)
vty_out (vty, " %s", connected->label);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Dump interface neighbor address information to vty. */
@@ -959,7 +959,7 @@ nbr_connected_dump_vty (struct vty *vty, struct nbr_connected *connected)
prefix_vty_out (vty, p);
vty_out (vty, "/%d", p->prefixlen);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
#if defined (HAVE_RTADV)
@@ -1089,14 +1089,14 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
vty_out (vty, " HWaddr: ");
for (i = 0; i < ifp->hw_addr_len; i++)
vty_out (vty, "%s%02x", i == 0 ? "" : ":", ifp->hw_addr[i]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Bandwidth in Mbps */
if (ifp->bandwidth != 0)
{
vty_out(vty, " bandwidth %u Mbps", ifp->bandwidth);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
for (rn = route_top (zebra_if->ipv4_subnets); rn; rn = route_next (rn))
@@ -1144,7 +1144,7 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
vty_out(vty, " Min: %u (micro-sec.)", iflp->min_delay);
vty_out(vty, " Max: %u (micro-sec.)", iflp->max_delay);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
vty_out (vty, " Link Delay Variation %u (micro-sec.)\n",
@@ -1422,7 +1422,7 @@ if_show_description (struct vty *vty, vrf_id_t vrf_id)
if (ifp->desc)
vty_out (vty, "%s", ifp->desc);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
@@ -2767,7 +2767,7 @@ link_params_config_write (struct vty *vty, struct interface *ifp)
vty_out(vty, " min %u", iflp->min_delay);
vty_out(vty, " max %u", iflp->max_delay);
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
vty_out (vty, " delay-variation %u\n", iflp->delay_var);
@@ -2844,7 +2844,7 @@ if_config_write (struct vty *vty)
if (ifc->label)
vty_out (vty, " label %s", ifc->label);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index 1b34e46ec..a82c57b60 100644
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -698,7 +698,7 @@ zebra_import_table_config (struct vty *vty)
if (rmap_name)
vty_out(vty, " route-map %s", rmap_name);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write = 1;
}
}
diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index 1ba8dd7d1..c4fe4ac84 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -1561,7 +1561,7 @@ rtadv_config_write (struct vty *vty, struct interface *ifp)
vty_out (vty, " no-autoconfig");
if (rprefix->AdvRouterAddressFlag)
vty_out (vty, " router-address");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index d78c1629b..3c8503878 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -534,14 +534,14 @@ fec_print (zebra_fec_t *fec, struct vty *vty)
vty_out(vty, " Label: %s", label2str(fec->label, buf, BUFSIZ));
if (fec->label_index != MPLS_INVALID_LABEL_INDEX)
vty_out(vty, ", Label Index: %u", fec->label_index);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
if (!list_isempty(fec->client_list))
{
vty_out(vty, " Client list:");
for (ALL_LIST_ELEMENTS_RO(fec->client_list, node, client))
vty_out(vty, " %s(fd %d)",
zebra_route_string(client->proto), client->sock);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
}
@@ -1422,7 +1422,7 @@ nhlfe_print (zebra_nhlfe_t *nhlfe, struct vty *vty)
}
vty_out(vty, "%s", CHECK_FLAG (nhlfe->flags, NHLFE_FLAG_INSTALLED) ?
" (installed)" : "");
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/*
@@ -2875,7 +2875,7 @@ zebra_mpls_print_lsp_table (struct vty *vty, struct zebra_vrf *zvrf,
}
}
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
list_delete (lsp_list);
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 1da288cca..3810cc8dd 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1627,7 +1627,7 @@ vty_show_ip_route_summary (struct vty *vty, struct route_table *table)
vty_out (vty, "------\n");
vty_out (vty, "%-20s %-20d %-20d \n", "Totals", rib_cnt[ZEBRA_ROUTE_TOTAL],
fib_cnt[ZEBRA_ROUTE_TOTAL]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/*
@@ -1705,7 +1705,7 @@ vty_show_ip_route_summary_prefix (struct vty *vty, struct route_table *table)
vty_out (vty, "------\n");
vty_out (vty, "%-20s %-20d %-20d \n", "Totals", rib_cnt[ZEBRA_ROUTE_TOTAL],
fib_cnt[ZEBRA_ROUTE_TOTAL]);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
/* Show route summary. */
@@ -1958,7 +1958,7 @@ static_config (struct vty *vty, afi_t afi, safi_t safi, const char *cmd)
mpls_label2str (si->snh_label.num_labels,
si->snh_label.label, buf, sizeof buf, 0));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
write = 1;
}
@@ -3040,7 +3040,7 @@ DEFUN (show_vrf,
vty_out (vty, "inactive");
else
vty_out (vty, "id %u table %u", zvrf_id (zvrf), zvrf->table_id);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
}
diff --git a/zebra/zserv.c b/zebra/zserv.c
index a89f4f591..d64ce8155 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2676,7 +2676,7 @@ zebra_show_client_detail (struct vty *vty, struct zserv *client)
vty_out (vty, "Client: %s", zebra_route_string(client->proto));
if (client->instance)
vty_out (vty, " Instance: %d", client->instance);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "------------------------ \n");
vty_out (vty, "FD: %d \n", client->sock);
@@ -2707,7 +2707,7 @@ zebra_show_client_detail (struct vty *vty, struct zserv *client)
if (client->last_write_time)
vty_out (vty, "Last Sent Cmd: %s \n",
zserv_command_string(client->last_write_cmd));
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
vty_out (vty, "Type Add Update Del \n");
vty_out (vty, "================================================== \n");
@@ -2726,7 +2726,7 @@ zebra_show_client_detail (struct vty *vty, struct zserv *client)
vty_out (vty, "Interface Up Notifications: %d\n",client->ifup_cnt);
vty_out (vty, "Interface Down Notifications: %d\n",client->ifdown_cnt);
- vty_out (vty, VTYNL);
+ vty_out (vty, "\n");
return;
}