proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 21:37:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: remove VTYNL, part 2 of 6

Browse Source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-07-13 19:12:39 +02:00
parent 6d3c2ed4ed
commit 26a429fe8e
28 changed files with 442 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

348
bgpd/bgp_vty.c
View File

File diff suppressed because it is too large Load Diff

14
bgpd/rfapi/bgp_rfapi_cfg.c
View File

@ -2430,7 +2430,7 @@ DEFUN_NOSH (vnc_nve_group,
if (!rfg) if (!rfg)
{ {
/* Error out of memory */ /* Error out of memory */
vty_out (vty, "Can't allocate memory for NVE group%s", VTYNL); vty_out (vty, "Can't allocate memory for NVE group\n");
return CMD_WARNING; return CMD_WARNING;
} }
@ -3255,7 +3255,7 @@ DEFUN_NOSH (vnc_vrf_policy,
if (!bgp) if (!bgp)
{ {
vty_out (vty, "No BGP process is configured%s", VTYNL); vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING; return CMD_WARNING;
} }
@ -3268,7 +3268,7 @@ DEFUN_NOSH (vnc_vrf_policy,
if (!rfg) if (!rfg)
{ {
/* Error out of memory */ /* Error out of memory */
vty_out (vty, "Can't allocate memory for NVE group%s", VTYNL); vty_out (vty, "Can't allocate memory for NVE group\n");
return CMD_WARNING; return CMD_WARNING;
} }
} }
@ -3398,7 +3398,7 @@ DEFUN (vnc_vrf_policy_nexthop,
if (!str2prefix (argv[1]->arg, &p) && p.family) if (!str2prefix (argv[1]->arg, &p) && p.family)
{ {
//vty_out (vty, "Nexthop set to self%s", VTYNL); //vty_out (vty, "Nexthop set to self\n");
SET_FLAG (rfg->flags, RFAPI_RFG_VPN_NH_SELF); SET_FLAG (rfg->flags, RFAPI_RFG_VPN_NH_SELF);
memset(&rfg->vn_prefix, 0, sizeof(struct prefix)); memset(&rfg->vn_prefix, 0, sizeof(struct prefix));
} }
@ -3742,7 +3742,7 @@ DEFUN_NOSH (vnc_l2_group,
if (!bgp) if (!bgp)
{ {
vty_out (vty, "No BGP process is configured%s", VTYNL); vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING; return CMD_WARNING;
} }
@ -3755,7 +3755,7 @@ DEFUN_NOSH (vnc_l2_group,
if (!rfg) if (!rfg)
{ {
/* Error out of memory */ /* Error out of memory */
vty_out (vty, "Can't allocate memory for L2 group%s", VTYNL); vty_out (vty, "Can't allocate memory for L2 group\n");
return CMD_WARNING; return CMD_WARNING;
} }
rfg->name = strdup (argv[1]->arg); rfg->name = strdup (argv[1]->arg);
@ -4296,7 +4296,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)); inet_ntop(rfg->vn_prefix.family, &rfg->vn_prefix.u.prefix, buf, sizeof(buf));
if (!buf[0] || buf[BUFSIZ - 1]) if (!buf[0] || buf[BUFSIZ - 1])
{ {
//vty_out (vty, "nexthop self%s", VTYNL); //vty_out (vty, "nexthop self\n");
} }
else else
{ {

3
lib/if.c
View File

@ -745,8 +745,7 @@ DEFUN_NOSH (no_interface,
if (CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE)) if (CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
{ {
vty_out (vty, "%% Only inactive interfaces can be deleted%s", vty_out (vty, "%% Only inactive interfaces can be deleted\n");
VTYNL);
return CMD_WARNING; return CMD_WARNING;
} }

2
lib/plist.c
View File

@ -1861,7 +1861,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty)
vty_out (vty, "\n"); vty_out (vty, "\n");
write++; write++;
} }
/* vty_out (vty, "!%s", VTYNL); */ /* vty_out (vty, "!\n"); */
} }
for (plist = master->str.head; plist; plist = plist->next) for (plist = master->str.head; plist; plist = plist->next)

2
lib/smux.c
View File

@ -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); ret = smux_str2oid (oid_str, oid, &oid_len);
if (ret != 0) if (ret != 0)
{ {
vty_out (vty, "object ID malformed%s", VTYNL); vty_out (vty, "object ID malformed\n");
return CMD_WARNING; return CMD_WARNING;
} }

3
lib/vrf.c
View File

@ -507,8 +507,7 @@ DEFUN_NOSH (no_vrf,
if (CHECK_FLAG (vrfp->status, VRF_ACTIVE)) if (CHECK_FLAG (vrfp->status, VRF_ACTIVE))
{ {
vty_out (vty, "%% Only inactive VRFs can be deleted%s", vty_out (vty, "%% Only inactive VRFs can be deleted\n");
VTYNL);
return CMD_WARNING; return CMD_WARNING;
} }

2
lib/vty.c
View File

@ -938,7 +938,7 @@ vty_complete_command (struct vty *vty)
vty_redraw_line (vty); vty_redraw_line (vty);
break; break;
case CMD_ERR_NO_MATCH: case CMD_ERR_NO_MATCH:
/* vty_out (vty, "%% There is no matched command.%s", VTYNL); */ /* vty_out (vty, "%% There is no matched command.\n"); */
vty_prompt (vty); vty_prompt (vty);
vty_redraw_line (vty); vty_redraw_line (vty);
break; break;

2
ospf6d/ospf6_abr.c
View File

@ -1149,7 +1149,7 @@ int
config_write_ospf6_debug_abr (struct vty *vty) config_write_ospf6_debug_abr (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_ABR) if (IS_OSPF6_DEBUG_ABR)
vty_out (vty, "debug ospf6 abr%s", VTYNL); vty_out (vty, "debug ospf6 abr\n");
return 0; return 0;
} }

4
ospf6d/ospf6_area.c
View File

@ -389,7 +389,7 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
vty_out (vty, " Interface attached to this area:"); vty_out (vty, " Interface attached to this area:");
for (ALL_LIST_ELEMENTS_RO (oa->if_list, i, oi)) for (ALL_LIST_ELEMENTS_RO (oa->if_list, i, oi))
vty_out (vty, " %s", oi->interface->name); vty_out (vty, " %s", oi->interface->name);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
if (oa->ts_spf.tv_sec || oa->ts_spf.tv_usec) if (oa->ts_spf.tv_sec || oa->ts_spf.tv_usec)
{ {
@ -583,7 +583,7 @@ ospf6_area_config_write (struct vty *vty)
if (range->path.u.cost_config != OSPF_AREA_RANGE_COST_UNSPEC) if (range->path.u.cost_config != OSPF_AREA_RANGE_COST_UNSPEC)
vty_out (vty, " cost %d", range->path.u.cost_config); vty_out (vty, " cost %d", range->path.u.cost_config);
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
} }
if (IS_AREA_STUB (oa)) if (IS_AREA_STUB (oa))

10
ospf6d/ospf6_asbr.c
View File

@ -789,7 +789,7 @@ ospf6_redistribute_show_config (struct vty *vty)
total++; total++;
} }
vty_out (vty, "Redistributing External Routes from:%s", VTYNL); vty_out (vty, "Redistributing External Routes from:\n");
for (type = 0; type < ZEBRA_ROUTE_MAX; type++) for (type = 0; type < ZEBRA_ROUTE_MAX; type++)
{ {
if (type == ZEBRA_ROUTE_OSPF6) if (type == ZEBRA_ROUTE_OSPF6)
@ -1082,13 +1082,13 @@ route_map_command_status (struct vty *vty, int ret)
switch (ret) switch (ret)
{ {
case RMAP_RULE_MISSING: case RMAP_RULE_MISSING:
vty_out (vty, "OSPF6 Can't find rule.%s", VTYNL); vty_out (vty, "OSPF6 Can't find rule.\n");
break; break;
case RMAP_COMPILE_ERROR: case RMAP_COMPILE_ERROR:
vty_out (vty, "OSPF6 Argument is malformed.%s", VTYNL); vty_out (vty, "OSPF6 Argument is malformed.\n");
break; break;
default: default:
vty_out (vty, "OSPF6 route-map add set failed.%s", VTYNL); vty_out (vty, "OSPF6 route-map add set failed.\n");
break; break;
} }
return CMD_WARNING; return CMD_WARNING;
@ -1399,7 +1399,7 @@ int
config_write_ospf6_debug_asbr (struct vty *vty) config_write_ospf6_debug_asbr (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_ASBR) if (IS_OSPF6_DEBUG_ASBR)
vty_out (vty, "debug ospf6 asbr%s", VTYNL); vty_out (vty, "debug ospf6 asbr\n");
return 0; return 0;
} }

2
ospf6d/ospf6_flood.c
View File

@ -1032,7 +1032,7 @@ int
config_write_ospf6_debug_flood (struct vty *vty) config_write_ospf6_debug_flood (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_FLOODING) if (IS_OSPF6_DEBUG_FLOODING)
vty_out (vty, "debug ospf6 flooding%s", VTYNL); vty_out (vty, "debug ospf6 flooding\n");
return 0; return 0;
} }

20
ospf6d/ospf6_interface.c
View File

@ -924,13 +924,13 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
if (ifp->info == NULL) if (ifp->info == NULL)
{ {
vty_out (vty, " OSPF not enabled on this interface%s", VTYNL); vty_out (vty, " OSPF not enabled on this interface\n");
return 0; return 0;
} }
else else
oi = (struct ospf6_interface *) ifp->info; oi = (struct ospf6_interface *) ifp->info;
vty_out (vty, " Internet Address:%s", VTYNL); vty_out (vty, " Internet Address:\n");
for (ALL_LIST_ELEMENTS_RO (ifp->connected, i, c)) for (ALL_LIST_ELEMENTS_RO (ifp->connected, i, c))
{ {
@ -965,13 +965,13 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
VTYNL); VTYNL);
} }
else else
vty_out (vty, " Not Attached to Area%s", VTYNL); vty_out (vty, " Not Attached to Area\n");
vty_out (vty, " State %s, Transmit Delay %d sec, Priority %d%s", vty_out (vty, " State %s, Transmit Delay %d sec, Priority %d%s",
ospf6_interface_state_str[oi->state], ospf6_interface_state_str[oi->state],
oi->transdelay, oi->priority, oi->transdelay, oi->priority,
VTYNL); VTYNL);
vty_out (vty, " Timer intervals configured:%s", VTYNL); vty_out (vty, " Timer intervals configured:\n");
vty_out (vty, " Hello %d, Dead %d, Retransmit %d%s", vty_out (vty, " Hello %d, Dead %d, Retransmit %d%s",
oi->hello_interval, oi->dead_interval, oi->rxmt_interval, oi->hello_interval, oi->dead_interval, oi->rxmt_interval,
VTYNL); VTYNL);
@ -1810,22 +1810,22 @@ config_write_ospf6_interface (struct vty *vty)
oi->plist_name, VTYNL); oi->plist_name, VTYNL);
if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE)) if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE))
vty_out (vty, " ipv6 ospf6 passive%s", VTYNL); vty_out (vty, " ipv6 ospf6 passive\n");
if (oi->mtu_ignore) if (oi->mtu_ignore)
vty_out (vty, " ipv6 ospf6 mtu-ignore%s", VTYNL); vty_out (vty, " ipv6 ospf6 mtu-ignore\n");
if (oi->type != ospf6_default_iftype(ifp)) if (oi->type != ospf6_default_iftype(ifp))
{ {
if (oi->type == OSPF_IFTYPE_POINTOPOINT) if (oi->type == OSPF_IFTYPE_POINTOPOINT)
vty_out (vty, " ipv6 ospf6 network point-to-point%s", VTYNL); vty_out (vty, " ipv6 ospf6 network point-to-point\n");
else if (oi->type == OSPF_IFTYPE_BROADCAST) else if (oi->type == OSPF_IFTYPE_BROADCAST)
vty_out (vty, " ipv6 ospf6 network broadcast%s", VTYNL); vty_out (vty, " ipv6 ospf6 network broadcast\n");
} }
ospf6_bfd_write_config(vty, oi); ospf6_bfd_write_config(vty, oi);
vty_out (vty, "!%s", VTYNL); vty_out (vty, "!\n");
} }
return 0; return 0;
} }
@ -1966,7 +1966,7 @@ int
config_write_ospf6_debug_interface (struct vty *vty) config_write_ospf6_debug_interface (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_INTERFACE) if (IS_OSPF6_DEBUG_INTERFACE)
vty_out (vty, "debug ospf6 interface%s", VTYNL); vty_out (vty, "debug ospf6 interface\n");
return 0; return 0;
} }

2
ospf6d/ospf6_intra.c
View File

@ -1793,7 +1793,7 @@ config_write_ospf6_debug_brouter (struct vty *vty)
{ {
char buf[16]; char buf[16];
if (IS_OSPF6_DEBUG_BROUTER) if (IS_OSPF6_DEBUG_BROUTER)
vty_out (vty, "debug ospf6 border-routers%s", VTYNL); vty_out (vty, "debug ospf6 border-routers\n");
if (IS_OSPF6_DEBUG_BROUTER_SPECIFIC_ROUTER) if (IS_OSPF6_DEBUG_BROUTER_SPECIFIC_ROUTER)
{ {
inet_ntop (AF_INET, &conf_debug_ospf6_brouter_specific_router_id, inet_ntop (AF_INET, &conf_debug_ospf6_brouter_specific_router_id,

10
ospf6d/ospf6_lsa.c
View File

@ -54,7 +54,7 @@ ospf6_unknown_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
start = (u_char *) lsa->header + sizeof (struct ospf6_lsa_header); start = (u_char *) lsa->header + sizeof (struct ospf6_lsa_header);
end = (u_char *) lsa->header + ntohs (lsa->header->length); end = (u_char *) lsa->header + ntohs (lsa->header->length);
vty_out (vty, " Unknown contents:%s", VTYNL); vty_out (vty, " Unknown contents:\n");
for (current = start; current < end; current ++) for (current = start; current < end; current ++)
{ {
if ((current - start) % 16 == 0) if ((current - start) % 16 == 0)
@ -445,7 +445,7 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
start = (u_char *) lsa->header; start = (u_char *) lsa->header;
end = (u_char *) lsa->header + ntohs (lsa->header->length); end = (u_char *) lsa->header + ntohs (lsa->header->length);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
vty_out (vty, "%s:%s", lsa->name, VTYNL); vty_out (vty, "%s:%s", lsa->name, VTYNL);
for (current = start; current < end; current ++) for (current = start; current < end; current ++)
@ -474,7 +474,7 @@ ospf6_lsa_show_internal (struct vty *vty, struct ospf6_lsa *lsa)
inet_ntop (AF_INET, &lsa->header->adv_router, inet_ntop (AF_INET, &lsa->header->adv_router,
adv_router, sizeof (adv_router)); adv_router, sizeof (adv_router));
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
vty_out (vty, "Age: %4hu Type: %s%s", ospf6_lsa_age_current (lsa), vty_out (vty, "Age: %4hu Type: %s%s", ospf6_lsa_age_current (lsa),
ospf6_lstype_name (lsa->header->type), VTYNL); ospf6_lstype_name (lsa->header->type), VTYNL);
vty_out (vty, "Link State ID: %s%s", id, VTYNL); vty_out (vty, "Link State ID: %s%s", id, VTYNL);
@ -489,7 +489,7 @@ ospf6_lsa_show_internal (struct vty *vty, struct ospf6_lsa *lsa)
vty_out (vty, "ReTx Count: %d%s", lsa->retrans_count, VTYNL); vty_out (vty, "ReTx Count: %d%s", lsa->retrans_count, VTYNL);
vty_out (vty, "Threads: Expire: 0x%p, Refresh: 0x%p %s", vty_out (vty, "Threads: Expire: 0x%p, Refresh: 0x%p %s",
(void *)lsa->expire, (void *)lsa->refresh, VTYNL); (void *)lsa->expire, (void *)lsa->refresh, VTYNL);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return; return;
} }
@ -527,7 +527,7 @@ ospf6_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
handler = &unknown_handler; handler = &unknown_handler;
(*handler->show) (vty, lsa); (*handler->show) (vty, lsa);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
} }
/* OSPFv3 LSA creation/deletion function */ /* OSPFv3 LSA creation/deletion function */

12
ospf6d/ospf6_message.c
View File

@ -2459,29 +2459,29 @@ config_write_ospf6_debug_message (struct vty *vty)
if (s == 0x3f && r == 0x3f) if (s == 0x3f && r == 0x3f)
{ {
vty_out (vty, "debug ospf6 message all%s", VTYNL); vty_out (vty, "debug ospf6 message all\n");
return 0; return 0;
} }
if (s == 0x3f && r == 0) if (s == 0x3f && r == 0)
{ {
vty_out (vty, "debug ospf6 message all send%s", VTYNL); vty_out (vty, "debug ospf6 message all send\n");
return 0; return 0;
} }
else if (s == 0 && r == 0x3f) else if (s == 0 && r == 0x3f)
{ {
vty_out (vty, "debug ospf6 message all recv%s", VTYNL); vty_out (vty, "debug ospf6 message all recv\n");
return 0; return 0;
} }
/* Unknown message is logged by default */ /* Unknown message is logged by default */
if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, SEND) && if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, SEND) &&
! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, RECV)) ! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, RECV))
vty_out (vty, "no debug ospf6 message unknown%s", VTYNL); vty_out (vty, "no debug ospf6 message unknown\n");
else if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, SEND)) else if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, SEND))
vty_out (vty, "no debug ospf6 message unknown send%s", VTYNL); vty_out (vty, "no debug ospf6 message unknown send\n");
else if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, RECV)) else if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, RECV))
vty_out (vty, "no debug ospf6 message unknown recv%s", VTYNL); vty_out (vty, "no debug ospf6 message unknown recv\n");
for (i = 1; i < 6; i++) for (i = 1; i < 6; i++)
{ {

6
ospf6d/ospf6_neighbor.c
View File

@ -1016,11 +1016,11 @@ config_write_ospf6_debug_neighbor (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_NEIGHBOR (STATE) && if (IS_OSPF6_DEBUG_NEIGHBOR (STATE) &&
IS_OSPF6_DEBUG_NEIGHBOR (EVENT)) IS_OSPF6_DEBUG_NEIGHBOR (EVENT))
vty_out (vty, "debug ospf6 neighbor%s", VTYNL); vty_out (vty, "debug ospf6 neighbor\n");
else if (IS_OSPF6_DEBUG_NEIGHBOR (STATE)) else if (IS_OSPF6_DEBUG_NEIGHBOR (STATE))
vty_out (vty, "debug ospf6 neighbor state%s", VTYNL); vty_out (vty, "debug ospf6 neighbor state\n");
else if (IS_OSPF6_DEBUG_NEIGHBOR (EVENT)) else if (IS_OSPF6_DEBUG_NEIGHBOR (EVENT))
vty_out (vty, "debug ospf6 neighbor event%s", VTYNL); vty_out (vty, "debug ospf6 neighbor event\n");
return 0; return 0;
} }

12
ospf6d/ospf6_route.c
View File

@ -1131,7 +1131,7 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
vty_out (vty, "Router Bits: %s%s", capa, VTYNL); vty_out (vty, "Router Bits: %s%s", capa, VTYNL);
/* Prefix Options */ /* Prefix Options */
vty_out (vty, "Prefix Options: xxx%s", VTYNL); vty_out (vty, "Prefix Options: xxx\n");
/* Metrics */ /* Metrics */
vty_out (vty, "Metric Type: %d%s", route->path.metric_type, vty_out (vty, "Metric Type: %d%s", route->path.metric_type,
@ -1140,7 +1140,7 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
route->path.cost, route->path.u.cost_e2, VTYNL); route->path.cost, route->path.u.cost_e2, VTYNL);
/* Nexthops */ /* Nexthops */
vty_out (vty, "Nexthop:%s", VTYNL); vty_out (vty, "Nexthop:\n");
for (ALL_LIST_ELEMENTS_RO (route->nh_list, node, nh)) for (ALL_LIST_ELEMENTS_RO (route->nh_list, node, nh))
{ {
/* nexthop */ /* nexthop */
@ -1148,7 +1148,7 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
ifname = ifindex2ifname (nh->ifindex, VRF_DEFAULT); ifname = ifindex2ifname (nh->ifindex, VRF_DEFAULT);
vty_out (vty, " %s %.*s%s", nexthop, IFNAMSIZ, ifname, VTYNL); vty_out (vty, " %s %.*s%s", nexthop, IFNAMSIZ, ifname, VTYNL);
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
} }
static void static void
@ -1619,11 +1619,11 @@ int
config_write_ospf6_debug_route (struct vty *vty) config_write_ospf6_debug_route (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_ROUTE (TABLE)) if (IS_OSPF6_DEBUG_ROUTE (TABLE))
vty_out (vty, "debug ospf6 route table%s", VTYNL); vty_out (vty, "debug ospf6 route table\n");
if (IS_OSPF6_DEBUG_ROUTE (INTRA)) if (IS_OSPF6_DEBUG_ROUTE (INTRA))
vty_out (vty, "debug ospf6 route intra-area%s", VTYNL); vty_out (vty, "debug ospf6 route intra-area\n");
if (IS_OSPF6_DEBUG_ROUTE (INTER)) if (IS_OSPF6_DEBUG_ROUTE (INTER))
vty_out (vty, "debug ospf6 route inter-area%s", VTYNL); vty_out (vty, "debug ospf6 route inter-area\n");
return 0; return 0;
} }

8
ospf6d/ospf6_spf.c
View File

@ -748,7 +748,7 @@ ospf6_spf_display_subtree (struct vty *vty, const char *prefix, int rest,
next_prefix = (char *) malloc (len); next_prefix = (char *) malloc (len);
if (next_prefix == NULL) if (next_prefix == NULL)
{ {
vty_out (vty, "malloc failed%s", VTYNL); vty_out (vty, "malloc failed\n");
return; return;
} }
snprintf (next_prefix, len, "%s%s", prefix, (rest ? "| " : " ")); snprintf (next_prefix, len, "%s%s", prefix, (rest ? "| " : " "));
@ -914,11 +914,11 @@ int
config_write_ospf6_debug_spf (struct vty *vty) config_write_ospf6_debug_spf (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_SPF (PROCESS)) if (IS_OSPF6_DEBUG_SPF (PROCESS))
vty_out (vty, "debug ospf6 spf process%s", VTYNL); vty_out (vty, "debug ospf6 spf process\n");
if (IS_OSPF6_DEBUG_SPF (TIME)) if (IS_OSPF6_DEBUG_SPF (TIME))
vty_out (vty, "debug ospf6 spf time%s", VTYNL); vty_out (vty, "debug ospf6 spf time\n");
if (IS_OSPF6_DEBUG_SPF (DATABASE)) if (IS_OSPF6_DEBUG_SPF (DATABASE))
vty_out (vty, "debug ospf6 spf database%s", VTYNL); vty_out (vty, "debug ospf6 spf database\n");
return 0; return 0;
} }

12
ospf6d/ospf6_top.c
View File

@ -315,7 +315,7 @@ DEFUN (no_router_ospf6,
OSPF6_STR) OSPF6_STR)
{ {
if (ospf6 == NULL) if (ospf6 == NULL)
vty_out (vty, "OSPFv3 is not configured%s", VTYNL); vty_out (vty, "OSPFv3 is not configured\n");
else else
{ {
ospf6_delete (ospf6); ospf6_delete (ospf6);
@ -835,13 +835,13 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
(long long)o->ts_spf_duration.tv_usec, VTYNL); (long long)o->ts_spf_duration.tv_usec, VTYNL);
} }
else else
vty_out(vty, "has not been run$%s", VTYNL); vty_out(vty, "has not been run$\n");
threadtimer_string(now, o->t_spf_calc, buf, sizeof(buf)); threadtimer_string(now, o->t_spf_calc, buf, sizeof(buf));
vty_out (vty, " SPF timer %s%s%s", vty_out (vty, " SPF timer %s%s%s",
(o->t_spf_calc ? "due in " : "is "), buf, VTYNL); (o->t_spf_calc ? "due in " : "is "), buf, VTYNL);
if (CHECK_FLAG (o->flag, OSPF6_STUB_ROUTER)) if (CHECK_FLAG (o->flag, OSPF6_STUB_ROUTER))
vty_out (vty, " Router Is Stub Router%s", VTYNL); vty_out (vty, " Router Is Stub Router\n");
/* LSAs */ /* LSAs */
vty_out (vty, " Number of AS scoped LSAs is %u%s", vty_out (vty, " Number of AS scoped LSAs is %u%s",
@ -963,7 +963,7 @@ ospf6_stub_router_config_write (struct vty *vty)
{ {
if (CHECK_FLAG (ospf6->flag, OSPF6_STUB_ROUTER)) if (CHECK_FLAG (ospf6->flag, OSPF6_STUB_ROUTER))
{ {
vty_out (vty, " stub-router administrative%s", VTYNL); vty_out (vty, " stub-router administrative\n");
} }
return; return;
} }
@ -1019,7 +1019,7 @@ config_write_ospf6 (struct vty *vty)
return CMD_SUCCESS; return CMD_SUCCESS;
inet_ntop (AF_INET, &ospf6->router_id_static, router_id, sizeof (router_id)); inet_ntop (AF_INET, &ospf6->router_id_static, router_id, sizeof (router_id));
vty_out (vty, "router ospf6%s", VTYNL); vty_out (vty, "router ospf6\n");
if (ospf6->router_id_static != 0) if (ospf6->router_id_static != 0)
vty_out (vty, " router-id %s%s", router_id, VTYNL); vty_out (vty, " router-id %s%s", router_id, VTYNL);
@ -1056,7 +1056,7 @@ config_write_ospf6 (struct vty *vty)
vty_out (vty, " interface %s area %s%s", vty_out (vty, " interface %s area %s%s",
oi->interface->name, oa->name, VTYNL); oi->interface->name, oa->name, VTYNL);
} }
vty_out (vty, "!%s", VTYNL); vty_out (vty, "!\n");
return 0; return 0;
} }

22
ospf6d/ospf6_zebra.c
View File

@ -315,11 +315,11 @@ DEFUN (show_zebra,
int i; int i;
if (zclient == NULL) if (zclient == NULL)
{ {
vty_out (vty, "Not connected to zebra%s", VTYNL); vty_out (vty, "Not connected to zebra\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
vty_out (vty, "Zebra Infomation%s", VTYNL); vty_out (vty, "Zebra Infomation\n");
vty_out (vty, " enable: %d fail: %d%s", vty_out (vty, " enable: %d fail: %d%s",
zclient->enable, zclient->fail, VTYNL); zclient->enable, zclient->fail, VTYNL);
vty_out (vty, " redistribute default: %d%s", vty_out (vty, " redistribute default: %d%s",
@ -331,7 +331,7 @@ DEFUN (show_zebra,
if (vrf_bitmap_check (zclient->redist[AFI_IP6][i], VRF_DEFAULT)) if (vrf_bitmap_check (zclient->redist[AFI_IP6][i], VRF_DEFAULT))
vty_out (vty, " %s", zebra_route_string(i)); vty_out (vty, " %s", zebra_route_string(i));
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -341,15 +341,15 @@ config_write_ospf6_zebra (struct vty *vty)
{ {
if (! zclient->enable) if (! zclient->enable)
{ {
vty_out (vty, "no router zebra%s", VTYNL); vty_out (vty, "no router zebra\n");
vty_out (vty, "!%s", VTYNL); vty_out (vty, "!\n");
} }
else if (! vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_OSPF6], else if (! vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_OSPF6],
VRF_DEFAULT)) VRF_DEFAULT))
{ {
vty_out (vty, "router zebra%s", VTYNL); vty_out (vty, "router zebra\n");
vty_out (vty, " no redistribute ospf6%s", VTYNL); vty_out (vty, " no redistribute ospf6\n");
vty_out (vty, "!%s", VTYNL); vty_out (vty, "!\n");
} }
return 0; return 0;
} }
@ -905,13 +905,13 @@ int
config_write_ospf6_debug_zebra (struct vty *vty) config_write_ospf6_debug_zebra (struct vty *vty)
{ {
if (IS_OSPF6_DEBUG_ZEBRA (SEND) && IS_OSPF6_DEBUG_ZEBRA (RECV)) if (IS_OSPF6_DEBUG_ZEBRA (SEND) && IS_OSPF6_DEBUG_ZEBRA (RECV))
vty_out (vty, "debug ospf6 zebra%s", VTYNL); vty_out (vty, "debug ospf6 zebra\n");
else else
{ {
if (IS_OSPF6_DEBUG_ZEBRA (SEND)) if (IS_OSPF6_DEBUG_ZEBRA (SEND))
vty_out (vty, "debug ospf6 zebra send%s", VTYNL); vty_out (vty, "debug ospf6 zebra send\n");
if (IS_OSPF6_DEBUG_ZEBRA (RECV)) if (IS_OSPF6_DEBUG_ZEBRA (RECV))
vty_out (vty, "debug ospf6 zebra recv%s", VTYNL); vty_out (vty, "debug ospf6 zebra recv\n");
} }
return 0; return 0;
} }

34
ospf6d/ospf6d.c
View File

@ -110,7 +110,7 @@ config_write_ospf6_debug (struct vty *vty)
config_write_ospf6_debug_asbr (vty); config_write_ospf6_debug_asbr (vty);
config_write_ospf6_debug_abr (vty); config_write_ospf6_debug_abr (vty);
config_write_ospf6_debug_flood (vty); config_write_ospf6_debug_flood (vty);
vty_out (vty, "!%s", VTYNL); vty_out (vty, "!\n");
return 0; return 0;
} }
@ -206,7 +206,7 @@ DEFUN (show_ipv6_ospf6_database,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, NULL, NULL, o->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, NULL, o->lsdb);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -277,7 +277,7 @@ DEFUN (show_ipv6_ospf6_database_type,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -330,7 +330,7 @@ DEFUN (show_ipv6_ospf6_database_id,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, &id, NULL, o->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, NULL, o->lsdb);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -381,7 +381,7 @@ DEFUN (show_ipv6_ospf6_database_router,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -457,7 +457,7 @@ DEFUN (show_ipv6_ospf6_database_type_id,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -534,7 +534,7 @@ DEFUN (show_ipv6_ospf6_database_type_router,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -589,7 +589,7 @@ DEFUN (show_ipv6_ospf6_database_id_router,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -644,7 +644,7 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -721,7 +721,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -801,7 +801,7 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -848,7 +848,7 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL); vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb); ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -923,7 +923,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1001,7 +1001,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1078,7 +1078,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
break; break;
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1162,7 +1162,7 @@ DEFUN (show_ipv6_ospf6_linkstate,
ospf6_linkstate_table_show (vty, idx_ipv4, argc, argv, oa->spf_table); ospf6_linkstate_table_show (vty, idx_ipv4, argc, argv, oa->spf_table);
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1190,7 +1190,7 @@ DEFUN (show_ipv6_ospf6_linkstate_detail,
ospf6_linkstate_table_show (vty, idx_detail, argc, argv, oa->spf_table); ospf6_linkstate_table_show (vty, idx_detail, argc, argv, oa->spf_table);
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }

2
ospf6d/ospf6d.h
View File

@ -93,7 +93,7 @@ extern struct thread_master *master;
#define OSPF6_CMD_CHECK_RUNNING() \ #define OSPF6_CMD_CHECK_RUNNING() \
if (ospf6 == NULL) \ if (ospf6 == NULL) \
{ \ { \
vty_out (vty, "OSPFv3 is not running%s", VTYNL); \ vty_out (vty, "OSPFv3 is not running\n"); \
return CMD_SUCCESS; \ return CMD_SUCCESS; \
} }

361
ospfd/ospf_vty.c
View File

File diff suppressed because it is too large Load Diff

4
ospfd/ospf_vty.h
View File

@ -28,7 +28,7 @@
retv = str2area_id ((STR), &(V), &(F)); \ retv = str2area_id ((STR), &(V), &(F)); \
if (retv < 0) \ if (retv < 0) \
{ \ { \
vty_out (vty, "%% Invalid OSPF area ID%s", VTYNL); \ vty_out (vty, "%% Invalid OSPF area ID\n"); \
return CMD_WARNING; \ return CMD_WARNING; \
} \ } \
} }
@ -39,7 +39,7 @@
retv = str2area_id ((STR), &(V), &(F)); \ retv = str2area_id ((STR), &(V), &(F)); \
if (retv < 0) \ if (retv < 0) \
{ \ { \
vty_out (vty, "%% Invalid OSPF area ID%s", VTYNL); \ vty_out (vty, "%% Invalid OSPF area ID\n"); \
return CMD_WARNING; \ return CMD_WARNING; \
} \ } \
if (OSPF_IS_AREA_ID_BACKBONE ((V))) \ if (OSPF_IS_AREA_ID_BACKBONE ((V))) \

8
ripngd/ripngd.c
View File

@ -2425,7 +2425,7 @@ DEFUN (ripng_update_timer,
update = strtoul (argv[0], &endptr, 10); update = strtoul (argv[0], &endptr, 10);
if (update == ULONG_MAX || *endptr != '\0') if (update == ULONG_MAX || *endptr != '\0')
{ {
vty_out (vty, "update timer value error%s", VTYNL); vty_out (vty, "update timer value error\n");
return CMD_WARNING; return CMD_WARNING;
} }
@ -2460,7 +2460,7 @@ DEFUN (ripng_timeout_timer,
timeout = strtoul (argv[0], &endptr, 10); timeout = strtoul (argv[0], &endptr, 10);
if (timeout == ULONG_MAX || *endptr != '\0') if (timeout == ULONG_MAX || *endptr != '\0')
{ {
vty_out (vty, "timeout timer value error%s", VTYNL); vty_out (vty, "timeout timer value error\n");
return CMD_WARNING; return CMD_WARNING;
} }
@ -2493,7 +2493,7 @@ DEFUN (ripng_garbage_timer,
garbage = strtoul (argv[0], &endptr, 10); garbage = strtoul (argv[0], &endptr, 10);
if (garbage == ULONG_MAX || *endptr != '\0') if (garbage == ULONG_MAX || *endptr != '\0')
{ {
vty_out (vty, "garbage timer value error%s", VTYNL); vty_out (vty, "garbage timer value error\n");
return CMD_WARNING; return CMD_WARNING;
} }
@ -2577,7 +2577,7 @@ DEFUN (show_ipv6_protocols,
if (! ripng) if (! ripng)
return CMD_SUCCESS; return CMD_SUCCESS;
vty_out (vty, "Routing Protocol is \"ripng\"%s", VTYNL); vty_out (vty, "Routing Protocol is \"ripng\"\n");
vty_out (vty, "Sending updates every %ld seconds, next due in %d seconds%s", vty_out (vty, "Sending updates every %ld seconds, next due in %d seconds%s",
ripng->update_time, 0, ripng->update_time, 0,

38
zebra/debug.c
View File

@ -39,10 +39,10 @@ DEFUN (show_debugging_zebra,
"Debugging information\n" "Debugging information\n"
"Zebra configuration\n") "Zebra configuration\n")
{ {
vty_out (vty, "Zebra debugging status:%s", VTYNL); vty_out (vty, "Zebra debugging status:\n");
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
vty_out (vty, " Zebra event debugging is on%s", VTYNL); vty_out (vty, " Zebra event debugging is on\n");
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET)
{ {
@ -66,24 +66,24 @@ DEFUN (show_debugging_zebra,
} }
if (IS_ZEBRA_DEBUG_KERNEL) if (IS_ZEBRA_DEBUG_KERNEL)
vty_out (vty, " Zebra kernel debugging is on%s", VTYNL); vty_out (vty, " Zebra kernel debugging is on\n");
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND) if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
vty_out (vty, " Zebra kernel netlink message dumps (send) are on%s", VTYNL); vty_out (vty, " Zebra kernel netlink message dumps (send) are on\n");
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV) if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV)
vty_out (vty, " Zebra kernel netlink message dumps (recv) are on%s", VTYNL); vty_out (vty, " Zebra kernel netlink message dumps (recv) are on\n");
/* Check here using flags as the 'macro' does an OR */ /* Check here using flags as the 'macro' does an OR */
if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB)) if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB))
vty_out (vty, " Zebra RIB debugging is on%s", VTYNL); vty_out (vty, " Zebra RIB debugging is on\n");
if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED)) if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED))
vty_out (vty, " Zebra RIB detailed debugging is on%s", VTYNL); vty_out (vty, " Zebra RIB detailed debugging is on\n");
if (IS_ZEBRA_DEBUG_FPM) if (IS_ZEBRA_DEBUG_FPM)
vty_out (vty, " Zebra FPM debugging is on%s", VTYNL); vty_out (vty, " Zebra FPM debugging is on\n");
if (IS_ZEBRA_DEBUG_NHT) if (IS_ZEBRA_DEBUG_NHT)
vty_out (vty, " Zebra next-hop tracking debugging is on%s", VTYNL); vty_out (vty, " Zebra next-hop tracking debugging is on\n");
if (IS_ZEBRA_DEBUG_MPLS) if (IS_ZEBRA_DEBUG_MPLS)
vty_out (vty, " Zebra MPLS debugging is on%s", VTYNL); vty_out (vty, " Zebra MPLS debugging is on\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -353,7 +353,7 @@ config_write_debug (struct vty *vty)
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
{ {
vty_out (vty, "debug zebra events%s", VTYNL); vty_out (vty, "debug zebra events\n");
write++; write++;
} }
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET)
@ -380,43 +380,43 @@ config_write_debug (struct vty *vty)
} }
if (IS_ZEBRA_DEBUG_KERNEL) if (IS_ZEBRA_DEBUG_KERNEL)
{ {
vty_out (vty, "debug zebra kernel%s", VTYNL); vty_out (vty, "debug zebra kernel\n");
write++; write++;
} }
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV) if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV)
{ {
vty_out (vty, "debug zebra kernel msgdump recv%s", VTYNL); vty_out (vty, "debug zebra kernel msgdump recv\n");
write++; write++;
} }
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND) if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
{ {
vty_out (vty, "debug zebra kernel msgdump send%s", VTYNL); vty_out (vty, "debug zebra kernel msgdump send\n");
write++; write++;
} }
/* Check here using flags as the 'macro' does an OR */ /* Check here using flags as the 'macro' does an OR */
if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB)) if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB))
{ {
vty_out (vty, "debug zebra rib%s", VTYNL); vty_out (vty, "debug zebra rib\n");
write++; write++;
} }
if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED)) if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED))
{ {
vty_out (vty, "debug zebra rib detailed%s", VTYNL); vty_out (vty, "debug zebra rib detailed\n");
write++; write++;
} }
if (IS_ZEBRA_DEBUG_FPM) if (IS_ZEBRA_DEBUG_FPM)
{ {
vty_out (vty, "debug zebra fpm%s", VTYNL); vty_out (vty, "debug zebra fpm\n");
write++; write++;
} }
if (IS_ZEBRA_DEBUG_NHT) if (IS_ZEBRA_DEBUG_NHT)
{ {
vty_out (vty, "debug zebra nht%s", VTYNL); vty_out (vty, "debug zebra nht\n");
write++; write++;
} }
if (IS_ZEBRA_DEBUG_MPLS) if (IS_ZEBRA_DEBUG_MPLS)
{ {
vty_out (vty, "debug zebra mpls%s", VTYNL); vty_out (vty, "debug zebra mpls\n");
write++; write++;
} }
return write; return write;

4
zebra/zebra_rnh.c
View File

@ -996,7 +996,7 @@ print_nh (struct nexthop *nexthop, struct vty *vty)
default: default:
break; break;
} }
vty_out(vty, "%s", VTYNL); vty_out(vty, "\n");
} }
static void static void
@ -1030,5 +1030,5 @@ print_rnh (struct route_node *rn, struct vty *vty)
client->sock, rnh->filtered[client->proto] ? "(filtered)" : ""); client->sock, rnh->filtered[client->proto] ? "(filtered)" : "");
if (!list_isempty(rnh->zebra_static_route_list)) if (!list_isempty(rnh->zebra_static_route_list))
vty_out(vty, " zebra%s", rnh->filtered[ZEBRA_ROUTE_STATIC] ? "(filtered)" : ""); vty_out(vty, " zebra%s", rnh->filtered[ZEBRA_ROUTE_STATIC] ? "(filtered)" : "");
vty_out(vty, "%s", VTYNL); vty_out(vty, "\n");
} }

10
zebra/zebra_vty.c
View File

@ -681,7 +681,7 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast)
vty_out (vty, ", blackhole"); vty_out (vty, ", blackhole");
if (CHECK_FLAG (re->flags, ZEBRA_FLAG_REJECT)) if (CHECK_FLAG (re->flags, ZEBRA_FLAG_REJECT))
vty_out (vty, ", reject"); vty_out (vty, ", reject");
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
if (re->type == ZEBRA_ROUTE_RIP if (re->type == ZEBRA_ROUTE_RIP
|| re->type == ZEBRA_ROUTE_OSPF || re->type == ZEBRA_ROUTE_OSPF
@ -709,7 +709,7 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast)
vty_out (vty, "%02dw%dd%02dh", vty_out (vty, "%02dw%dd%02dh",
tm->tm_yday/7, tm->tm_yday/7,
tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour); tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour);
vty_out (vty, " ago%s", VTYNL); vty_out (vty, " ago\n");
} }
for (ALL_NEXTHOPS_RO(re->nexthop, nexthop, tnexthop, recursing)) for (ALL_NEXTHOPS_RO(re->nexthop, nexthop, tnexthop, recursing))
@ -788,9 +788,9 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast)
nexthop->nh_label->label, buf, sizeof buf, 1)); nexthop->nh_label->label, buf, sizeof buf, 1));
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
} }
} }
@ -1078,7 +1078,7 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct route_entry *r
tm->tm_yday/7, tm->tm_yday/7,
tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour); tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour);
} }
vty_out (vty, "%s", VTYNL); vty_out (vty, "\n");
} }
} }