summaryrefslogtreecommitdiffstats
path: root/ripngd
diff options
context:
space:
mode:
Diffstat (limited to 'ripngd')
-rw-r--r--ripngd/ripng_debug.c28
-rw-r--r--ripngd/ripng_interface.c34
-rw-r--r--ripngd/ripng_offset.c28
-rw-r--r--ripngd/ripng_peer.c5
-rw-r--r--ripngd/ripng_zebra.c33
-rw-r--r--ripngd/ripngd.c96
6 files changed, 99 insertions, 125 deletions
diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c
index 372ab85e6..9ba0e10e4 100644
--- a/ripngd/ripng_debug.c
+++ b/ripngd/ripng_debug.c
@@ -35,31 +35,28 @@ DEFUN (show_debugging_ripng,
DEBUG_STR
"RIPng configuration\n")
{
- vty_out (vty, "RIPng debugging status:%s", VTY_NEWLINE);
+ vty_outln (vty, "RIPng debugging status:");
if (IS_RIPNG_DEBUG_EVENT)
- vty_out (vty, " RIPng event debugging is on%s", VTY_NEWLINE);
+ vty_outln (vty, " RIPng event debugging is on");
if (IS_RIPNG_DEBUG_PACKET)
{
if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
{
- vty_out (vty, " RIPng packet debugging is on%s",
- VTY_NEWLINE);
+ vty_outln (vty," RIPng packet debugging is on");
}
else
{
if (IS_RIPNG_DEBUG_SEND)
- vty_out (vty, " RIPng packet send debugging is on%s",
- VTY_NEWLINE);
+ vty_outln (vty," RIPng packet send debugging is on");
else
- vty_out (vty, " RIPng packet receive debugging is on%s",
- VTY_NEWLINE);
+ vty_outln (vty," RIPng packet receive debugging is on");
}
}
if (IS_RIPNG_DEBUG_ZEBRA)
- vty_out (vty, " RIPng zebra debugging is on%s", VTY_NEWLINE);
+ vty_outln (vty, " RIPng zebra debugging is on");
return CMD_SUCCESS;
}
@@ -197,31 +194,28 @@ config_write_debug (struct vty *vty)
if (IS_RIPNG_DEBUG_EVENT)
{
- vty_out (vty, "debug ripng events%s", VTY_NEWLINE);
+ vty_outln (vty, "debug ripng events");
write++;
}
if (IS_RIPNG_DEBUG_PACKET)
{
if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
{
- vty_out (vty, "debug ripng packet%s",
- VTY_NEWLINE);
+ vty_outln (vty,"debug ripng packet");
write++;
}
else
{
if (IS_RIPNG_DEBUG_SEND)
- vty_out (vty, "debug ripng packet send%s",
- VTY_NEWLINE);
+ vty_outln (vty,"debug ripng packet send");
else
- vty_out (vty, "debug ripng packet recv%s",
- VTY_NEWLINE);
+ vty_outln (vty,"debug ripng packet recv");
write++;
}
}
if (IS_RIPNG_DEBUG_ZEBRA)
{
- vty_out (vty, "debug ripng zebra%s", VTY_NEWLINE);
+ vty_outln (vty, "debug ripng zebra");
write++;
}
return write;
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index 0bd4a0bd1..d739540c2 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -916,27 +916,25 @@ ripng_network_write (struct vty *vty, int config_mode)
if (node->info)
{
struct prefix *p = &node->p;
- vty_out (vty, "%s%s/%d%s",
+ vty_outln (vty, "%s%s/%d",
config_mode ? " network " : " ",
inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ),
- p->prefixlen,
- VTY_NEWLINE);
+ p->prefixlen);
}
/* Write enable interface. */
for (i = 0; i < vector_active (ripng_enable_if); i++)
if ((ifname = vector_slot (ripng_enable_if, i)) != NULL)
- vty_out (vty, "%s%s%s",
+ vty_outln (vty, "%s%s",
config_mode ? " network " : " ",
- ifname,
- VTY_NEWLINE);
+ ifname);
/* Write passive interface. */
if (config_mode)
for (i = 0; i < vector_active (Vripng_passive_interface); i++)
if ((ifname = vector_slot (Vripng_passive_interface, i)) != NULL)
- vty_out (vty, " passive-interface %s%s", ifname, VTY_NEWLINE);
+ vty_outln (vty, " passive-interface %s", ifname);
return 0;
}
@@ -962,8 +960,8 @@ DEFUN (ripng_network,
if (ret < 0)
{
- vty_out (vty, "There is same network configuration %s%s", argv[idx_if_or_addr]->arg,
- VTY_NEWLINE);
+ vty_outln (vty, "There is same network configuration %s",
+ argv[idx_if_or_addr]->arg);
return CMD_WARNING;
}
@@ -992,8 +990,7 @@ DEFUN (no_ripng_network,
if (ret < 0)
{
- vty_out (vty, "can't find network %s%s", argv[idx_if_or_addr]->arg,
- VTY_NEWLINE);
+ vty_outln (vty, "can't find network %s",argv[idx_if_or_addr]->arg);
return CMD_WARNING;
}
@@ -1124,31 +1121,28 @@ interface_config_write (struct vty *vty)
(ri->split_horizon == ri->split_horizon_default))
continue;
- vty_out (vty, "interface %s%s", ifp->name,
- VTY_NEWLINE);
+ vty_outln (vty, "interface %s",ifp->name);
if (ifp->desc)
- vty_out (vty, " description %s%s", ifp->desc,
- VTY_NEWLINE);
+ vty_outln (vty, " description %s",ifp->desc);
/* Split horizon. */
if (ri->split_horizon != ri->split_horizon_default)
{
switch (ri->split_horizon) {
case RIPNG_SPLIT_HORIZON:
- vty_out (vty, " ipv6 ripng split-horizon%s", VTY_NEWLINE);
+ vty_outln (vty, " ipv6 ripng split-horizon");
break;
case RIPNG_SPLIT_HORIZON_POISONED_REVERSE:
- vty_out (vty, " ipv6 ripng split-horizon poisoned-reverse%s",
- VTY_NEWLINE);
+ vty_outln (vty," ipv6 ripng split-horizon poisoned-reverse");
break;
case RIPNG_NO_SPLIT_HORIZON:
default:
- vty_out (vty, " no ipv6 ripng split-horizon%s", VTY_NEWLINE);
+ vty_outln (vty, " no ipv6 ripng split-horizon");
break;
}
}
- vty_out (vty, "!%s", VTY_NEWLINE);
+ vty_outln (vty, "!");
write++;
}
diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c
index adb3182a5..51385dd93 100644
--- a/ripngd/ripng_offset.c
+++ b/ripngd/ripng_offset.c
@@ -125,7 +125,7 @@ ripng_offset_list_set (struct vty *vty, const char *alist,
direct = RIPNG_OFFSET_LIST_OUT;
else
{
- vty_out (vty, "Invalid direction: %s%s", direct_str, VTY_NEWLINE);
+ vty_outln (vty, "Invalid direction: %s", direct_str);
return CMD_WARNING;
}
@@ -133,7 +133,7 @@ ripng_offset_list_set (struct vty *vty, const char *alist,
metric = atoi (metric_str);
if (metric < 0 || metric > 16)
{
- vty_out (vty, "Invalid metric: %s%s", metric_str, VTY_NEWLINE);
+ vty_outln (vty, "Invalid metric: %s", metric_str);
return CMD_WARNING;
}
@@ -164,7 +164,7 @@ ripng_offset_list_unset (struct vty *vty, const char *alist,
direct = RIPNG_OFFSET_LIST_OUT;
else
{
- vty_out (vty, "Invalid direction: %s%s", direct_str, VTY_NEWLINE);
+ vty_outln (vty, "Invalid direction: %s", direct_str);
return CMD_WARNING;
}
@@ -172,7 +172,7 @@ ripng_offset_list_unset (struct vty *vty, const char *alist,
metric = atoi (metric_str);
if (metric < 0 || metric > 16)
{
- vty_out (vty, "Invalid metric: %s%s", metric_str, VTY_NEWLINE);
+ vty_outln (vty, "Invalid metric: %s", metric_str);
return CMD_WARNING;
}
@@ -196,7 +196,7 @@ ripng_offset_list_unset (struct vty *vty, const char *alist,
}
else
{
- vty_out (vty, "Can't find offset-list%s", VTY_NEWLINE);
+ vty_outln (vty, "Can't find offset-list");
return CMD_WARNING;
}
return CMD_SUCCESS;
@@ -405,28 +405,26 @@ config_write_ripng_offset_list (struct vty *vty)
if (! offset->ifname)
{
if (offset->direct[RIPNG_OFFSET_LIST_IN].alist_name)
- vty_out (vty, " offset-list %s in %d%s",
+ vty_outln (vty, " offset-list %s in %d",
offset->direct[RIPNG_OFFSET_LIST_IN].alist_name,
- offset->direct[RIPNG_OFFSET_LIST_IN].metric,
- VTY_NEWLINE);
+ offset->direct[RIPNG_OFFSET_LIST_IN].metric);
if (offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name)
- vty_out (vty, " offset-list %s out %d%s",
+ vty_outln (vty, " offset-list %s out %d",
offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name,
- offset->direct[RIPNG_OFFSET_LIST_OUT].metric,
- VTY_NEWLINE);
+ offset->direct[RIPNG_OFFSET_LIST_OUT].metric);
}
else
{
if (offset->direct[RIPNG_OFFSET_LIST_IN].alist_name)
- vty_out (vty, " offset-list %s in %d %s%s",
+ vty_outln (vty, " offset-list %s in %d %s",
offset->direct[RIPNG_OFFSET_LIST_IN].alist_name,
offset->direct[RIPNG_OFFSET_LIST_IN].metric,
- offset->ifname, VTY_NEWLINE);
+ offset->ifname);
if (offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name)
- vty_out (vty, " offset-list %s out %d %s%s",
+ vty_outln (vty, " offset-list %s out %d %s",
offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name,
offset->direct[RIPNG_OFFSET_LIST_OUT].metric,
- offset->ifname, VTY_NEWLINE);
+ offset->ifname);
}
}
diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c
index 461ee98bb..ff6af2b1d 100644
--- a/ripngd/ripng_peer.c
+++ b/ripngd/ripng_peer.c
@@ -193,12 +193,11 @@ ripng_peer_display (struct vty *vty)
for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer))
{
- vty_out (vty, " %s %s%14s %10d %10d %10d %s%s", inet6_ntoa (peer->addr),
+ vty_outln (vty, " %s %s%14s %10d %10d %10d %s", inet6_ntoa (peer->addr),
VTY_NEWLINE, " ",
peer->recv_badpackets, peer->recv_badroutes,
ZEBRA_RIPNG_DISTANCE_DEFAULT,
- ripng_peer_uptime (peer, timebuf, RIPNG_UPTIME_LEN),
- VTY_NEWLINE);
+ ripng_peer_uptime(peer, timebuf, RIPNG_UPTIME_LEN));
}
}
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index e7f1e9e15..2d62823b1 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -337,7 +337,7 @@ DEFUN (ripng_redistribute_type,
if (type < 0)
{
- vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE);
+ vty_outln (vty, "Invalid type %s", proto);
return CMD_WARNING;
}
@@ -363,7 +363,7 @@ DEFUN (no_ripng_redistribute_type,
if (type < 0)
{
- vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE);
+ vty_outln (vty, "Invalid type %s", proto);
return CMD_WARNING;
}
@@ -391,7 +391,7 @@ DEFUN (ripng_redistribute_type_metric,
if (type < 0)
{
- vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text, VTY_NEWLINE);
+ vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
return CMD_WARNING;
}
@@ -417,7 +417,7 @@ DEFUN (ripng_redistribute_type_routemap,
if (type < 0)
{
- vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text, VTY_NEWLINE);
+ vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
return CMD_WARNING;
}
@@ -448,7 +448,7 @@ DEFUN (ripng_redistribute_type_metric_routemap,
if (type < 0)
{
- vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text, VTY_NEWLINE);
+ vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
return CMD_WARNING;
}
@@ -472,23 +472,20 @@ ripng_redistribute_write (struct vty *vty, int config_mode)
if (ripng->route_map[i].metric_config)
{
if (ripng->route_map[i].name)
- vty_out (vty, " redistribute %s metric %d route-map %s%s",
+ vty_outln (vty, " redistribute %s metric %d route-map %s",
zebra_route_string(i), ripng->route_map[i].metric,
- ripng->route_map[i].name, VTY_NEWLINE);
+ ripng->route_map[i].name);
else
- vty_out (vty, " redistribute %s metric %d%s",
- zebra_route_string(i), ripng->route_map[i].metric,
- VTY_NEWLINE);
+ vty_outln (vty, " redistribute %s metric %d",
+ zebra_route_string(i),ripng->route_map[i].metric);
}
else
{
if (ripng->route_map[i].name)
- vty_out (vty, " redistribute %s route-map %s%s",
- zebra_route_string(i), ripng->route_map[i].name,
- VTY_NEWLINE);
+ vty_outln (vty, " redistribute %s route-map %s",
+ zebra_route_string(i),ripng->route_map[i].name);
else
- vty_out (vty, " redistribute %s%s", zebra_route_string(i),
- VTY_NEWLINE);
+ vty_outln (vty, " redistribute %s",zebra_route_string(i));
}
}
else
@@ -502,13 +499,13 @@ zebra_config_write (struct vty *vty)
{
if (! zclient->enable)
{
- vty_out (vty, "no router zebra%s", VTY_NEWLINE);
+ vty_outln (vty, "no router zebra");
return 1;
}
else if (! vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG], VRF_DEFAULT))
{
- vty_out (vty, "router zebra%s", VTY_NEWLINE);
- vty_out (vty, " no redistribute ripng%s", VTY_NEWLINE);
+ vty_outln (vty, "router zebra");
+ vty_outln (vty, " no redistribute ripng");
return 1;
}
return 0;
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index eac01f7d5..80c3eba21 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2004,13 +2004,13 @@ DEFUN (show_ipv6_ripng,
return CMD_SUCCESS;
/* Header of display. */
- vty_out (vty, "Codes: R - RIPng, C - connected, S - Static, O - OSPF, B - BGP%s"
+ vty_outln (vty, "Codes: R - RIPng, C - connected, S - Static, O - OSPF, B - BGP%s"
"Sub-codes:%s"
" (n) - normal, (s) - static, (d) - default, (r) - redistribute,%s"
" (i) - interface, (a/S) - aggregated/Suppressed%s%s"
- " Network Next Hop Via Metric Tag Time%s",
+ " Network Next Hop Via Metric Tag Time",
VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE,
- VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
+ VTY_NEWLINE, VTY_NEWLINE);
for (rp = route_top (ripng->table); rp; rp = route_next (rp))
{
@@ -2026,13 +2026,12 @@ DEFUN (show_ipv6_ripng,
vty_out (vty, "R(a) %s/%d ",
inet6_ntoa (p->prefix), p->prefixlen);
#endif /* DEBUG */
- vty_out (vty, "%s", VTY_NEWLINE);
+ vty_outln (vty, "");
vty_out (vty, "%*s", 18, " ");
vty_out (vty, "%*s", 28, " ");
- vty_out (vty, "self %2d %3"ROUTE_TAG_PRI"%s", aggregate->metric,
- (route_tag_t)aggregate->tag,
- VTY_NEWLINE);
+ vty_outln (vty, "self %2d %3"ROUTE_TAG_PRI"", aggregate->metric,
+ (route_tag_t)aggregate->tag);
}
if ((list = rp->info) != NULL)
@@ -2052,7 +2051,7 @@ DEFUN (show_ipv6_ripng,
ripng_route_subtype_print(rinfo),
inet6_ntoa (p->prefix), p->prefixlen);
#endif /* DEBUG */
- vty_out (vty, "%s", VTY_NEWLINE);
+ vty_outln (vty, "");
vty_out (vty, "%*s", 18, " ");
len = vty_out (vty, "%s", inet6_ntoa (rinfo->nexthop));
@@ -2090,7 +2089,7 @@ DEFUN (show_ipv6_ripng,
ripng_vty_out_uptime (vty, rinfo);
}
- vty_out (vty, "%s", VTY_NEWLINE);
+ vty_outln (vty, "");
}
}
@@ -2111,33 +2110,30 @@ DEFUN (show_ipv6_ripng_status,
if (! ripng)
return CMD_SUCCESS;
- vty_out (vty, "Routing Protocol is \"RIPng\"%s", VTY_NEWLINE);
+ vty_outln (vty, "Routing Protocol is \"RIPng\"");
vty_out (vty, " Sending updates every %ld seconds with +/-50%%,",
ripng->update_time);
- vty_out (vty, " next due in %lu seconds%s",
- thread_timer_remain_second (ripng->t_update),
- VTY_NEWLINE);
+ vty_outln (vty, " next due in %lu seconds",
+ thread_timer_remain_second(ripng->t_update));
vty_out (vty, " Timeout after %ld seconds,", ripng->timeout_time);
- vty_out (vty, " garbage collect after %ld seconds%s", ripng->garbage_time,
- VTY_NEWLINE);
+ vty_outln (vty, " garbage collect after %ld seconds",ripng->garbage_time);
/* Filtering status show. */
config_show_distribute (vty);
/* Default metric information. */
- vty_out (vty, " Default redistribution metric is %d%s",
- ripng->default_metric, VTY_NEWLINE);
+ vty_outln (vty, " Default redistribution metric is %d",
+ ripng->default_metric);
/* Redistribute information. */
vty_out (vty, " Redistributing:");
ripng_redistribute_write (vty, 0);
- vty_out (vty, "%s", VTY_NEWLINE);
+ vty_outln (vty, "");
vty_out (vty, " Default version control: send version %d,", ripng->version);
- vty_out (vty, " receive version %d %s", ripng->version,
- VTY_NEWLINE);
+ vty_outln (vty, " receive version %d ",ripng->version);
- vty_out (vty, " Interface Send Recv%s", VTY_NEWLINE);
+ vty_outln (vty, " Interface Send Recv");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
{
@@ -2148,18 +2144,18 @@ DEFUN (show_ipv6_ripng_status,
if (ri->enable_network || ri->enable_interface)
{
- vty_out (vty, " %-17s%-3d %-3d%s", ifp->name,
+ vty_outln (vty, " %-17s%-3d %-3d", ifp->name,
ripng->version,
- ripng->version,
- VTY_NEWLINE);
+ ripng->version);
}
}
- vty_out (vty, " Routing for Networks:%s", VTY_NEWLINE);
+ vty_outln (vty, " Routing for Networks:");
ripng_network_write (vty, 0);
- vty_out (vty, " Routing Information Sources:%s", VTY_NEWLINE);
- vty_out (vty, " Gateway BadPackets BadRoutes Distance Last Update%s", VTY_NEWLINE);
+ vty_outln (vty, " Routing Information Sources:");
+ vty_outln (vty,
+ " Gateway BadPackets BadRoutes Distance Last Update");
ripng_peer_display (vty);
return CMD_SUCCESS;
@@ -2264,7 +2260,7 @@ DEFUN (ripng_route,
ret = str2prefix_ipv6 (argv[idx_ipv6addr]->arg, (struct prefix_ipv6 *)&p);
if (ret <= 0)
{
- vty_out (vty, "Malformed address%s", VTY_NEWLINE);
+ vty_outln (vty, "Malformed address");
return CMD_WARNING;
}
apply_mask_ipv6 (&p);
@@ -2272,7 +2268,7 @@ DEFUN (ripng_route,
rp = route_node_get (ripng->route, (struct prefix *) &p);
if (rp->info)
{
- vty_out (vty, "There is already same static route.%s", VTY_NEWLINE);
+ vty_outln (vty, "There is already same static route.");
route_unlock_node (rp);
return CMD_WARNING;
}
@@ -2298,7 +2294,7 @@ DEFUN (no_ripng_route,
ret = str2prefix_ipv6 (argv[idx_ipv6addr]->arg, (struct prefix_ipv6 *)&p);
if (ret <= 0)
{
- vty_out (vty, "Malformed address%s", VTY_NEWLINE);
+ vty_outln (vty, "Malformed address");
return CMD_WARNING;
}
apply_mask_ipv6 (&p);
@@ -2306,7 +2302,7 @@ DEFUN (no_ripng_route,
rp = route_node_lookup (ripng->route, (struct prefix *) &p);
if (! rp)
{
- vty_out (vty, "Can't find static route.%s", VTY_NEWLINE);
+ vty_outln (vty, "Can't find static route.");
return CMD_WARNING;
}
@@ -2333,7 +2329,7 @@ DEFUN (ripng_aggregate_address,
ret = str2prefix_ipv6 (argv[idx_ipv6_prefixlen]->arg, (struct prefix_ipv6 *)&p);
if (ret <= 0)
{
- vty_out (vty, "Malformed address%s", VTY_NEWLINE);
+ vty_outln (vty, "Malformed address");
return CMD_WARNING;
}
@@ -2341,7 +2337,7 @@ DEFUN (ripng_aggregate_address,
node = route_node_get (ripng->aggregate, &p);
if (node->info)
{
- vty_out (vty, "There is already same aggregate route.%s", VTY_NEWLINE);
+ vty_outln (vty, "There is already same aggregate route.");
route_unlock_node (node);
return CMD_WARNING;
}
@@ -2367,14 +2363,14 @@ DEFUN (no_ripng_aggregate_address,
ret = str2prefix_ipv6 (argv[idx_ipv6_prefixlen]->arg, (struct prefix_ipv6 *) &p);
if (ret <= 0)
{
- vty_out (vty, "Malformed address%s", VTY_NEWLINE);
+ vty_outln (vty, "Malformed address");
return CMD_WARNING;
}
rn = route_node_lookup (ripng->aggregate, &p);
if (! rn)
{
- vty_out (vty, "Can't find aggregate route.%s", VTY_NEWLINE);
+ vty_outln (vty, "Can't find aggregate route.");
return CMD_WARNING;
}
route_unlock_node (rn);
@@ -2684,7 +2680,7 @@ DEFUN (ripng_allow_ecmp,
{
if (ripng->ecmp)
{
- vty_out (vty, "ECMP is already enabled.%s", VTY_NEWLINE);
+ vty_outln (vty, "ECMP is already enabled.");
return CMD_WARNING;
}
@@ -2701,7 +2697,7 @@ DEFUN (no_ripng_allow_ecmp,
{
if (!ripng->ecmp)
{
- vty_out (vty, "ECMP is already disabled.%s", VTY_NEWLINE);
+ vty_outln (vty, "ECMP is already disabled.");
return CMD_WARNING;
}
@@ -2724,17 +2720,17 @@ ripng_config_write (struct vty *vty)
{
/* RIPng router. */
- vty_out (vty, "router ripng%s", VTY_NEWLINE);
+ vty_outln (vty, "router ripng");
if (ripng->default_information)
- vty_out (vty, " default-information originate%s", VTY_NEWLINE);
+ vty_outln (vty, " default-information originate");
ripng_network_write (vty, 1);
/* RIPng default metric configuration */
if (ripng->default_metric != RIPNG_DEFAULT_METRIC_DEFAULT)
- vty_out (vty, " default-metric %d%s",
- ripng->default_metric, VTY_NEWLINE);
+ vty_outln (vty, " default-metric %d",
+ ripng->default_metric);
ripng_redistribute_write (vty, 1);
@@ -2744,33 +2740,29 @@ ripng_config_write (struct vty *vty)
/* RIPng aggregate routes. */
for (rp = route_top (ripng->aggregate); rp; rp = route_next (rp))
if (rp->info != NULL)
- vty_out (vty, " aggregate-address %s/%d%s",
+ vty_outln (vty, " aggregate-address %s/%d",
inet6_ntoa (rp->p.u.prefix6),
- rp->p.prefixlen,
-
- VTY_NEWLINE);
+ rp->p.prefixlen);
/* ECMP configuration. */
if (ripng->ecmp)
- vty_out (vty, " allow-ecmp%s", VTY_NEWLINE);
+ vty_outln (vty, " allow-ecmp");
/* RIPng static routes. */
for (rp = route_top (ripng->route); rp; rp = route_next (rp))
if (rp->info != NULL)
- vty_out (vty, " route %s/%d%s", inet6_ntoa (rp->p.u.prefix6),
- rp->p.prefixlen,
- VTY_NEWLINE);
+ vty_outln (vty, " route %s/%d", inet6_ntoa (rp->p.u.prefix6),
+ rp->p.prefixlen);
/* RIPng timers configuration. */
if (ripng->update_time != RIPNG_UPDATE_TIMER_DEFAULT ||
ripng->timeout_time != RIPNG_TIMEOUT_TIMER_DEFAULT ||
ripng->garbage_time != RIPNG_GARBAGE_TIMER_DEFAULT)
{
- vty_out (vty, " timers basic %ld %ld %ld%s",
+ vty_outln (vty, " timers basic %ld %ld %ld",
ripng->update_time,
ripng->timeout_time,
- ripng->garbage_time,
- VTY_NEWLINE);
+ ripng->garbage_time);
}
#if 0
if (ripng->update_time != RIPNG_UPDATE_TIMER_DEFAULT)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 07:19:36 +0100