summaryrefslogtreecommitdiffstats
path: root/ospf6d
diff options
context:
space:
mode:
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_abr.c2
-rw-r--r--ospf6d/ospf6_area.c4
-rw-r--r--ospf6d/ospf6_asbr.c10
-rw-r--r--ospf6d/ospf6_flood.c2
-rw-r--r--ospf6d/ospf6_interface.c20
-rw-r--r--ospf6d/ospf6_intra.c2
-rw-r--r--ospf6d/ospf6_lsa.c10
-rw-r--r--ospf6d/ospf6_message.c12
-rw-r--r--ospf6d/ospf6_neighbor.c6
-rw-r--r--ospf6d/ospf6_route.c12
-rw-r--r--ospf6d/ospf6_spf.c8
-rw-r--r--ospf6d/ospf6_top.c12
-rw-r--r--ospf6d/ospf6_zebra.c22
-rw-r--r--ospf6d/ospf6d.c34
-rw-r--r--ospf6d/ospf6d.h2
15 files changed, 79 insertions, 79 deletions
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index 4048acbd6..b1f2401d5 100644
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -1149,7 +1149,7 @@ int
config_write_ospf6_debug_abr (struct vty *vty)
{
if (IS_OSPF6_DEBUG_ABR)
- vty_out (vty, "debug ospf6 abr%s", VTYNL);
+ vty_out (vty, "debug ospf6 abr\n");
return 0;
}
diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index c1222a2c2..7ee5c9b6e 100644
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -389,7 +389,7 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
vty_out (vty, " Interface attached to this area:");
for (ALL_LIST_ELEMENTS_RO (oa->if_list, i, oi))
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)
{
@@ -583,7 +583,7 @@ ospf6_area_config_write (struct vty *vty)
if (range->path.u.cost_config != OSPF_AREA_RANGE_COST_UNSPEC)
vty_out (vty, " cost %d", range->path.u.cost_config);
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
}
if (IS_AREA_STUB (oa))
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 6c50f7040..57b1e9481 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -789,7 +789,7 @@ ospf6_redistribute_show_config (struct vty *vty)
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++)
{
if (type == ZEBRA_ROUTE_OSPF6)
@@ -1082,13 +1082,13 @@ route_map_command_status (struct vty *vty, int ret)
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_out (vty, "OSPF6 Can't find rule.%s", VTYNL);
+ vty_out (vty, "OSPF6 Can't find rule.\n");
break;
case RMAP_COMPILE_ERROR:
- vty_out (vty, "OSPF6 Argument is malformed.%s", VTYNL);
+ vty_out (vty, "OSPF6 Argument is malformed.\n");
break;
default:
- vty_out (vty, "OSPF6 route-map add set failed.%s", VTYNL);
+ vty_out (vty, "OSPF6 route-map add set failed.\n");
break;
}
return CMD_WARNING;
@@ -1399,7 +1399,7 @@ int
config_write_ospf6_debug_asbr (struct vty *vty)
{
if (IS_OSPF6_DEBUG_ASBR)
- vty_out (vty, "debug ospf6 asbr%s", VTYNL);
+ vty_out (vty, "debug ospf6 asbr\n");
return 0;
}
diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 843479525..f816c6f48 100644
--- a/ospf6d/ospf6_flood.c
+++ b/ospf6d/ospf6_flood.c
@@ -1032,7 +1032,7 @@ int
config_write_ospf6_debug_flood (struct vty *vty)
{
if (IS_OSPF6_DEBUG_FLOODING)
- vty_out (vty, "debug ospf6 flooding%s", VTYNL);
+ vty_out (vty, "debug ospf6 flooding\n");
return 0;
}
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 29cfe12c7..c5026e2f7 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -924,13 +924,13 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
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;
}
else
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))
{
@@ -965,13 +965,13 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
VTYNL);
}
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",
ospf6_interface_state_str[oi->state],
oi->transdelay, oi->priority,
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",
oi->hello_interval, oi->dead_interval, oi->rxmt_interval,
VTYNL);
@@ -1810,22 +1810,22 @@ config_write_ospf6_interface (struct vty *vty)
oi->plist_name, VTYNL);
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)
- 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 == 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)
- vty_out (vty, " ipv6 ospf6 network broadcast%s", VTYNL);
+ vty_out (vty, " ipv6 ospf6 network broadcast\n");
}
ospf6_bfd_write_config(vty, oi);
- vty_out (vty, "!%s", VTYNL);
+ vty_out (vty, "!\n");
}
return 0;
}
@@ -1966,7 +1966,7 @@ int
config_write_ospf6_debug_interface (struct vty *vty)
{
if (IS_OSPF6_DEBUG_INTERFACE)
- vty_out (vty, "debug ospf6 interface%s", VTYNL);
+ vty_out (vty, "debug ospf6 interface\n");
return 0;
}
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index a693e8bd0..2f4e06e1e 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -1793,7 +1793,7 @@ config_write_ospf6_debug_brouter (struct vty *vty)
{
char buf[16];
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)
{
inet_ntop (AF_INET, &conf_debug_ospf6_brouter_specific_router_id,
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index 401d29c57..90ba0dc74 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -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);
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 ++)
{
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;
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);
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,
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),
ospf6_lstype_name (lsa->header->type), 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, "Threads: Expire: 0x%p, Refresh: 0x%p %s",
(void *)lsa->expire, (void *)lsa->refresh, VTYNL);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return;
}
@@ -527,7 +527,7 @@ ospf6_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
handler = &unknown_handler;
(*handler->show) (vty, lsa);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
}
/* OSPFv3 LSA creation/deletion function */
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index adf39de82..b087802b3 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -2459,29 +2459,29 @@ config_write_ospf6_debug_message (struct vty *vty)
if (s == 0x3f && r == 0x3f)
{
- vty_out (vty, "debug ospf6 message all%s", VTYNL);
+ vty_out (vty, "debug ospf6 message all\n");
return 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;
}
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;
}
/* Unknown message is logged by default */
if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, SEND) &&
! 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))
- 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))
- 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++)
{
diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index 7e691f091..99f5830bf 100644
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -1016,11 +1016,11 @@ config_write_ospf6_debug_neighbor (struct vty *vty)
{
if (IS_OSPF6_DEBUG_NEIGHBOR (STATE) &&
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))
- vty_out (vty, "debug ospf6 neighbor state%s", VTYNL);
+ vty_out (vty, "debug ospf6 neighbor state\n");
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;
}
diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c
index 3784565a9..1befbe248 100644
--- a/ospf6d/ospf6_route.c
+++ b/ospf6d/ospf6_route.c
@@ -1131,7 +1131,7 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
vty_out (vty, "Router Bits: %s%s", capa, VTYNL);
/* Prefix Options */
- vty_out (vty, "Prefix Options: xxx%s", VTYNL);
+ vty_out (vty, "Prefix Options: xxx\n");
/* Metrics */
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);
/* Nexthops */
- vty_out (vty, "Nexthop:%s", VTYNL);
+ vty_out (vty, "Nexthop:\n");
for (ALL_LIST_ELEMENTS_RO (route->nh_list, node, nh))
{
/* nexthop */
@@ -1148,7 +1148,7 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
ifname = ifindex2ifname (nh->ifindex, VRF_DEFAULT);
vty_out (vty, " %s %.*s%s", nexthop, IFNAMSIZ, ifname, VTYNL);
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
}
static void
@@ -1619,11 +1619,11 @@ int
config_write_ospf6_debug_route (struct vty *vty)
{
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))
- 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))
- vty_out (vty, "debug ospf6 route inter-area%s", VTYNL);
+ vty_out (vty, "debug ospf6 route inter-area\n");
return 0;
}
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 6338b06f6..c9f1740a9 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -748,7 +748,7 @@ ospf6_spf_display_subtree (struct vty *vty, const char *prefix, int rest,
next_prefix = (char *) malloc (len);
if (next_prefix == NULL)
{
- vty_out (vty, "malloc failed%s", VTYNL);
+ vty_out (vty, "malloc failed\n");
return;
}
snprintf (next_prefix, len, "%s%s", prefix, (rest ? "| " : " "));
@@ -914,11 +914,11 @@ int
config_write_ospf6_debug_spf (struct vty *vty)
{
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))
- vty_out (vty, "debug ospf6 spf time%s", VTYNL);
+ vty_out (vty, "debug ospf6 spf time\n");
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;
}
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index fd91410fa..9040e4ab9 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -315,7 +315,7 @@ DEFUN (no_router_ospf6,
OSPF6_STR)
{
if (ospf6 == NULL)
- vty_out (vty, "OSPFv3 is not configured%s", VTYNL);
+ vty_out (vty, "OSPFv3 is not configured\n");
else
{
ospf6_delete (ospf6);
@@ -835,13 +835,13 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
(long long)o->ts_spf_duration.tv_usec, VTYNL);
}
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));
vty_out (vty, " SPF timer %s%s%s",
(o->t_spf_calc ? "due in " : "is "), buf, VTYNL);
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 */
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))
{
- vty_out (vty, " stub-router administrative%s", VTYNL);
+ vty_out (vty, " stub-router administrative\n");
}
return;
}
@@ -1019,7 +1019,7 @@ config_write_ospf6 (struct vty *vty)
return CMD_SUCCESS;
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)
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",
oi->interface->name, oa->name, VTYNL);
}
- vty_out (vty, "!%s", VTYNL);
+ vty_out (vty, "!\n");
return 0;
}
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 9a1866139..3ca9182f0 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -315,11 +315,11 @@ DEFUN (show_zebra,
int i;
if (zclient == NULL)
{
- vty_out (vty, "Not connected to zebra%s", VTYNL);
+ vty_out (vty, "Not connected to zebra\n");
return CMD_SUCCESS;
}
- vty_out (vty, "Zebra Infomation%s", VTYNL);
+ vty_out (vty, "Zebra Infomation\n");
vty_out (vty, " enable: %d fail: %d%s",
zclient->enable, zclient->fail, VTYNL);
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))
vty_out (vty, " %s", zebra_route_string(i));
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -341,15 +341,15 @@ config_write_ospf6_zebra (struct vty *vty)
{
if (! zclient->enable)
{
- vty_out (vty, "no router zebra%s", VTYNL);
- vty_out (vty, "!%s", VTYNL);
+ vty_out (vty, "no router zebra\n");
+ vty_out (vty, "!\n");
}
else if (! vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_OSPF6],
VRF_DEFAULT))
{
- vty_out (vty, "router zebra%s", VTYNL);
- vty_out (vty, " no redistribute ospf6%s", VTYNL);
- vty_out (vty, "!%s", VTYNL);
+ vty_out (vty, "router zebra\n");
+ vty_out (vty, " no redistribute ospf6\n");
+ vty_out (vty, "!\n");
}
return 0;
}
@@ -905,13 +905,13 @@ int
config_write_ospf6_debug_zebra (struct vty *vty)
{
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
{
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))
- vty_out (vty, "debug ospf6 zebra recv%s", VTYNL);
+ vty_out (vty, "debug ospf6 zebra recv\n");
}
return 0;
}
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index ce03322f7..a7153893c 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -110,7 +110,7 @@ config_write_ospf6_debug (struct vty *vty)
config_write_ospf6_debug_asbr (vty);
config_write_ospf6_debug_abr (vty);
config_write_ospf6_debug_flood (vty);
- vty_out (vty, "!%s", VTYNL);
+ vty_out (vty, "!\n");
return 0;
}
@@ -206,7 +206,7 @@ DEFUN (show_ipv6_ospf6_database,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, NULL, NULL, o->lsdb);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -277,7 +277,7 @@ DEFUN (show_ipv6_ospf6_database_type,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -330,7 +330,7 @@ DEFUN (show_ipv6_ospf6_database_id,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, &id, NULL, o->lsdb);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -381,7 +381,7 @@ DEFUN (show_ipv6_ospf6_database_router,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -457,7 +457,7 @@ DEFUN (show_ipv6_ospf6_database_type_id,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -534,7 +534,7 @@ DEFUN (show_ipv6_ospf6_database_type_router,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -589,7 +589,7 @@ DEFUN (show_ipv6_ospf6_database_id_router,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
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);
ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -721,7 +721,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -801,7 +801,7 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -848,7 +848,7 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -923,7 +923,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -1001,7 +1001,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -1078,7 +1078,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
break;
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
@@ -1162,7 +1162,7 @@ DEFUN (show_ipv6_ospf6_linkstate,
ospf6_linkstate_table_show (vty, idx_ipv4, argc, argv, oa->spf_table);
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
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);
}
- vty_out (vty, "%s", VTYNL);
+ vty_out (vty, "\n");
return CMD_SUCCESS;
}
diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h
index 347ad3487..2da11d0ab 100644
--- a/ospf6d/ospf6d.h
+++ b/ospf6d/ospf6d.h
@@ -93,7 +93,7 @@ extern struct thread_master *master;
#define OSPF6_CMD_CHECK_RUNNING() \
if (ospf6 == NULL) \
{ \
- vty_out (vty, "OSPFv3 is not running%s", VTYNL); \
+ vty_out (vty, "OSPFv3 is not running\n"); \
return CMD_SUCCESS; \
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 07:12:37 +0100