ret = babel_enable_if_add (argv[1]->arg);
if (ret < 0) {
- vty_outln (vty, "There is same network configuration %s",
+ vty_out (vty, "There is same network configuration %s\n",
argv[1]->arg);
return CMD_WARNING;
}
ret = babel_enable_if_delete (argv[2]->arg);
if (ret < 0) {
- vty_outln (vty, "can't find network %s",argv[2]->arg);
+ vty_out (vty, "can't find network %s\n",argv[2]->arg);
return CMD_WARNING;
}
int is_up;
babel_interface_nfo *babel_ifp;
- vty_outln (vty, "%s is %s", ifp->name,
+ vty_out (vty, "%s is %s\n", ifp->name,
((is_up = if_is_operative(ifp)) ? "up" : "down"));
- vty_outln (vty, " ifindex %u, MTU %u bytes %s",
+ vty_out (vty, " ifindex %u, MTU %u bytes %s\n",
ifp->ifindex, MIN(ifp->mtu, ifp->mtu6), if_flag_dump(ifp->flags));
if (!IS_ENABLE(ifp))
{
- vty_outln (vty, " Babel protocol is not enabled on this interface");
+ vty_out (vty, " Babel protocol is not enabled on this interface\n");
return;
}
if (!is_up)
{
- vty_outln (vty,
- " Babel protocol is enabled, but not running on this interface");
+ vty_out (vty,
+ " Babel protocol is enabled, but not running on this interface\n");
return;
}
babel_ifp = babel_get_if_nfo (ifp);
- vty_outln (vty, " Babel protocol is running on this interface");
+ vty_out (vty, " Babel protocol is running on this interface\n");
vty_outln (vty, " Operating mode is \"%s\"",
CHECK_FLAG(babel_ifp->flags, BABEL_IF_WIRED) ? "wired" : "wireless");
- vty_outln (vty, " Split horizon mode is %s",
+ vty_out (vty, " Split horizon mode is %s\n",
CHECK_FLAG(babel_ifp->flags, BABEL_IF_SPLIT_HORIZON) ? "On" : "Off");
- vty_outln (vty, " Hello interval is %u ms", babel_ifp->hello_interval);
- vty_outln (vty, " Update interval is %u ms", babel_ifp->update_interval);
- vty_outln (vty, " Rxcost multiplier is %u", babel_ifp->cost);
+ vty_out (vty, " Hello interval is %u ms\n", babel_ifp->hello_interval);
+ vty_out (vty, " Update interval is %u ms\n", babel_ifp->update_interval);
+ vty_out (vty, " Rxcost multiplier is %u\n", babel_ifp->cost);
}
DEFUN (show_babel_interface,
}
if ((ifp = if_lookup_by_name (argv[3]->arg, VRF_DEFAULT)) == NULL)
{
- vty_outln (vty, "No such interface name");
+ vty_out (vty, "No such interface name\n");
return CMD_WARNING;
}
show_babel_interface_sub (vty, ifp);
}
if ((ifp = if_lookup_by_name (argv[3]->arg, VRF_DEFAULT)) == NULL)
{
- vty_outln (vty, "No such interface name");
+ vty_out (vty, "No such interface name\n");
return CMD_WARNING;
}
FOR_ALL_NEIGHBOURS(neigh) {
if(prefix && !babel_prefix_eq(prefix, xroute->prefix, xroute->plen))
return;
- vty_outln (vty, "%s metric %d (exported)",
+ vty_out (vty, "%s metric %d (exported)\n",
format_prefix(xroute->prefix, xroute->plen),
xroute->metric);
}
ret = str2prefix(argv[3]->arg, &prefix);
if(ret == 0) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
ret = inet_aton (argv[3]->arg, &addr);
if (ret <= 0) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
ret = str2prefix(buf, &prefix);
if (ret == 0) {
- vty_outln (vty, "%% Parse error -- this shouldn't happen");
+ vty_out (vty, "%% Parse error -- this shouldn't happen\n");
return CMD_WARNING;
}
ret = inet_pton (AF_INET6, argv[3]->arg, &addr);
if (ret <= 0) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
ret = str2prefix(buf, &prefix);
if (ret == 0) {
- vty_outln (vty, "%% Parse error -- this shouldn't happen");
+ vty_out (vty, "%% Parse error -- this shouldn't happen\n");
return CMD_WARNING;
}
"Babel information\n"
"Configuration information\n")
{
- vty_outln (vty, " -- Babel running configuration --");
+ vty_out (vty, " -- Babel running configuration --\n");
show_babel_main_configuration(vty);
- vty_outln (vty, " -- distribution lists --");
+ vty_out (vty, " -- distribution lists --\n");
config_show_distribute(vty);
return CMD_SUCCESS;
int write = 0;
for (ALL_LIST_ELEMENTS_RO (vrf_iflist(VRF_DEFAULT), node, ifp)) {
- vty_outln (vty, "interface %s",ifp->name);
+ vty_out (vty, "interface %s\n",ifp->name);
if (ifp->desc)
- vty_outln (vty, " description %s",ifp->desc);
+ vty_out (vty, " description %s\n",ifp->desc);
babel_interface_nfo *babel_ifp = babel_get_if_nfo (ifp);
/* wireless is the default*/
if (CHECK_FLAG (babel_ifp->flags, BABEL_IF_WIRED))
{
- vty_outln (vty, " babel wired");
+ vty_out (vty, " babel wired\n");
write++;
}
if (babel_ifp->hello_interval != BABEL_DEFAULT_HELLO_INTERVAL)
{
- vty_outln (vty, " babel hello-interval %u",
+ vty_out (vty, " babel hello-interval %u\n",
babel_ifp->hello_interval);
write++;
}
if (babel_ifp->update_interval != BABEL_DEFAULT_UPDATE_INTERVAL)
{
- vty_outln (vty, " babel update-interval %u",
+ vty_out (vty, " babel update-interval %u\n",
babel_ifp->update_interval);
write++;
}
/* Some parameters have different defaults for wired/wireless. */
if (CHECK_FLAG (babel_ifp->flags, BABEL_IF_WIRED)) {
if (!CHECK_FLAG (babel_ifp->flags, BABEL_IF_SPLIT_HORIZON)) {
- vty_outln (vty, " no babel split-horizon");
+ vty_out (vty, " no babel split-horizon\n");
write++;
}
if (babel_ifp->cost != BABEL_DEFAULT_RXCOST_WIRED) {
- vty_outln (vty, " babel rxcost %u", babel_ifp->cost);
+ vty_out (vty, " babel rxcost %u\n", babel_ifp->cost);
write++;
}
if (babel_ifp->channel == BABEL_IF_CHANNEL_INTERFERING) {
- vty_outln (vty, " babel channel interfering");
+ vty_out (vty, " babel channel interfering\n");
write++;
} else if(babel_ifp->channel != BABEL_IF_CHANNEL_NONINTERFERING) {
- vty_outln (vty, " babel channel %d",babel_ifp->channel);
+ vty_out (vty, " babel channel %d\n",babel_ifp->channel);
write++;
}
} else {
if (CHECK_FLAG (babel_ifp->flags, BABEL_IF_SPLIT_HORIZON)) {
- vty_outln (vty, " babel split-horizon");
+ vty_out (vty, " babel split-horizon\n");
write++;
}
if (babel_ifp->cost != BABEL_DEFAULT_RXCOST_WIRELESS) {
- vty_outln (vty, " babel rxcost %u", babel_ifp->cost);
+ vty_out (vty, " babel rxcost %u\n", babel_ifp->cost);
write++;
}
if (babel_ifp->channel == BABEL_IF_CHANNEL_NONINTERFERING) {
- vty_outln (vty, " babel channel noninterfering");
+ vty_out (vty, " babel channel noninterfering\n");
write++;
} else if(babel_ifp->channel != BABEL_IF_CHANNEL_INTERFERING) {
- vty_outln (vty, " babel channel %d",babel_ifp->channel);
+ vty_out (vty, " babel channel %d\n",babel_ifp->channel);
write++;
}
}
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
write++;
}
return write;
for (i = 0; i < vector_active (babel_enable_if); i++)
if ((str = vector_slot (babel_enable_if, i)) != NULL)
{
- vty_outln (vty, " network %s", str);
+ vty_out (vty, " network %s\n", str);
lines++;
}
return lines;
type = babel_proto_redistnum(argv[1]->arg);
if (type < 0) {
- vty_outln (vty, "Invalid type %s", argv[1]->arg);
+ vty_out (vty, "Invalid type %s\n", argv[1]->arg);
return CMD_WARNING;
}
type = babel_proto_redistnum(argv[2]->arg);
if (type < 0) {
- vty_outln (vty, "Invalid type %s", argv[2]->arg);
+ vty_out (vty, "Invalid type %s\n", argv[2]->arg);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[2]->arg);
+ vty_out (vty, "Invalid type %s\n", argv[2]->arg);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[3]->arg);
+ vty_out (vty, "Invalid type %s\n", argv[3]->arg);
return CMD_WARNING;
}
if (debug == BABEL_DEBUG_ALL)
{
- vty_outln (vty, "debug babel all");
+ vty_out (vty, "debug babel all\n");
lines++;
}
else
&& CHECK_FLAG (debug, debug_type[i].type)
)
{
- vty_outln (vty, "debug babel %s", debug_type[i].str);
+ vty_out (vty, "debug babel %s\n", debug_type[i].str);
lines++;
}
if (lines)
{
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
lines++;
}
return lines;
{
if (! zclient->enable)
{
- vty_outln (vty, "no router zebra");
+ vty_out (vty, "no router zebra\n");
return 1;
}
else if (! vrf_bitmap_check (zclient->redist[AFI_IP][ZEBRA_ROUTE_BABEL], VRF_DEFAULT))
{
- vty_outln (vty, "router zebra");
- vty_outln (vty, " no redistribute babel");
+ vty_out (vty, "router zebra\n");
+ vty_out (vty, " no redistribute babel\n");
return 1;
}
return 0;
if (!babel_routing_process)
return lines;
- vty_outln (vty, "router babel");
+ vty_out (vty, "router babel\n");
if (diversity_kind != DIVERSITY_NONE)
{
- vty_outln (vty, " babel diversity");
+ vty_out (vty, " babel diversity\n");
lines++;
}
if (diversity_factor != BABEL_DEFAULT_DIVERSITY_FACTOR)
{
- vty_outln (vty, " babel diversity-factor %d",diversity_factor);
+ vty_out (vty, " babel diversity-factor %d\n",diversity_factor);
lines++;
}
if (resend_delay != BABEL_DEFAULT_RESEND_DELAY)
{
- vty_outln (vty, " babel resend-delay %u", resend_delay);
+ vty_out (vty, " babel resend-delay %u\n", resend_delay);
lines++;
}
if (smoothing_half_life != BABEL_DEFAULT_SMOOTHING_HALF_LIFE)
{
- vty_outln (vty, " babel smoothing-half-life %u",
+ vty_out (vty, " babel smoothing-half-life %u\n",
smoothing_half_life);
lines++;
}
if (i != zclient->redist_default &&
vrf_bitmap_check (zclient->redist[AFI_IP][i], VRF_DEFAULT))
{
- vty_outln (vty, " redistribute %s", zebra_route_string(i));
+ vty_out (vty, " redistribute %s\n", zebra_route_string(i));
lines++;
}
as = (struct aspath *) backet->data;
vty_out (vty, "[%p:%u] (%ld) ", (void *)backet, backet->key, as->refcnt);
- vty_outln (vty, "%s", as->str);
+ vty_out (vty, "%s\n", as->str);
}
/* Print all aspath and hash information. This function is used from
{
struct attr *attr = backet->data;
- vty_outln (vty, "attr[%ld] nexthop %s", attr->refcnt,
+ vty_out (vty, "attr[%ld] nexthop %s\n", attr->refcnt,
inet_ntoa(attr->nexthop));
}
bfd_info = (struct bfd_info *)peer->bfd_info;
if (CHECK_FLAG (bfd_info->flags, BFD_FLAG_PARAM_CFG))
- vty_outln (vty, " neighbor %s bfd %d %d %d", addr,
+ vty_out (vty, " neighbor %s bfd %d %d %d\n", addr,
bfd_info->detect_mult, bfd_info->required_min_rx,
bfd_info->desired_min_tx);
if (bfd_info->type != BFD_TYPE_NOT_CONFIGURED)
- vty_outln (vty, " neighbor %s bfd %s", addr,
+ vty_out (vty, " neighbor %s bfd %s\n", addr,
(bfd_info->type == BFD_TYPE_MULTIHOP) ? "multihop" : "singlehop");
if (!CHECK_FLAG (bfd_info->flags, BFD_FLAG_PARAM_CFG) &&
(bfd_info->type == BFD_TYPE_NOT_CONFIGURED))
- vty_outln (vty, " neighbor %s bfd", addr);
+ vty_out (vty, " neighbor %s bfd\n", addr);
}
/*
&& bgp_damp_cfg.reuse_limit == DEFAULT_REUSE
&& bgp_damp_cfg.suppress_value == DEFAULT_SUPPRESS
&& bgp_damp_cfg.max_suppress_time == bgp_damp_cfg.half_life*4)
- vty_outln (vty, " bgp dampening");
+ vty_out (vty, " bgp dampening\n");
else if (bgp_damp_cfg.half_life != DEFAULT_HALF_LIFE*60
&& bgp_damp_cfg.reuse_limit == DEFAULT_REUSE
&& bgp_damp_cfg.suppress_value == DEFAULT_SUPPRESS
&& bgp_damp_cfg.max_suppress_time == bgp_damp_cfg.half_life*4)
- vty_outln (vty, " bgp dampening %lld",
+ vty_out (vty, " bgp dampening %lld\n",
bgp_damp_cfg.half_life / 60LL);
else
- vty_outln (vty, " bgp dampening %lld %d %d %lld",
+ vty_out (vty, " bgp dampening %lld %d %d %lld\n",
bgp_damp_cfg.half_life/60LL,
bgp_damp_cfg.reuse_limit,
bgp_damp_cfg.suppress_value,
if (bgp == NULL)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (CHECK_FLAG (bgp->af_flags[afi][safi], BGP_CONFIG_DAMPENING))
{
- vty_outln (vty, "Half-life time: %lld min",
+ vty_out (vty, "Half-life time: %lld min\n",
(long long)damp->half_life / 60);
- vty_outln (vty, "Reuse penalty: %d",
+ vty_out (vty, "Reuse penalty: %d\n",
damp->reuse_limit);
- vty_outln (vty, "Suppress penalty: %d",
+ vty_out (vty, "Suppress penalty: %d\n",
damp->suppress_value);
- vty_outln (vty, "Max suppress time: %lld min",
+ vty_out (vty, "Max suppress time: %lld min\n",
(long long)damp->max_suppress_time / 60);
- vty_outln (vty, "Max supress penalty: %u",
+ vty_out (vty, "Max supress penalty: %u\n",
damp->ceiling);
vty_out (vty, VTYNL);
}
else
- vty_outln (vty, "dampening not enabled for %s",
+ vty_out (vty, "dampening not enabled for %s\n",
afi == AFI_IP ? "IPv4" : "IPv6");
return CMD_SUCCESS;
{
if (filter->host)
{
- vty_outln (vty, "%s %s", desc, filter->host);
+ vty_out (vty, "%s %s\n", desc, filter->host);
write++;
}
if (filter->p)
{
- vty_outln (vty, "%s %s/%d", desc,
+ vty_out (vty, "%s %s/%d\n", desc,
inet_ntop (filter->p->family, &filter->p->u.prefix, buf, INET6_ADDRSTRLEN),
filter->p->prefixlen);
write++;
if (!write)
{
- vty_outln (vty, "%s", desc);
+ vty_out (vty, "%s\n", desc);
write++;
}
else
{
TERM_DEBUG_ON (as4, AS4);
- vty_outln (vty, "BGP as4 debugging is on");
+ vty_out (vty, "BGP as4 debugging is on\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_OFF (as4, AS4);
- vty_outln (vty, "BGP as4 debugging is off");
+ vty_out (vty, "BGP as4 debugging is off\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (as4, AS4_SEGMENT);
- vty_outln (vty, "BGP as4 segment debugging is on");
+ vty_out (vty, "BGP as4 segment debugging is on\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_OFF (as4, AS4_SEGMENT);
- vty_outln (vty, "BGP as4 segment debugging is off");
+ vty_out (vty, "BGP as4 segment debugging is off\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (neighbor_events, NEIGHBOR_EVENTS);
- vty_outln (vty, "BGP neighbor-events debugging is on");
+ vty_out (vty, "BGP neighbor-events debugging is on\n");
}
return CMD_SUCCESS;
}
if (bgp_debug_list_has_entry(bgp_debug_neighbor_events_peers, host, NULL))
{
- vty_outln (vty, "BGP neighbor-events debugging is already enabled for %s",
+ vty_out (vty, "BGP neighbor-events debugging is already enabled for %s\n",
host);
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (neighbor_events, NEIGHBOR_EVENTS);
- vty_outln (vty, "BGP neighbor-events debugging is on for %s", host);
+ vty_out (vty, "BGP neighbor-events debugging is on for %s\n", host);
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_OFF (neighbor_events, NEIGHBOR_EVENTS);
- vty_outln (vty, "BGP neighbor-events debugging is off");
+ vty_out (vty, "BGP neighbor-events debugging is off\n");
}
return CMD_SUCCESS;
}
}
if (found_peer)
- vty_outln (vty, "BGP neighbor-events debugging is off for %s", host);
+ vty_out (vty, "BGP neighbor-events debugging is off for %s\n", host);
else
- vty_outln (vty, "BGP neighbor-events debugging was not enabled for %s",
+ vty_out (vty, "BGP neighbor-events debugging was not enabled for %s\n",
host);
return CMD_SUCCESS;
else
{
TERM_DEBUG_ON (nht, NHT);
- vty_outln (vty, "BGP nexthop tracking debugging is on");
+ vty_out (vty, "BGP nexthop tracking debugging is on\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_OFF (nht, NHT);
- vty_outln (vty, "BGP nexthop tracking debugging is off");
+ vty_out (vty, "BGP nexthop tracking debugging is off\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (keepalive, KEEPALIVE);
- vty_outln (vty, "BGP keepalives debugging is on");
+ vty_out (vty, "BGP keepalives debugging is on\n");
}
return CMD_SUCCESS;
}
if (bgp_debug_list_has_entry(bgp_debug_keepalive_peers, host, NULL))
{
- vty_outln (vty, "BGP keepalive debugging is already enabled for %s",
+ vty_out (vty, "BGP keepalive debugging is already enabled for %s\n",
host);
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (keepalive, KEEPALIVE);
- vty_outln (vty, "BGP keepalives debugging is on for %s", host);
+ vty_out (vty, "BGP keepalives debugging is on for %s\n", host);
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_OFF (keepalive, KEEPALIVE);
- vty_outln (vty, "BGP keepalives debugging is off");
+ vty_out (vty, "BGP keepalives debugging is off\n");
}
return CMD_SUCCESS;
}
}
if (found_peer)
- vty_outln (vty, "BGP keepalives debugging is off for %s", host);
+ vty_out (vty, "BGP keepalives debugging is off for %s\n", host);
else
- vty_outln (vty, "BGP keepalives debugging was not enabled for %s", host);
+ vty_out (vty, "BGP keepalives debugging was not enabled for %s\n", host);
return CMD_SUCCESS;
}
if (bgp_debug_list_has_entry(bgp_debug_bestpath_prefixes, NULL, bestpath))
{
- vty_outln (vty, "BGP bestpath debugging is already enabled for %s", bestpath_str);
+ vty_out (vty, "BGP bestpath debugging is already enabled for %s\n", bestpath_str);
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (bestpath, BESTPATH);
- vty_outln (vty, "BGP bestpath debugging is on for %s", bestpath_str);
+ vty_out (vty, "BGP bestpath debugging is on for %s\n", bestpath_str);
}
return CMD_SUCCESS;
if (!ret)
{
prefix_free(argv_p);
- vty_outln (vty, "%% Malformed Prefix");
+ vty_out (vty, "%% Malformed Prefix\n");
return CMD_WARNING;
}
else
{
TERM_DEBUG_OFF (bestpath, BESTPATH);
- vty_outln (vty, "BGP bestpath debugging (per prefix) is off");
+ vty_out (vty, "BGP bestpath debugging (per prefix) is off\n");
}
}
}
if (found_prefix)
- vty_outln (vty, "BGP bestpath debugging is off for %s",
+ vty_out (vty, "BGP bestpath debugging is off for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
else
- vty_outln (vty, "BGP bestpath debugging was not enabled for %s",
+ vty_out (vty, "BGP bestpath debugging was not enabled for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
return CMD_SUCCESS;
else
{
TERM_DEBUG_OFF (bestpath, BESTPATH);
- vty_outln (vty, "BGP bestpath debugging is off");
+ vty_out (vty, "BGP bestpath debugging is off\n");
}
return CMD_SUCCESS;
}
{
TERM_DEBUG_ON (update, UPDATE_IN);
TERM_DEBUG_ON (update, UPDATE_OUT);
- vty_outln (vty, "BGP updates debugging is on");
+ vty_out (vty, "BGP updates debugging is on\n");
}
return CMD_SUCCESS;
}
if (strncmp ("i", argv[idx_in_out]->arg, 1) == 0)
{
TERM_DEBUG_ON (update, UPDATE_IN);
- vty_outln (vty, "BGP updates debugging is on (inbound)");
+ vty_out (vty, "BGP updates debugging is on (inbound)\n");
}
else
{
TERM_DEBUG_ON (update, UPDATE_OUT);
- vty_outln (vty, "BGP updates debugging is on (outbound)");
+ vty_out (vty, "BGP updates debugging is on (outbound)\n");
}
}
return CMD_SUCCESS;
{
if (bgp_debug_list_has_entry(bgp_debug_update_in_peers, host, NULL))
{
- vty_outln (vty, "BGP inbound update debugging is already enabled for %s",
+ vty_out (vty, "BGP inbound update debugging is already enabled for %s\n",
host);
return CMD_SUCCESS;
}
{
if (bgp_debug_list_has_entry(bgp_debug_update_out_peers, host, NULL))
{
- vty_outln (vty, "BGP outbound update debugging is already enabled for %s",
+ vty_out (vty, "BGP outbound update debugging is already enabled for %s\n",
host);
return CMD_SUCCESS;
}
if (inbound)
{
TERM_DEBUG_ON (update, UPDATE_IN);
- vty_outln (vty, "BGP updates debugging is on (inbound) for %s",
+ vty_out (vty, "BGP updates debugging is on (inbound) for %s\n",
argv[idx_peer]->arg);
}
else
{
TERM_DEBUG_ON (update, UPDATE_OUT);
- vty_outln (vty, "BGP updates debugging is on (outbound) for %s",
+ vty_out (vty, "BGP updates debugging is on (outbound) for %s\n",
argv[idx_peer]->arg);
}
}
else
{
TERM_DEBUG_OFF (update, UPDATE_IN);
- vty_outln (vty, "BGP updates debugging is off (inbound)");
+ vty_out (vty, "BGP updates debugging is off (inbound)\n");
}
}
else
else
{
TERM_DEBUG_OFF (update, UPDATE_OUT);
- vty_outln (vty, "BGP updates debugging is off (outbound)");
+ vty_out (vty, "BGP updates debugging is off (outbound)\n");
}
}
else
{
TERM_DEBUG_OFF (update, UPDATE_IN);
- vty_outln (vty, "BGP updates debugging (inbound) is off");
+ vty_out (vty, "BGP updates debugging (inbound) is off\n");
}
}
}
else
{
TERM_DEBUG_OFF (update, UPDATE_OUT);
- vty_outln (vty, "BGP updates debugging (outbound) is off");
+ vty_out (vty, "BGP updates debugging (outbound) is off\n");
}
}
if (found_peer)
if (inbound)
- vty_outln (vty, "BGP updates debugging (inbound) is off for %s", host);
+ vty_out (vty, "BGP updates debugging (inbound) is off for %s\n", host);
else
- vty_outln (vty, "BGP updates debugging (outbound) is off for %s",
+ vty_out (vty, "BGP updates debugging (outbound) is off for %s\n",
host);
else
if (inbound)
- vty_outln (vty, "BGP updates debugging (inbound) was not enabled for %s",
+ vty_out (vty, "BGP updates debugging (inbound) was not enabled for %s\n",
host);
else
- vty_outln (vty, "BGP updates debugging (outbound) was not enabled for %s",
+ vty_out (vty, "BGP updates debugging (outbound) was not enabled for %s\n",
host);
return CMD_SUCCESS;
if (!ret)
{
prefix_free(argv_p);
- vty_outln (vty, "%% Malformed Prefix");
+ vty_out (vty, "%% Malformed Prefix\n");
return CMD_WARNING;
}
if (bgp_debug_list_has_entry(bgp_debug_update_prefixes, NULL, argv_p))
{
- vty_outln (vty, "BGP updates debugging is already enabled for %s",
+ vty_out (vty, "BGP updates debugging is already enabled for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (update, UPDATE_PREFIX);
- vty_outln (vty, "BGP updates debugging is on for %s",
+ vty_out (vty, "BGP updates debugging is on for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
}
if (!ret)
{
prefix_free(argv_p);
- vty_outln (vty, "%% Malformed Prefix");
+ vty_out (vty, "%% Malformed Prefix\n");
return CMD_WARNING;
}
else
{
TERM_DEBUG_OFF (update, UPDATE_PREFIX);
- vty_outln (vty, "BGP updates debugging (per prefix) is off");
+ vty_out (vty, "BGP updates debugging (per prefix) is off\n");
}
}
}
if (found_prefix)
- vty_outln (vty, "BGP updates debugging is off for %s",
+ vty_out (vty, "BGP updates debugging is off for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
else
- vty_outln (vty, "BGP updates debugging was not enabled for %s",
+ vty_out (vty, "BGP updates debugging was not enabled for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
return CMD_SUCCESS;
TERM_DEBUG_OFF (update, UPDATE_IN);
TERM_DEBUG_OFF (update, UPDATE_OUT);
TERM_DEBUG_OFF (update, UPDATE_PREFIX);
- vty_outln (vty, "BGP updates debugging is off");
+ vty_out (vty, "BGP updates debugging is off\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (zebra, ZEBRA);
- vty_outln (vty, "BGP zebra debugging is on");
+ vty_out (vty, "BGP zebra debugging is on\n");
}
return CMD_SUCCESS;
}
if (!ret)
{
prefix_free(argv_p);
- vty_outln (vty, "%% Malformed Prefix");
+ vty_out (vty, "%% Malformed Prefix\n");
return CMD_WARNING;
}
if (bgp_debug_list_has_entry(bgp_debug_zebra_prefixes, NULL, argv_p))
{
- vty_outln (vty, "BGP zebra debugging is already enabled for %s",
+ vty_out (vty, "BGP zebra debugging is already enabled for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (zebra, ZEBRA);
- vty_outln (vty, "BGP zebra debugging is on for %s",
+ vty_out (vty, "BGP zebra debugging is on for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
}
else
{
TERM_DEBUG_OFF (zebra, ZEBRA);
- vty_outln (vty, "BGP zebra debugging is off");
+ vty_out (vty, "BGP zebra debugging is off\n");
}
return CMD_SUCCESS;
}
if (!ret)
{
prefix_free(argv_p);
- vty_outln (vty, "%% Malformed Prefix");
+ vty_out (vty, "%% Malformed Prefix\n");
return CMD_WARNING;
}
else
{
TERM_DEBUG_OFF (zebra, ZEBRA);
- vty_outln (vty, "BGP zebra debugging is off");
+ vty_out (vty, "BGP zebra debugging is off\n");
}
}
}
if (found_prefix)
- vty_outln (vty, "BGP zebra debugging is off for %s",
+ vty_out (vty, "BGP zebra debugging is off for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
else
- vty_outln (vty, "BGP zebra debugging was not enabled for %s",
+ vty_out (vty, "BGP zebra debugging was not enabled for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg);
return CMD_SUCCESS;
else
{
TERM_DEBUG_ON (allow_martians, ALLOW_MARTIANS);
- vty_outln (vty, "BGP allow_martian next hop debugging is on");
+ vty_out (vty, "BGP allow_martian next hop debugging is on\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_OFF (allow_martians, ALLOW_MARTIANS);
- vty_outln (vty, "BGP allow martian next hop debugging is off");
+ vty_out (vty, "BGP allow martian next hop debugging is off\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_ON (update_groups, UPDATE_GROUPS);
- vty_outln (vty, "BGP update-groups debugging is on");
+ vty_out (vty, "BGP update-groups debugging is on\n");
}
return CMD_SUCCESS;
}
else
{
TERM_DEBUG_OFF (update_groups, UPDATE_GROUPS);
- vty_outln (vty, "BGP update-groups debugging is off");
+ vty_out (vty, "BGP update-groups debugging is off\n");
}
return CMD_SUCCESS;
}
TERM_DEBUG_OFF (neighbor_events, NEIGHBOR_EVENTS);
TERM_DEBUG_OFF (zebra, ZEBRA);
TERM_DEBUG_OFF (allow_martians, ALLOW_MARTIANS);
- vty_outln (vty, "All possible debugging has been turned off");
+ vty_out (vty, "All possible debugging has been turned off\n");
return CMD_SUCCESS;
}
DEBUG_STR
BGP_STR)
{
- vty_outln (vty, "BGP debugging status:");
+ vty_out (vty, "BGP debugging status:\n");
if (BGP_DEBUG (as4, AS4))
- vty_outln (vty, " BGP as4 debugging is on");
+ vty_out (vty, " BGP as4 debugging is on\n");
if (BGP_DEBUG (as4, AS4_SEGMENT))
- vty_outln (vty, " BGP as4 aspath segment debugging is on");
+ vty_out (vty, " BGP as4 aspath segment debugging is on\n");
if (BGP_DEBUG (bestpath, BESTPATH))
bgp_debug_list_print (vty, " BGP bestpath debugging is on",
bgp_debug_neighbor_events_peers);
if (BGP_DEBUG (nht, NHT))
- vty_outln (vty, " BGP next-hop tracking debugging is on");
+ vty_out (vty, " BGP next-hop tracking debugging is on\n");
if (BGP_DEBUG (update_groups, UPDATE_GROUPS))
- vty_outln (vty, " BGP update-groups debugging is on");
+ vty_out (vty, " BGP update-groups debugging is on\n");
if (BGP_DEBUG (update, UPDATE_PREFIX))
bgp_debug_list_print (vty, " BGP updates debugging is on",
bgp_debug_zebra_prefixes);
if (BGP_DEBUG (allow_martians, ALLOW_MARTIANS))
- vty_outln (vty, " BGP allow martian next hop debugging is on");
+ vty_out (vty, " BGP allow martian next hop debugging is on\n");
vty_out (vty, VTYNL);
return CMD_SUCCESS;
}
if (CONF_BGP_DEBUG (as4, AS4))
{
- vty_outln (vty, "debug bgp as4");
+ vty_out (vty, "debug bgp as4\n");
write++;
}
if (CONF_BGP_DEBUG (as4, AS4_SEGMENT))
{
- vty_outln (vty, "debug bgp as4 segment");
+ vty_out (vty, "debug bgp as4 segment\n");
write++;
}
if (CONF_BGP_DEBUG (nht, NHT))
{
- vty_outln (vty, "debug bgp nht");
+ vty_out (vty, "debug bgp nht\n");
write++;
}
if (CONF_BGP_DEBUG (update_groups, UPDATE_GROUPS))
{
- vty_outln (vty, "debug bgp update-groups");
+ vty_out (vty, "debug bgp update-groups\n");
write++;
}
{
if (!bgp_debug_zebra_prefixes || list_isempty(bgp_debug_zebra_prefixes))
{
- vty_outln (vty, "debug bgp zebra");
+ vty_out (vty, "debug bgp zebra\n");
write++;
}
else
if (CONF_BGP_DEBUG (allow_martians, ALLOW_MARTIANS))
{
- vty_outln (vty, "debug bgp allow-martians");
+ vty_out (vty, "debug bgp allow-martians\n");
write++;
}
interval = bgp_dump_parse_time (interval_str);
if (interval == 0)
{
- vty_outln (vty, "Malformed interval string");
+ vty_out (vty, "Malformed interval string\n");
return CMD_WARNING;
}
type_str = "all-et";
if (bgp_dump_all.interval_str)
- vty_outln (vty, "dump bgp %s %s %s", type_str,
+ vty_out (vty, "dump bgp %s %s %s\n", type_str,
bgp_dump_all.filename,bgp_dump_all.interval_str);
else
- vty_outln (vty, "dump bgp %s %s", type_str,
+ vty_out (vty, "dump bgp %s %s\n", type_str,
bgp_dump_all.filename);
}
if (bgp_dump_updates.filename)
type_str = "updates-et";
if (bgp_dump_updates.interval_str)
- vty_outln (vty, "dump bgp %s %s %s", type_str,
+ vty_out (vty, "dump bgp %s %s %s\n", type_str,
bgp_dump_updates.filename,bgp_dump_updates.interval_str);
else
- vty_outln (vty, "dump bgp %s %s", type_str,
+ vty_out (vty, "dump bgp %s %s\n", type_str,
bgp_dump_updates.filename);
}
if (bgp_dump_routes.filename)
{
if (bgp_dump_routes.interval_str)
- vty_outln (vty, "dump bgp routes-mrt %s %s",
+ vty_out (vty, "dump bgp routes-mrt %s %s\n",
bgp_dump_routes.filename,bgp_dump_routes.interval_str);
else
- vty_outln (vty, "dump bgp routes-mrt %s",
+ vty_out (vty, "dump bgp routes-mrt %s\n",
bgp_dump_routes.filename);
}
bgp = bgp_get_default();
if (bgp == NULL) {
if (!use_json)
- vty_outln (vty,"No BGP process is configured");
+ vty_out (vty,"No BGP process is configured\n");
return CMD_WARNING;
}
SHOW_DISPLAY_OVERLAY)
vty_outln(vty, V4_HEADER_OVERLAY);
else {
- vty_outln (vty,
- "BGP table version is 0, local router ID is %s",
+ vty_out (vty,
+ "BGP table version is 0, local router ID is %s\n",
inet_ntoa(bgp->router_id));
- vty_outln (vty,
- "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal");
- vty_outln (vty,
- "Origin codes: i - IGP, e - EGP, ? - incomplete%s",
+ vty_out (vty,
+ "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
+ vty_out (vty,
+ "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
VTYNL);
vty_outln(vty, V4_HEADER);
}
}
}
if (output_count == 0)
- vty_outln (vty, "No prefixes displayed, %ld exist",
+ vty_out (vty, "No prefixes displayed, %ld exist\n",
total_count);
else
- vty_outln (vty, "%sDisplayed %ld out of %ld total prefixes",
+ vty_out (vty, "%sDisplayed %ld out of %ld total prefixes\n",
VTYNL, output_count, total_count);
return CMD_SUCCESS;
}
ret = str2prefix_rd(argv[idx_ext_community]->arg, &prd);
if (!ret) {
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
return bgp_show_ethernet_vpn(vty, &prd, bgp_show_type_normal, NULL, 0,
ret = str2prefix_rd(argv[idx_ext_community]->arg, &prd);
if (!ret) {
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
return bgp_show_ethernet_vpn(vty, &prd, bgp_show_type_normal, NULL, 1,
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"Malformed address");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty, "Malformed address: %s",
+ vty_out (vty, "Malformed address: %s\n",
argv[idx_ipv4]->arg);
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"No such neighbor or address family");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty,
- "%% No such neighbor or address family");
+ vty_out (vty,
+ "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"Malformed Route Distinguisher");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty,"%% Malformed Route Distinguisher");
+ vty_out (vty,"%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"Malformed address");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty, "Malformed address: %s",
+ vty_out (vty, "Malformed address: %s\n",
argv[idx_ext_community]->arg);
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"No such neighbor or address family");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty,
- "%% No such neighbor or address family");
+ vty_out (vty,
+ "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"Malformed address");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty, "Malformed address: %s",
+ vty_out (vty, "Malformed address: %s\n",
argv[idx_ipv4]->arg);
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"No such neighbor or address family");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty,
- "%% No such neighbor or address family");
+ vty_out (vty,
+ "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"Malformed address");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty, "Malformed address: %s",
+ vty_out (vty, "Malformed address: %s\n",
argv[idx_ext_community]->arg);
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"No such neighbor or address family");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty,
- "%% No such neighbor or address family");
+ vty_out (vty,
+ "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
"Malformed Route Distinguisher");
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string(json_no));
json_object_free(json_no);
} else
- vty_outln (vty,"%% Malformed Route Distinguisher");
+ vty_out (vty,"%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
ret = str2prefix_rd(argv[idx_ext_community]->arg, &prd);
if (!ret) {
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
return bgp_show_ethernet_vpn(vty, &prd, bgp_show_type_normal, NULL,
regex = bgp_regcomp (regstr);
if (!regex)
{
- vty_outln (vty, "can't compile regexp %s", regstr);
+ vty_out (vty, "can't compile regexp %s\n", regstr);
XFREE (MTYPE_TMP, regstr);
return CMD_WARNING;
}
aslist = as_list_lookup (aslistname);
if (aslist == NULL)
{
- vty_outln (vty, "ip as-path access-list %s doesn't exist",aslistname);
+ vty_out (vty, "ip as-path access-list %s doesn't exist\n",aslistname);
return CMD_WARNING;
}
type = AS_FILTER_DENY;
else
{
- vty_outln (vty, "filter type must be [permit|deny]");
+ vty_out (vty, "filter type must be [permit|deny]\n");
return CMD_WARNING;
}
regex = bgp_regcomp (regstr);
if (!regex)
{
- vty_outln (vty, "can't compile regexp %s", regstr);
+ vty_out (vty, "can't compile regexp %s\n", regstr);
XFREE (MTYPE_TMP, regstr);
return CMD_WARNING;
}
aslist = as_list_lookup (argv[idx_word]->arg);
if (aslist == NULL)
{
- vty_outln (vty, "ip as-path access-list %s doesn't exist",
+ vty_out (vty, "ip as-path access-list %s doesn't exist\n",
argv[idx_word]->arg);
return CMD_WARNING;
}
{
struct as_filter *asfilter;
- vty_outln (vty, "AS path access list %s", aslist->name);
+ vty_out (vty, "AS path access list %s\n", aslist->name);
for (asfilter = aslist->head; asfilter; asfilter = asfilter->next)
{
- vty_outln (vty, " %s %s", filter_type_str (asfilter->type),
+ vty_out (vty, " %s %s\n", filter_type_str (asfilter->type),
asfilter->reg_str);
}
}
for (aslist = as_list_master.num.head; aslist; aslist = aslist->next)
{
- vty_outln (vty, "AS path access list %s", aslist->name);
+ vty_out (vty, "AS path access list %s\n", aslist->name);
for (asfilter = aslist->head; asfilter; asfilter = asfilter->next)
{
- vty_outln (vty, " %s %s", filter_type_str (asfilter->type),
+ vty_out (vty, " %s %s\n", filter_type_str (asfilter->type),
asfilter->reg_str);
}
}
for (aslist = as_list_master.str.head; aslist; aslist = aslist->next)
{
- vty_outln (vty, "AS path access list %s", aslist->name);
+ vty_out (vty, "AS path access list %s\n", aslist->name);
for (asfilter = aslist->head; asfilter; asfilter = asfilter->next)
{
- vty_outln (vty, " %s %s", filter_type_str (asfilter->type),
+ vty_out (vty, " %s %s\n", filter_type_str (asfilter->type),
asfilter->reg_str);
}
}
for (aslist = as_list_master.num.head; aslist; aslist = aslist->next)
for (asfilter = aslist->head; asfilter; asfilter = asfilter->next)
{
- vty_outln (vty, "ip as-path access-list %s %s %s",
+ vty_out (vty, "ip as-path access-list %s %s %s\n",
aslist->name, filter_type_str (asfilter->type),
asfilter->reg_str);
write++;
for (aslist = as_list_master.str.head; aslist; aslist = aslist->next)
for (asfilter = aslist->head; asfilter; asfilter = asfilter->next)
{
- vty_outln (vty, "ip as-path access-list %s %s %s",
+ vty_out (vty, "ip as-path access-list %s %s %s\n",
aslist->name, filter_type_str (asfilter->type),
asfilter->reg_str);
write++;
if (bgp == NULL)
{
if (!use_json)
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if ((afi != AFI_IP) && (afi != AFI_IP6))
{
- vty_outln (vty, "Afi %d not supported", afi);
+ vty_out (vty, "Afi %d not supported\n", afi);
return CMD_WARNING;
}
vty_outln (vty, V4_HEADER_TAG);
else
{
- vty_outln (vty, "BGP table version is 0, local router ID is %s",
+ vty_out (vty, "BGP table version is 0, local router ID is %s\n",
inet_ntoa(bgp->router_id));
- vty_outln (vty,
- "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal");
- vty_outln (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s",
+ vty_out (vty,
+ "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
+ vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
VTYNL);
vty_outln (vty, V4_HEADER);
}
if (use_json)
{
json_object_object_add(json, "routes", json_nroute);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
else
{
if (output_count == 0)
- vty_outln (vty, "No prefixes displayed, %ld exist", total_count);
+ vty_out (vty, "No prefixes displayed, %ld exist\n", total_count);
else
- vty_outln (vty, "%sDisplayed %ld routes and %ld total paths",
+ vty_out (vty, "%sDisplayed %ld routes and %ld total paths\n",
VTYNL, output_count, total_count);
}
ret = str2prefix_rd (argv[idx_rd]->arg, &prd);
if (! ret)
{
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
return bgp_show_mpls_vpn (vty, afi, &prd, bgp_show_type_normal, NULL, 0, use_json (argc, argv));
ret = str2prefix_rd (argv[idx_ext_community]->arg, &prd);
if (! ret)
{
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
return bgp_show_mpls_vpn (vty, afi, &prd, bgp_show_type_normal, NULL, 0, 0);
ret = str2prefix_rd (argv[idx_ext_community]->arg, &prd);
if (! ret)
{
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
return bgp_show_mpls_vpn (vty, afi, &prd, bgp_show_type_normal, NULL, 1, 0);
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "Malformed address");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "Malformed address: %s", argv[idx_ipv4]->arg);
+ vty_out (vty, "Malformed address: %s\n", argv[idx_ipv4]->arg);
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "No such neighbor or address family");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% No such neighbor or address family");
+ vty_out (vty, "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "Malformed Route Distinguisher");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "Malformed address");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "Malformed address: %s",
+ vty_out (vty, "Malformed address: %s\n",
argv[idx_ext_community]->arg);
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "No such neighbor or address family");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% No such neighbor or address family");
+ vty_out (vty, "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "Malformed address");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "Malformed address: %s", argv[idx_ipv4]->arg);
+ vty_out (vty, "Malformed address: %s\n", argv[idx_ipv4]->arg);
return CMD_WARNING;
}
peer = peer_lookup (NULL, &su);
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "No such neighbor or address family");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% No such neighbor or address family");
+ vty_out (vty, "%% No such neighbor or address family\n");
return CMD_WARNING;
}
return show_adj_route_vpn (vty, peer, NULL, AFI_IP, SAFI_MPLS_VPN, uj);
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "Malformed address");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "Malformed address: %s",
+ vty_out (vty, "Malformed address: %s\n",
argv[idx_ext_community]->arg);
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "No such neighbor or address family");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% No such neighbor or address family");
+ vty_out (vty, "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "Malformed Route Distinguisher");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
time_t tbuf;
afi_t afi;
- vty_outln (vty, "Current BGP nexthop cache:");
+ vty_out (vty, "Current BGP nexthop cache:\n");
for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
{
if (!bgp->nexthop_cache_table[afi])
{
if (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_VALID))
{
- vty_outln (vty, " %s valid [IGP metric %d], #paths %d",
+ vty_out (vty, " %s valid [IGP metric %d], #paths %d\n",
inet_ntop (rn->p.family, &rn->p.u.prefix, buf, sizeof (buf)),
bnc->metric, bnc->path_count);
if (detail)
switch (nexthop->type)
{
case NEXTHOP_TYPE_IPV6:
- vty_outln (vty, " gate %s",
+ vty_out (vty, " gate %s\n",
inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf, sizeof(buf)));
break;
case NEXTHOP_TYPE_IPV6_IFINDEX:
- vty_outln (vty, " gate %s, if %s",
+ vty_out (vty, " gate %s, if %s\n",
inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf,
sizeof (buf)),
ifindex2ifname(nexthop->ifindex, bgp->vrf_id));
break;
case NEXTHOP_TYPE_IPV4:
- vty_outln (vty, " gate %s",
+ vty_out (vty, " gate %s\n",
inet_ntop(AF_INET, &nexthop->gate.ipv4, buf, sizeof(buf)));
break;
case NEXTHOP_TYPE_IFINDEX:
- vty_outln (vty, " if %s",
+ vty_out (vty, " if %s\n",
ifindex2ifname(nexthop->ifindex, bgp->vrf_id));
break;
case NEXTHOP_TYPE_IPV4_IFINDEX:
- vty_outln (vty, " gate %s, if %s",
+ vty_out (vty, " gate %s, if %s\n",
inet_ntop(AF_INET, &nexthop->gate.ipv4, buf,
sizeof (buf)),
ifindex2ifname(nexthop->ifindex, bgp->vrf_id));
break;
default:
- vty_outln (vty, " invalid nexthop type %u",
+ vty_out (vty, " invalid nexthop type %u\n",
nexthop->type);
}
}
else
{
- vty_outln (vty, " %s invalid",
+ vty_out (vty, " %s invalid\n",
inet_ntop(rn->p.family, &rn->p.u.prefix, buf, sizeof(buf)));
if (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_CONNECTED))
- vty_outln (vty, " Must be Connected");
+ vty_out (vty, " Must be Connected\n");
}
tbuf = time(NULL) - (bgp_clock() - bnc->last_update);
vty_out (vty, " Last update: %s", ctime(&tbuf));
bgp = bgp_get_default ();
if (!bgp)
{
- vty_outln (vty, "%% No such BGP instance exist");
+ vty_out (vty, "%% No such BGP instance exist\n");
return CMD_WARNING;
}
for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp))
{
- vty_outln (vty, "%sInstance %s:",
+ vty_out (vty, "%sInstance %s:\n",
VTYNL,
(bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name);
bgp_show_nexthops (vty, bgp, 0);
ret = str2prefix (ip_str, &p);
if (! ret)
{
- vty_outln (vty, "%% Malformed prefix");
+ vty_out (vty, "%% Malformed prefix\n");
return CMD_WARNING;
}
if (afi == AFI_IP6 && IN6_IS_ADDR_LINKLOCAL (&p.u.prefix6))
{
- vty_outln (vty,"%% Malformed prefix (link-local address)");
+ vty_out (vty,"%% Malformed prefix (link-local address)\n");
return CMD_WARNING;
}
/* Label index cannot be changed. */
if (bgp_static->label_index != label_index)
{
- vty_outln (vty, "%% Label index cannot be changed");
+ vty_out (vty, "%% Label index cannot be changed\n");
return CMD_WARNING;
}
ret = str2prefix (ip_str, &p);
if (! ret)
{
- vty_outln (vty, "%% Malformed prefix");
+ vty_out (vty, "%% Malformed prefix\n");
return CMD_WARNING;
}
if (afi == AFI_IP6 && IN6_IS_ADDR_LINKLOCAL (&p.u.prefix6))
{
- vty_outln (vty,"%% Malformed prefix (link-local address)");
+ vty_out (vty,"%% Malformed prefix (link-local address)\n");
return CMD_WARNING;
}
rn = bgp_node_lookup (bgp->route[afi][safi], &p);
if (! rn)
{
- vty_outln (vty,"%% Can't find specified static route configuration.");
+ vty_out (vty,"%% Can't find specified static route configuration.\n");
return CMD_WARNING;
}
ret = str2prefix (ip_str, &p);
if (! ret)
{
- vty_outln (vty, "%% Malformed prefix");
+ vty_out (vty, "%% Malformed prefix\n");
return CMD_WARNING;
}
apply_mask (&p);
if ( (afi == AFI_L2VPN) &&
(bgp_build_evpn_prefix ( evpn_type, ethtag!=NULL?atol(ethtag):0, &p)))
{
- vty_outln (vty, "%% L2VPN prefix could not be forged");
+ vty_out (vty, "%% L2VPN prefix could not be forged\n");
return CMD_WARNING;
}
ret = str2prefix_rd (rd_str, &prd);
if (! ret)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
{
if( esi && str2esi (esi, NULL) == 0)
{
- vty_outln (vty, "%% Malformed ESI");
+ vty_out (vty, "%% Malformed ESI\n");
return CMD_WARNING;
}
if( routermac && prefix_str2mac (routermac, NULL) == 0)
{
- vty_outln (vty, "%% Malformed Router MAC");
+ vty_out (vty, "%% Malformed Router MAC\n");
return CMD_WARNING;
}
if (gwip)
ret = str2prefix (gwip, &gw_ip);
if (! ret)
{
- vty_outln (vty, "%% Malformed GatewayIp");
+ vty_out (vty, "%% Malformed GatewayIp\n");
return CMD_WARNING;
}
if((gw_ip.family == AF_INET &&
(gw_ip.family == AF_INET6 &&
IS_EVPN_PREFIX_IPADDR_V4((struct prefix_evpn *)&p)))
{
- vty_outln (vty, "%% GatewayIp family differs with IP prefix");
+ vty_out (vty, "%% GatewayIp family differs with IP prefix\n");
return CMD_WARNING;
}
}
if (rn->info)
{
- vty_outln (vty, "%% Same network configuration exists");
+ vty_out (vty, "%% Same network configuration exists\n");
bgp_unlock_node (rn);
}
else
ret = str2prefix (ip_str, &p);
if (! ret)
{
- vty_outln (vty, "%% Malformed prefix");
+ vty_out (vty, "%% Malformed prefix\n");
return CMD_WARNING;
}
apply_mask (&p);
if ( (afi == AFI_L2VPN) &&
(bgp_build_evpn_prefix ( evpn_type, ethtag!=NULL?atol(ethtag):0, &p)))
{
- vty_outln (vty, "%% L2VPN prefix could not be forged");
+ vty_out (vty, "%% L2VPN prefix could not be forged\n");
return CMD_WARNING;
}
ret = str2prefix_rd (rd_str, &prd);
if (! ret)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
bgp_unlock_node (rn);
}
else
- vty_outln (vty, "%% Can't find the route");
+ vty_out (vty, "%% Can't find the route\n");
return CMD_SUCCESS;
}
if (bgp->table_map[afi][safi].name)
{
bgp_config_write_family_header (vty, afi, safi, write);
- vty_outln (vty, " table-map %s",
+ vty_out (vty, " table-map %s\n",
bgp->table_map[afi][safi].name);
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, argv[idx_ipv4_2]->arg, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, argv[idx_ipv4_2]->arg, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, argv[idx_ipv4_2]->arg, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, NULL, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, NULL, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, NULL, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, argv[idx_ipv4_2]->arg, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, NULL, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = str2prefix (prefix_str, &p);
if (!ret)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
apply_mask (&p);
rn = bgp_node_lookup (bgp->aggregate[afi][safi], &p);
if (! rn)
{
- vty_outln (vty,"%% There is no aggregate-address configuration.");
+ vty_out (vty,"%% There is no aggregate-address configuration.\n");
return CMD_WARNING;
}
ret = str2prefix (prefix_str, &p);
if (!ret)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
apply_mask (&p);
if (rn->info)
{
- vty_outln (vty, "There is already same aggregate network.");
+ vty_out (vty, "There is already same aggregate network.\n");
/* try to remove the old entry */
ret = bgp_aggregate_unset (vty, prefix_str, afi, safi);
if (ret)
{
- vty_outln (vty, "Error deleting aggregate.");
+ vty_out (vty, "Error deleting aggregate.\n");
bgp_unlock_node (rn);
return CMD_WARNING;
}
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
if (json_paths)
json_object_string_add(json_path, "alert", "No attributes");
else
- vty_outln (vty, "No attributes to print");
+ vty_out (vty, "No attributes to print\n");
}
if (json_paths)
}
else
{
- vty_outln (vty, " (%s) %s",
+ vty_out (vty, " (%s) %s\n",
inet_ntop (AF_INET6, &attr->extra->mp_nexthop_local,
buf, INET6_ADDRSTRLEN),
attr->extra->mp_nexthop_prefer_global ? "(prefer-global)" : "(used)");
}
else
{
- vty_outln (vty, " Community: %s",attr->community->str);
+ vty_out (vty, " Community: %s\n",attr->community->str);
}
}
}
else
{
- vty_outln (vty, " Extended Community: %s",
+ vty_out (vty, " Extended Community: %s\n",
attr->extra->ecommunity->str);
}
}
/* Line 6 display Large community */
if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_LARGE_COMMUNITIES))
- vty_outln (vty, " Large Community: %s",
+ vty_out (vty, " Large Community: %s\n",
attr->extra->lcommunity->str);
/* Line 7 display Originator, Cluster-id */
if (json_paths)
json_object_int_add(json_path, "remoteLabel", label);
else
- vty_outln (vty, " Remote label: %d", label);
+ vty_out (vty, " Remote label: %d\n", label);
}
/* Label Index */
if (json_paths)
json_object_int_add(json_path, "labelIndex", attr->extra->label_index);
else
- vty_outln (vty, " Label Index: %d",
+ vty_out (vty, " Label Index: %d\n",
attr->extra->label_index);
}
}
else
{
- vty_outln (vty, " AddPath ID: RX %u, TX %u",
+ vty_out (vty, " AddPath ID: RX %u, TX %u\n",
binfo->addpath_rx_id,binfo->addpath_tx_id);
}
}
if (use_json)
{
json_object_free (json_paths);
- vty_outln (vty, " } }");
+ vty_out (vty, " } }\n");
}
else
{
if (output_count == 0)
{
if (type == bgp_show_type_normal)
- vty_outln (vty, "No BGP prefixes displayed, %ld exist",
+ vty_out (vty, "No BGP prefixes displayed, %ld exist\n",
total_count);
}
else
- vty_outln (vty, "%sDisplayed %ld routes and %ld total paths",
+ vty_out (vty, "%sDisplayed %ld routes and %ld total paths\n",
VTYNL, output_count, total_count);
}
if (bgp == NULL)
{
if (!use_json)
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
/* use MPLS and ENCAP specific shows until they are merged */
int is_first = 1;
if (use_json)
- vty_outln (vty, "{");
+ vty_out (vty, "{\n");
for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp))
{
if (use_json)
{
if (! is_first)
- vty_outln (vty, ",");
+ vty_out (vty, ",\n");
else
is_first = 0;
}
else
{
- vty_outln (vty, "%sInstance %s:",
+ vty_out (vty, "%sInstance %s:\n",
VTYNL,
(bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name);
}
}
if (use_json)
- vty_outln (vty, "}");
+ vty_out (vty, "}\n");
}
/* Header of detailed BGP route information */
prefix2str (p, buf2, INET6_ADDRSTRLEN);
else
inet_ntop (p->family, &p->u.prefix, buf2, INET6_ADDRSTRLEN);
- vty_outln (vty, "BGP routing table entry for %s%s%s/%d",
+ vty_out (vty, "BGP routing table entry for %s%s%s/%d\n",
((safi == SAFI_MPLS_VPN || safi == SAFI_ENCAP || safi == SAFI_EVPN) ?
prefix_rd2str (prd, buf1, RD_ADDRSTRLEN) : ""),
((safi == SAFI_MPLS_VPN) || (safi == SAFI_EVPN)) ? ":" : "",
p->prefixlen);
if (has_valid_label)
- vty_outln (vty, "Local label: %d", label);
+ vty_out (vty, "Local label: %d\n", label);
else if (bgp_labeled_safi(safi))
- vty_outln (vty, "Local label: not allocated");
+ vty_out (vty, "Local label: not allocated\n");
}
for (ri = rn->info; ri; ri = ri->next)
if (suppress)
vty_out (vty, ", Advertisements suppressed by an aggregate.");
- vty_outln (vty, ")");
+ vty_out (vty, ")\n");
}
/* If we are not using addpath then we can display Advertised to and that will
ret = str2prefix (ip_str, &match);
if (! ret)
{
- vty_outln (vty, "address is malformed");
+ vty_out (vty, "address is malformed\n");
return CMD_WARNING;
}
if (display)
json_object_object_add(json, "paths", json_paths);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
{
if (!display)
{
- vty_outln (vty, "%% Network not in table");
+ vty_out (vty, "%% Network not in table\n");
return CMD_WARNING;
}
}
XFREE (MTYPE_TMP, str);
if (! lcom)
{
- vty_outln (vty, "%% Large-community malformed");
+ vty_out (vty, "%% Large-community malformed\n");
return CMD_WARNING;
}
list = community_list_lookup (bgp_clist, lcom, LARGE_COMMUNITY_LIST_MASTER);
if (list == NULL)
{
- vty_outln (vty, "%% %s is not a valid large-community-list name",lcom);
+ vty_out (vty, "%% %s is not a valid large-community-list name\n",lcom);
return CMD_WARNING;
}
struct bgp *bgp = bgp_lookup_by_name (vrf);
if (bgp == NULL)
{
- vty_outln (vty, "Can't find BGP instance %s", vrf);
+ vty_out (vty, "Can't find BGP instance %s\n", vrf);
return CMD_WARNING;
}
struct bgp *bgp = bgp_lookup_by_name (vrf);
if (bgp == NULL)
{
- vty_outln (vty, "Can't find BGP instance %s", vrf);
+ vty_out (vty, "Can't find BGP instance %s\n", vrf);
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty,
- "Specified 'all' vrf's but this command currently only works per view/vrf");
+ vty_out (vty,
+ "Specified 'all' vrf's but this command currently only works per view/vrf\n");
return CMD_WARNING;
}
if ((argv[idx]->type == IPV6_TKN || argv[idx]->type == IPV6_PREFIX_TKN) && afi != AFI_IP6)
{
- vty_outln (vty,
- "%% Cannot specify IPv6 address or prefix with IPv4 AFI");
+ vty_out (vty,
+ "%% Cannot specify IPv6 address or prefix with IPv4 AFI\n");
return CMD_WARNING;
}
if ((argv[idx]->type == IPV4_TKN || argv[idx]->type == IPV4_PREFIX_TKN) && afi != AFI_IP)
{
- vty_outln (vty,
- "%% Cannot specify IPv4 address or prefix with IPv6 AFI");
+ vty_out (vty,
+ "%% Cannot specify IPv4 address or prefix with IPv6 AFI\n");
return CMD_WARNING;
}
regex = bgp_regcomp (regstr);
if (! regex)
{
- vty_outln (vty, "Can't compile regexp %s", regstr);
+ vty_out (vty, "Can't compile regexp %s\n", regstr);
return CMD_WARNING;
}
plist = prefix_list_lookup (afi, prefix_list_str);
if (plist == NULL)
{
- vty_outln (vty, "%% %s is not a valid prefix-list name",
+ vty_out (vty, "%% %s is not a valid prefix-list name\n",
prefix_list_str);
return CMD_WARNING;
}
as_list = as_list_lookup (filter);
if (as_list == NULL)
{
- vty_outln (vty, "%% %s is not a valid AS-path access-list name",
+ vty_out (vty, "%% %s is not a valid AS-path access-list name\n",
filter);
return CMD_WARNING;
}
rmap = route_map_lookup_by_name (rmap_str);
if (! rmap)
{
- vty_outln (vty, "%% %s is not a valid route-map name",
+ vty_out (vty, "%% %s is not a valid route-map name\n",
rmap_str);
return CMD_WARNING;
}
XFREE (MTYPE_TMP, str);
if (! com)
{
- vty_outln (vty, "%% Community malformed: ");
+ vty_out (vty, "%% Community malformed: \n");
return CMD_WARNING;
}
list = community_list_lookup (bgp_clist, com, COMMUNITY_LIST_MASTER);
if (list == NULL)
{
- vty_outln (vty, "%% %s is not a valid community-list name",com);
+ vty_out (vty, "%% %s is not a valid community-list name\n",com);
return CMD_WARNING;
}
ret = str2prefix (prefix, p);
if (! ret)
{
- vty_outln (vty, "%% Malformed Prefix");
+ vty_out (vty, "%% Malformed Prefix\n");
return CMD_WARNING;
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "malformedAddressOrName", ip_str);
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% Malformed address or name: %s", ip_str);
+ vty_out (vty, "%% Malformed address or name: %s\n", ip_str);
return NULL;
}
}
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning","No such neighbor");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "No such neighbor");
+ vty_out (vty, "No such neighbor\n");
return NULL;
}
if (!bgp->rib[afi][safi])
{
- vty_outln (vty, "%% No RIB exist's for the AFI(%d)/SAFI(%d)",
+ vty_out (vty, "%% No RIB exist's for the AFI(%d)/SAFI(%d)\n",
afi, safi);
return CMD_WARNING;
}
ts.table = bgp->rib[afi][safi];
thread_execute (bm->master, bgp_table_stats_walker, &ts, 0);
- vty_outln (vty, "BGP %s RIB statistics%s",
+ vty_out (vty, "BGP %s RIB statistics%s\n",
afi_safi_print (afi, safi), VTYNL);
for (i = 0; i < BGP_STATS_MAX; i++)
break;
case BGP_STATS_SPACE:
vty_out (vty, "%-30s: ", table_stats_strs[i]);
- vty_outln (vty, "%12llu", ts.counts[i]);
+ vty_out (vty, "%12llu\n", ts.counts[i]);
if (ts.counts[BGP_STATS_MAXBITLEN] < 9)
break;
vty_out (vty, "%30s: ", "%% announced ");
- vty_outln (vty, "%12.2f",
+ vty_out (vty, "%12.2f\n",
100 * (float)ts.counts[BGP_STATS_SPACE] / (float)((uint64_t)1UL << ts.counts[BGP_STATS_MAXBITLEN]));
vty_out (vty, "%30s: ", "/8 equivalent ");
- vty_outln (vty, "%12.2f",
+ vty_out (vty, "%12.2f\n",
(float)ts.counts[BGP_STATS_SPACE] / (float)(1UL << (ts.counts[BGP_STATS_MAXBITLEN] - 8)));
if (ts.counts[BGP_STATS_MAXBITLEN] < 25)
break;
if (use_json)
{
json_object_string_add(json, "warning", "No such neighbor or address family");
- vty_outln (vty, "%s", json_object_to_json_string(json));
+ vty_out (vty, "%s\n", json_object_to_json_string(json));
json_object_free(json);
}
else
- vty_outln (vty, "%% No such neighbor or address family");
+ vty_out (vty, "%% No such neighbor or address family\n");
return CMD_WARNING;
}
json_object_string_add(json, "pfxctDriftFor", peer->host);
json_object_string_add(json, "recommended", "Please report this bug, with the above command output");
}
- vty_outln (vty, "%s", json_object_to_json_string(json));
+ vty_out (vty, "%s\n", json_object_to_json_string(json));
json_object_free(json);
}
else
if (peer->hostname && bgp_flag_check(peer->bgp, BGP_FLAG_SHOW_HOSTNAME))
{
- vty_outln (vty, "Prefix counts for %s/%s, %s",
+ vty_out (vty, "Prefix counts for %s/%s, %s\n",
peer->hostname, peer->host,afi_safi_print(afi, safi));
}
else
{
- vty_outln (vty, "Prefix counts for %s, %s",
+ vty_out (vty, "Prefix counts for %s, %s\n",
peer->host, afi_safi_print(afi, safi));
}
- vty_outln (vty, "PfxCt: %ld", peer->pcount[afi][safi]);
- vty_outln (vty, "%sCounts from RIB table walk:%s",
+ vty_out (vty, "PfxCt: %ld\n", peer->pcount[afi][safi]);
+ vty_out (vty, "%sCounts from RIB table walk:%s\n",
VTYNL, VTYNL);
for (i = 0; i < PCOUNT_MAX; i++)
- vty_outln (vty, "%20s: %-10d", pcount_strs[i], pcounts.count[i]);
+ vty_out (vty, "%20s: %-10d\n", pcount_strs[i], pcounts.count[i]);
if (pcounts.count[PCOUNT_PFCNT] != peer->pcount[afi][safi])
{
- vty_outln (vty, "%s [pcount] PfxCt drift!",
+ vty_out (vty, "%s [pcount] PfxCt drift!\n",
peer->host);
- vty_outln (vty,
- "Please report this bug, with the above command output");
+ vty_out (vty,
+ "Please report this bug, with the above command output\n");
}
}
struct bgp *bgp = bgp_get_default();
if (!bgp)
{
- vty_outln (vty, "Can't find default instance");
+ vty_out (vty, "Can't find default instance\n");
return CMD_WARNING;
}
network = argv[idx]->arg;
else
{
- vty_outln (vty, "Unable to figure out Network");
+ vty_out (vty, "Unable to figure out Network\n");
return CMD_WARNING;
}
network = argv[idx]->arg;
else
{
- vty_outln (vty, "Unable to figure out Network");
+ vty_out (vty, "Unable to figure out Network\n");
return CMD_WARNING;
}
return bgp_show_route (vty, NULL, network, AFI_L2VPN, SAFI_EVPN, NULL, 0, BGP_PATH_ALL, use_json(argc, argv));
if (use_json)
{
json_object_string_add(json, "alert", "no BGP");
- vty_outln (vty, "%s", json_object_to_json_string(json));
+ vty_out (vty, "%s\n", json_object_to_json_string(json));
json_object_free(json);
}
else
- vty_outln (vty, "%% No bgp");
+ vty_out (vty, "%% No bgp\n");
return;
}
vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL);
vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL);
- vty_outln (vty, "Originating default network 0.0.0.0%s",
+ vty_out (vty, "Originating default network 0.0.0.0%s\n",
VTYNL);
}
header1 = 0;
}
else
{
- vty_outln (vty, "BGP table version is 0, local router ID is %s",
+ vty_out (vty, "BGP table version is 0, local router ID is %s\n",
inet_ntoa(bgp->router_id));
vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL);
vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL);
if (use_json)
json_object_int_add(json, "totalPrefixCounter", output_count);
else
- vty_outln (vty, "%sTotal number of prefixes %ld",
+ vty_out (vty, "%sTotal number of prefixes %ld\n",
VTYNL, output_count);
}
if (use_json)
{
- vty_outln (vty, "%s", json_object_to_json_string(json));
+ vty_out (vty, "%s\n", json_object_to_json_string(json));
json_object_free(json);
}
if (use_json)
{
json_object_string_add(json, "warning", "No such neighbor or address family");
- vty_outln (vty, "%s", json_object_to_json_string(json));
+ vty_out (vty, "%s\n", json_object_to_json_string(json));
json_object_free(json);
}
else
- vty_outln (vty, "%% No such neighbor or address family");
+ vty_out (vty, "%% No such neighbor or address family\n");
return CMD_WARNING;
}
if (use_json)
{
json_object_string_add(json, "warning", "Inbound soft reconfiguration not enabled");
- vty_outln (vty, "%s", json_object_to_json_string(json));
+ vty_out (vty, "%s\n", json_object_to_json_string(json));
json_object_free(json);
}
else
- vty_outln (vty, "%% Inbound soft reconfiguration not enabled");
+ vty_out (vty, "%% Inbound soft reconfiguration not enabled\n");
return CMD_WARNING;
}
if (! peer)
{
if (uj)
- vty_outln (vty, "{}");
+ vty_out (vty, "{}\n");
else
- vty_outln (vty, "%% Malformed address or name: %s", peerstr);
+ vty_out (vty, "%% Malformed address or name: %s\n", peerstr);
return CMD_WARNING;
}
}
if (! peer)
{
if (uj)
- vty_outln (vty, "{}");
+ vty_out (vty, "{}\n");
else
- vty_outln (vty, "No peer");
+ vty_out (vty, "No peer\n");
return CMD_WARNING;
}
}
if (count)
{
if (!uj)
- vty_outln (vty, "Address Family: %s", afi_safi_print(afi, safi));
+ vty_out (vty, "Address Family: %s\n", afi_safi_print(afi, safi));
prefix_bgp_show_prefix_list (vty, afi, name, uj);
}
else
{
if (uj)
- vty_outln (vty, "{}");
+ vty_out (vty, "{}\n");
else
- vty_outln (vty, "No functional output");
+ vty_out (vty, "No functional output\n");
}
return CMD_SUCCESS;
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning", "No such neighbor or address family");
- vty_outln (vty, "%s", json_object_to_json_string(json_no));
+ vty_out (vty, "%s\n", json_object_to_json_string(json_no));
json_object_free(json_no);
}
else
- vty_outln (vty, "%% No such neighbor or address family");
+ vty_out (vty, "%% No such neighbor or address family\n");
return CMD_WARNING;
}
peer = peer_lookup_in_view (vty, bgp, peerstr, uj);
if (! peer)
{
- vty_outln (vty, "No such neighbor");
+ vty_out (vty, "No such neighbor\n");
return CMD_WARNING;
}
ret = str2prefix_rd (argv[5]->arg, &prd);
if (! ret)
{
- vty_outln (vty, "%% Malformed Route Distinguisher");
+ vty_out (vty, "%% Malformed Route Distinguisher\n");
return CMD_WARNING;
}
return bgp_show_route (vty, NULL, argv[6]->arg, afi, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json (argc, argv));
ret = str2prefix (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
ret = str2prefix (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
rn = bgp_node_lookup (bgp_distance_table[afi][safi], (struct prefix *)&p);
if (! rn)
{
- vty_outln (vty, "Can't find specified prefix");
+ vty_out (vty, "Can't find specified prefix\n");
return CMD_WARNING;
}
if (bdistance->distance != distance)
{
- vty_outln (vty, "Distance does not match configured");
+ vty_out (vty, "Distance does not match configured\n");
return CMD_WARNING;
}
if (suppress < reuse)
{
- vty_outln (vty,"Suppress value cannot be less than reuse value ");
+ vty_out (vty,"Suppress value cannot be less than reuse value \n");
return 0;
}
bgp = bgp_lookup_by_name (view_name);
if (bgp == NULL)
{
- vty_outln (vty, "%% Can't find BGP instance %s", view_name);
+ vty_out (vty, "%% Can't find BGP instance %s\n", view_name);
return CMD_WARNING;
}
}
bgp = bgp_get_default ();
if (bgp == NULL)
{
- vty_outln (vty, "%% No BGP process is configured");
+ vty_out (vty, "%% No BGP process is configured\n");
return CMD_WARNING;
}
}
ret = str2prefix (ip_str, &match);
if (! ret)
{
- vty_outln (vty, "%% address is malformed");
+ vty_out (vty, "%% address is malformed\n");
return CMD_WARNING;
}
ret = netmask_str2prefix_str (argv[idx_ipv4]->arg, argv[idx_ipv4_2]->arg, prefix_str);
if (! ret)
{
- vty_outln (vty, "%% Inconsistent address and mask");
+ vty_out (vty, "%% Inconsistent address and mask\n");
return CMD_WARNING;
}
|| bgp->distance_local[afi][safi] != ZEBRA_IBGP_DISTANCE_DEFAULT))
{
bgp_config_write_family_header (vty, afi, safi, write);
- vty_outln (vty, " distance bgp %d %d %d",
+ vty_out (vty, " distance bgp %d %d %d\n",
bgp->distance_ebgp[afi][safi], bgp->distance_ibgp[afi][safi],
bgp->distance_local[afi][safi]);
}
char buf[PREFIX_STRLEN];
bgp_config_write_family_header (vty, afi, safi, write);
- vty_outln (vty, " distance %d %s %s", bdistance->distance,
+ vty_out (vty, " distance %d %s %s\n", bdistance->distance,
prefix2str (&rn->p, buf, sizeof (buf)),
bdistance->access_list ? bdistance->access_list : "");
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% BGP Can't find rule.");
+ vty_out (vty, "%% BGP Can't find rule.\n");
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% BGP Argument is malformed.");
+ vty_out (vty, "%% BGP Argument is malformed.\n");
return CMD_WARNING;
}
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% BGP Can't find rule.");
+ vty_out (vty, "%% BGP Can't find rule.\n");
break;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% BGP Argument is malformed.");
+ vty_out (vty, "%% BGP Argument is malformed.\n");
break;
}
if (dep_name)
/* Can't compile user input into communities attribute. */
if (! com)
{
- vty_outln (vty, "%% Malformed communities attribute");
+ vty_out (vty, "%% Malformed communities attribute\n");
return CMD_WARNING;
}
ret = inet_aton (argv[idx_ipv4]->arg, &address);
if (ret == 0)
{
- vty_outln (vty, "Aggregator IP address is invalid");
+ vty_out (vty, "Aggregator IP address is invalid\n");
return CMD_WARNING;
}
ret = inet_aton (argv[idx_ip]->arg, &address);
if (ret == 0)
{
- vty_outln (vty, "Aggregator IP address is invalid");
+ vty_out (vty, "Aggregator IP address is invalid\n");
return CMD_WARNING;
}
ret = inet_pton (AF_INET6, argv[idx_ipv6]->arg, &addr);
if (!ret)
{
- vty_outln (vty, "%% Malformed nexthop address");
+ vty_out (vty, "%% Malformed nexthop address\n");
return CMD_WARNING;
}
if (IN6_IS_ADDR_UNSPECIFIED(&addr) ||
IN6_IS_ADDR_MULTICAST(&addr) ||
IN6_IS_ADDR_LINKLOCAL(&addr))
{
- vty_outln (vty, "%% Invalid global nexthop address");
+ vty_out (vty, "%% Invalid global nexthop address\n");
return CMD_WARNING;
}
vty_out (vty, " Created: %s", timestamp_string (updgrp->uptime));
filter = &updgrp->conf->filter[updgrp->afi][updgrp->safi];
if (filter->map[RMAP_OUT].name)
- vty_outln (vty, " Outgoing route map: %s%s",
+ vty_out (vty, " Outgoing route map: %s%s\n",
filter->map[RMAP_OUT].map ? "X" : "",
filter->map[RMAP_OUT].name);
- vty_outln (vty, " MRAI value (seconds): %d",
+ vty_out (vty, " MRAI value (seconds): %d\n",
updgrp->conf->v_routeadv);
if (updgrp->conf->change_local_as)
- vty_outln (vty, " Local AS %u%s%s",
+ vty_out (vty, " Local AS %u%s%s\n",
updgrp->conf->change_local_as,
CHECK_FLAG (updgrp->conf->flags,
PEER_FLAG_LOCAL_AS_NO_PREPEND) ? " no-prepend" : "",
subgrp->split_from.subgroup_id);
}
- vty_outln (vty, " Join events: %u", subgrp->join_events);
- vty_outln (vty, " Prune events: %u",
+ vty_out (vty, " Join events: %u\n", subgrp->join_events);
+ vty_out (vty, " Prune events: %u\n",
subgrp->prune_events);
- vty_outln (vty, " Merge events: %u",
+ vty_out (vty, " Merge events: %u\n",
subgrp->merge_events);
- vty_outln (vty, " Split events: %u",
+ vty_out (vty, " Split events: %u\n",
subgrp->split_events);
- vty_outln (vty, " Update group switch events: %u",
+ vty_out (vty, " Update group switch events: %u\n",
subgrp->updgrp_switch_events);
- vty_outln (vty, " Peer refreshes combined: %u",
+ vty_out (vty, " Peer refreshes combined: %u\n",
subgrp->peer_refreshes_combined);
- vty_outln (vty, " Merge checks triggered: %u",
+ vty_out (vty, " Merge checks triggered: %u\n",
subgrp->merge_checks_triggered);
vty_outln (vty, " Version: %" PRIu64 "", subgrp->version);
- vty_outln (vty, " Packet queue length: %d",
+ vty_out (vty, " Packet queue length: %d\n",
bpacket_queue_length(SUBGRP_PKTQ(subgrp)));
- vty_outln (vty, " Total packets enqueued: %u",
+ vty_out (vty, " Total packets enqueued: %u\n",
subgroup_total_packets_enqueued(subgrp));
- vty_outln (vty, " Packet queue high watermark: %d",
+ vty_out (vty, " Packet queue high watermark: %d\n",
bpacket_queue_hwm_length(SUBGRP_PKTQ(subgrp)));
- vty_outln (vty, " Adj-out list count: %u",
+ vty_out (vty, " Adj-out list count: %u\n",
subgrp->adj_count);
- vty_outln (vty, " Advertise list: %s",
+ vty_out (vty, " Advertise list: %s\n",
advertise_list_is_empty(subgrp) ? "empty" : "not empty");
- vty_outln (vty, " Flags: %s",
+ vty_out (vty, " Flags: %s\n",
CHECK_FLAG(subgrp->flags, SUBGRP_FLAG_NEEDS_REFRESH) ? "R" : "");
if (subgrp->peer_count > 0)
{
- vty_outln (vty, " Peers:");
+ vty_out (vty, " Peers:\n");
SUBGRP_FOREACH_PEER (subgrp, paf)
- vty_outln (vty, " - %s", paf->peer->host);
+ vty_out (vty, " - %s\n", paf->peer->host);
}
}
return UPDWALK_CONTINUE;
void
update_group_show_stats (struct bgp *bgp, struct vty *vty)
{
- vty_outln (vty, "Update groups created: %u",
+ vty_out (vty, "Update groups created: %u\n",
bgp->update_group_stats.updgrps_created);
- vty_outln (vty, "Update groups deleted: %u",
+ vty_out (vty, "Update groups deleted: %u\n",
bgp->update_group_stats.updgrps_deleted);
- vty_outln (vty, "Update subgroups created: %u",
+ vty_out (vty, "Update subgroups created: %u\n",
bgp->update_group_stats.subgrps_created);
- vty_outln (vty, "Update subgroups deleted: %u",
+ vty_out (vty, "Update subgroups deleted: %u\n",
bgp->update_group_stats.subgrps_deleted);
- vty_outln (vty, "Join events: %u",
+ vty_out (vty, "Join events: %u\n",
bgp->update_group_stats.join_events);
- vty_outln (vty, "Prune events: %u",
+ vty_out (vty, "Prune events: %u\n",
bgp->update_group_stats.prune_events);
- vty_outln (vty, "Merge events: %u",
+ vty_out (vty, "Merge events: %u\n",
bgp->update_group_stats.merge_events);
- vty_outln (vty, "Split events: %u",
+ vty_out (vty, "Split events: %u\n",
bgp->update_group_stats.split_events);
- vty_outln (vty, "Update group switch events: %u",
+ vty_out (vty, "Update group switch events: %u\n",
bgp->update_group_stats.updgrp_switch_events);
- vty_outln (vty, "Peer route refreshes combined: %u",
+ vty_out (vty, "Peer route refreshes combined: %u\n",
bgp->update_group_stats.peer_refreshes_combined);
- vty_outln (vty, "Merge checks triggered: %u",
+ vty_out (vty, "Merge checks triggered: %u\n",
bgp->update_group_stats.merge_checks_triggered);
}
}
}
if (output_count != 0)
- vty_outln (vty, "%sTotal number of prefixes %ld",
+ vty_out (vty, "%sTotal number of prefixes %ld\n",
VTYNL, output_count);
}
pkt = bpacket_queue_first (q);
while (pkt)
{
- vty_outln (vty, " Packet %p ver %u buffer %p", pkt, pkt->ver,
+ vty_out (vty, " Packet %p ver %u buffer %p\n", pkt, pkt->ver,
pkt->buffer);
LIST_FOREACH (paf, &(pkt->peers), pkt_train)
{
- vty_outln (vty, " - %s", paf->peer->host);
+ vty_out (vty, " - %s\n", paf->peer->host);
}
pkt = bpacket_next (pkt);
}
if (bgp == NULL)
{
if (!use_json)
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
}
else
{
- vty_outln (vty, "BGP table version is 0, local router ID is %s",
+ vty_out (vty, "BGP table version is 0, local router ID is %s\n",
inet_ntoa(bgp->router_id));
- vty_outln (vty,
- "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal");
- vty_outln (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s",
+ vty_out (vty,
+ "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
+ vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
VTYNL);
vty_outln (vty, V4_HEADER);
}
if (use_json)
{
json_object_object_add(json, "routes", json_routes);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
{
if (! IPV4_ADDR_SAME (&bgp->router_id_static, &router_id))
{
- vty_outln (vty, "%% BGP router-id doesn't match");
+ vty_out (vty, "%% BGP router-id doesn't match\n");
return CMD_WARNING;
}
}
{
if (peer->as_type == AS_SPECIFIED)
{
- vty_outln (vty, " neighbor %s remote-as %u", addr,peer->as);
+ vty_out (vty, " neighbor %s remote-as %u\n", addr,peer->as);
}
else if (peer->as_type == AS_INTERNAL)
{
- vty_outln (vty, " neighbor %s remote-as internal", addr);
+ vty_out (vty, " neighbor %s remote-as internal\n", addr);
}
else if (peer->as_type == AS_EXTERNAL)
{
- vty_outln (vty, " neighbor %s remote-as external", addr);
+ vty_out (vty, " neighbor %s remote-as external\n", addr);
}
}
/* For swpX peers we displayed the peer-group
* via 'neighbor swpX interface peer-group WORD' */
if (!if_pg_printed)
- vty_outln (vty, " neighbor %s peer-group %s", addr,
+ vty_out (vty, " neighbor %s peer-group %s\n", addr,
peer->group->name);
}
/* peer is a peer-group, declare the peer-group */
if (CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP))
{
- vty_outln (vty, " neighbor %s peer-group",addr);
+ vty_out (vty, " neighbor %s peer-group\n",addr);
}
if (!if_ras_printed)
{
if (peer->as_type == AS_SPECIFIED)
{
- vty_outln (vty, " neighbor %s remote-as %u", addr,peer->as);
+ vty_out (vty, " neighbor %s remote-as %u\n", addr,peer->as);
}
else if (peer->as_type == AS_INTERNAL)
{
- vty_outln (vty, " neighbor %s remote-as internal", addr);
+ vty_out (vty, " neighbor %s remote-as internal\n", addr);
}
else if (peer->as_type == AS_EXTERNAL)
{
- vty_outln (vty, " neighbor %s remote-as external", addr);
+ vty_out (vty, " neighbor %s remote-as external\n", addr);
}
}
}
|| (CHECK_FLAG (peer->flags, PEER_FLAG_LOCAL_AS_REPLACE_AS) !=
CHECK_FLAG (g_peer->flags, PEER_FLAG_LOCAL_AS_REPLACE_AS)))
{
- vty_outln (vty, " neighbor %s local-as %u%s%s", addr,
+ vty_out (vty, " neighbor %s local-as %u%s%s\n", addr,
peer->change_local_as,
CHECK_FLAG (peer->flags, PEER_FLAG_LOCAL_AS_NO_PREPEND) ?
" no-prepend" : "",
/* description */
if (peer->desc)
{
- vty_outln (vty, " neighbor %s description %s", addr,peer->desc);
+ vty_out (vty, " neighbor %s description %s\n", addr,peer->desc);
}
/* shutdown */
peer->tx_shutdown_message)
{
if (peer->tx_shutdown_message)
- vty_outln (vty, " neighbor %s shutdown message %s", addr,
+ vty_out (vty, " neighbor %s shutdown message %s\n", addr,
peer->tx_shutdown_message);
else
- vty_outln (vty, " neighbor %s shutdown", addr);
+ vty_out (vty, " neighbor %s shutdown\n", addr);
}
}
|| ! g_peer->password
|| strcmp (peer->password, g_peer->password) != 0)
{
- vty_outln (vty, " neighbor %s password %s", addr,peer->password);
+ vty_out (vty, " neighbor %s password %s\n", addr,peer->password);
}
}
{
if (!peer_group_active (peer))
{
- vty_outln (vty, " neighbor %s solo", addr);
+ vty_out (vty, " neighbor %s solo\n", addr);
}
}
/* BGP port */
if (peer->port != BGP_PORT_DEFAULT)
{
- vty_outln (vty, " neighbor %s port %d", addr,peer->port);
+ vty_out (vty, " neighbor %s port %d\n", addr,peer->port);
}
/* Local interface name */
if (peer->ifname)
{
- vty_outln (vty, " neighbor %s interface %s", addr,peer->ifname);
+ vty_out (vty, " neighbor %s interface %s\n", addr,peer->ifname);
}
/* passive */
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_PASSIVE))
{
- vty_outln (vty, " neighbor %s passive", addr);
+ vty_out (vty, " neighbor %s passive\n", addr);
}
}
{
if (! peer_group_active (peer) || g_peer->ttl != peer->ttl)
{
- vty_outln (vty, " neighbor %s ebgp-multihop %d", addr,peer->ttl);
+ vty_out (vty, " neighbor %s ebgp-multihop %d\n", addr,peer->ttl);
}
}
{
if (! peer_group_active (peer) || g_peer->gtsm_hops != peer->gtsm_hops)
{
- vty_outln (vty, " neighbor %s ttl-security hops %d", addr,
+ vty_out (vty, " neighbor %s ttl-security hops %d\n", addr,
peer->gtsm_hops);
}
}
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK))
{
- vty_outln (vty, " neighbor %s disable-connected-check", addr);
+ vty_out (vty, " neighbor %s disable-connected-check\n", addr);
}
}
if (! peer_group_active (peer) || ! g_peer->update_if
|| strcmp (g_peer->update_if, peer->update_if) != 0)
{
- vty_outln (vty, " neighbor %s update-source %s", addr,
+ vty_out (vty, " neighbor %s update-source %s\n", addr,
peer->update_if);
}
}
|| sockunion_cmp (g_peer->update_source,
peer->update_source) != 0)
{
- vty_outln (vty, " neighbor %s update-source %s", addr,
+ vty_out (vty, " neighbor %s update-source %s\n", addr,
sockunion2str(peer->update_source, buf, SU_ADDRSTRLEN));
}
}
((! peer_group_active (peer) && peer->v_routeadv != BGP_DEFAULT_EBGP_ROUTEADV) ||
(peer_group_active (peer) && peer->v_routeadv != g_peer->v_routeadv)))
{
- vty_outln (vty, " neighbor %s advertisement-interval %u",
+ vty_out (vty, " neighbor %s advertisement-interval %u\n",
addr, peer->v_routeadv);
}
((! peer_group_active (peer) && (peer->keepalive != BGP_DEFAULT_KEEPALIVE || peer->holdtime != BGP_DEFAULT_HOLDTIME)) ||
(peer_group_active (peer) && (peer->keepalive != g_peer->keepalive || peer->holdtime != g_peer->holdtime))))
{
- vty_outln (vty, " neighbor %s timers %u %u", addr,
+ vty_out (vty, " neighbor %s timers %u %u\n", addr,
peer->keepalive, peer->holdtime);
}
(peer_group_active (peer) && peer->connect != g_peer->connect)))
{
- vty_outln (vty, " neighbor %s timers connect %u", addr,
+ vty_out (vty, " neighbor %s timers connect %u\n", addr,
peer->connect);
}
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_DYNAMIC_CAPABILITY))
{
- vty_outln (vty, " neighbor %s capability dynamic",addr);
+ vty_out (vty, " neighbor %s capability dynamic\n",addr);
}
}
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_CAPABILITY_ENHE))
{
- vty_outln (vty, " no neighbor %s capability extended-nexthop",
+ vty_out (vty, " no neighbor %s capability extended-nexthop\n",
addr);
}
}
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_CAPABILITY_ENHE))
{
- vty_outln (vty, " neighbor %s capability extended-nexthop",addr);
+ vty_out (vty, " neighbor %s capability extended-nexthop\n",addr);
}
}
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_DONT_CAPABILITY))
{
- vty_outln (vty, " neighbor %s dont-capability-negotiate",addr);
+ vty_out (vty, " neighbor %s dont-capability-negotiate\n",addr);
}
}
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_OVERRIDE_CAPABILITY))
{
- vty_outln (vty, " neighbor %s override-capability",addr);
+ vty_out (vty, " neighbor %s override-capability\n",addr);
}
}
if (! peer_group_active (peer) ||
! CHECK_FLAG (g_peer->flags, PEER_FLAG_STRICT_CAP_MATCH))
{
- vty_outln (vty, " neighbor %s strict-capability-match",addr);
+ vty_out (vty, " neighbor %s strict-capability-match\n",addr);
}
}
}
bgp_config_write_table_map (vty, bgp, afi, safi, &write);
if (write)
- vty_outln (vty, " exit-address-family");
+ vty_out (vty, " exit-address-family\n");
return write;
}
/* BGP Multiple instance. */
if (!bgp_option_check (BGP_OPT_MULTIPLE_INSTANCE))
{
- vty_outln (vty, "no bgp multiple-instance");
+ vty_out (vty, "no bgp multiple-instance\n");
write++;
}
/* BGP Config type. */
if (bgp_option_check (BGP_OPT_CONFIG_CISCO))
{
- vty_outln (vty, "bgp config-type cisco");
+ vty_out (vty, "bgp config-type cisco\n");
write++;
}
if (bm->rmap_update_timer != RMAP_DEFAULT_UPDATE_TIMER)
- vty_outln (vty, "bgp route-map delay-timer %u",bm->rmap_update_timer);
+ vty_out (vty, "bgp route-map delay-timer %u\n",bm->rmap_update_timer);
/* BGP configuration. */
for (ALL_LIST_ELEMENTS (bm->bgp, mnode, mnnode, bgp))
{
if (write)
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
/* Router bgp ASN */
vty_out (vty, "router bgp %u", bgp->as);
/* No Synchronization */
if (bgp_option_check (BGP_OPT_CONFIG_CISCO))
- vty_outln (vty, " no synchronization");
+ vty_out (vty, " no synchronization\n");
/* BGP fast-external-failover. */
if (CHECK_FLAG (bgp->flags, BGP_FLAG_NO_FAST_EXT_FAILOVER))
- vty_outln (vty, " no bgp fast-external-failover");
+ vty_out (vty, " no bgp fast-external-failover\n");
/* BGP router ID. */
if (bgp->router_id_static.s_addr != 0)
- vty_outln (vty, " bgp router-id %s",
+ vty_out (vty, " bgp router-id %s\n",
inet_ntoa(bgp->router_id_static));
/* BGP log-neighbor-changes. */
if (!!bgp_flag_check (bgp, BGP_FLAG_LOG_NEIGHBOR_CHANGES)
!= DFLT_BGP_LOG_NEIGHBOR_CHANGES)
- vty_outln (vty, " %sbgp log-neighbor-changes",
+ vty_out (vty, " %sbgp log-neighbor-changes\n",
bgp_flag_check(bgp, BGP_FLAG_LOG_NEIGHBOR_CHANGES) ? "" : "no ");
/* BGP configuration. */
if (bgp_flag_check (bgp, BGP_FLAG_ALWAYS_COMPARE_MED))
- vty_outln (vty, " bgp always-compare-med");
+ vty_out (vty, " bgp always-compare-med\n");
/* BGP default ipv4-unicast. */
if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4))
- vty_outln (vty, " no bgp default ipv4-unicast");
+ vty_out (vty, " no bgp default ipv4-unicast\n");
/* BGP default local-preference. */
if (bgp->default_local_pref != BGP_DEFAULT_LOCAL_PREF)
- vty_outln (vty, " bgp default local-preference %u",
+ vty_out (vty, " bgp default local-preference %u\n",
bgp->default_local_pref);
/* BGP default show-hostname */
if (!!bgp_flag_check(bgp, BGP_FLAG_SHOW_HOSTNAME)
!= DFLT_BGP_SHOW_HOSTNAME)
- vty_outln (vty, " %sbgp default show-hostname",
+ vty_out (vty, " %sbgp default show-hostname\n",
bgp_flag_check(bgp, BGP_FLAG_SHOW_HOSTNAME) ? "" : "no ");
/* BGP default subgroup-pkt-queue-max. */
if (bgp->default_subgroup_pkt_queue_max != BGP_DEFAULT_SUBGROUP_PKT_QUEUE_MAX)
- vty_outln (vty, " bgp default subgroup-pkt-queue-max %u",
+ vty_out (vty, " bgp default subgroup-pkt-queue-max %u\n",
bgp->default_subgroup_pkt_queue_max);
/* BGP client-to-client reflection. */
if (bgp_flag_check (bgp, BGP_FLAG_NO_CLIENT_TO_CLIENT))
- vty_outln (vty, " no bgp client-to-client reflection");
+ vty_out (vty, " no bgp client-to-client reflection\n");
/* BGP cluster ID. */
if (CHECK_FLAG (bgp->config, BGP_CONFIG_CLUSTER_ID))
- vty_outln (vty, " bgp cluster-id %s",inet_ntoa(bgp->cluster_id));
+ vty_out (vty, " bgp cluster-id %s\n",inet_ntoa(bgp->cluster_id));
/* Disable ebgp connected nexthop check */
if (bgp_flag_check (bgp, BGP_FLAG_DISABLE_NH_CONNECTED_CHK))
- vty_outln (vty, " bgp disable-ebgp-connected-route-check");
+ vty_out (vty, " bgp disable-ebgp-connected-route-check\n");
/* Confederation identifier*/
if (CHECK_FLAG (bgp->config, BGP_CONFIG_CONFEDERATION))
- vty_outln (vty, " bgp confederation identifier %i",bgp->confed_id);
+ vty_out (vty, " bgp confederation identifier %i\n",bgp->confed_id);
/* Confederation peer */
if (bgp->confed_peers_cnt > 0)
/* BGP enforce-first-as. */
if (bgp_flag_check (bgp, BGP_FLAG_ENFORCE_FIRST_AS))
- vty_outln (vty, " bgp enforce-first-as");
+ vty_out (vty, " bgp enforce-first-as\n");
/* BGP deterministic-med. */
if (!!bgp_flag_check (bgp, BGP_FLAG_DETERMINISTIC_MED)
!= DFLT_BGP_DETERMINISTIC_MED)
- vty_outln (vty, " %sbgp deterministic-med",
+ vty_out (vty, " %sbgp deterministic-med\n",
bgp_flag_check(bgp, BGP_FLAG_DETERMINISTIC_MED) ? "" : "no ");
/* BGP update-delay. */
/* BGP graceful-restart. */
if (bgp->stalepath_time != BGP_DEFAULT_STALEPATH_TIME)
- vty_outln (vty, " bgp graceful-restart stalepath-time %u",
+ vty_out (vty, " bgp graceful-restart stalepath-time %u\n",
bgp->stalepath_time);
if (bgp->restart_time != BGP_DEFAULT_RESTART_TIME)
- vty_outln (vty, " bgp graceful-restart restart-time %u",
+ vty_out (vty, " bgp graceful-restart restart-time %u\n",
bgp->restart_time);
if (bgp_flag_check (bgp, BGP_FLAG_GRACEFUL_RESTART))
- vty_outln (vty, " bgp graceful-restart");
+ vty_out (vty, " bgp graceful-restart\n");
/* BGP graceful-restart Preserve State F bit. */
if (bgp_flag_check (bgp, BGP_FLAG_GR_PRESERVE_FWD))
- vty_outln (vty, " bgp graceful-restart preserve-fw-state");
+ vty_out (vty, " bgp graceful-restart preserve-fw-state\n");
/* BGP bestpath method. */
if (bgp_flag_check (bgp, BGP_FLAG_ASPATH_IGNORE))
- vty_outln (vty, " bgp bestpath as-path ignore");
+ vty_out (vty, " bgp bestpath as-path ignore\n");
if (bgp_flag_check (bgp, BGP_FLAG_ASPATH_CONFED))
- vty_outln (vty, " bgp bestpath as-path confed");
+ vty_out (vty, " bgp bestpath as-path confed\n");
if (bgp_flag_check (bgp, BGP_FLAG_ASPATH_MULTIPATH_RELAX))
{
if (bgp_flag_check (bgp, BGP_FLAG_MULTIPATH_RELAX_AS_SET))
{
- vty_outln (vty,
- " bgp bestpath as-path multipath-relax as-set");
+ vty_out (vty,
+ " bgp bestpath as-path multipath-relax as-set\n");
}
else
{
- vty_outln (vty, " bgp bestpath as-path multipath-relax");
+ vty_out (vty, " bgp bestpath as-path multipath-relax\n");
}
}
if (bgp_flag_check (bgp, BGP_FLAG_RR_ALLOW_OUTBOUND_POLICY)) {
- vty_outln (vty," bgp route-reflector allow-outbound-policy");
+ vty_out (vty," bgp route-reflector allow-outbound-policy\n");
}
if (bgp_flag_check (bgp, BGP_FLAG_COMPARE_ROUTER_ID))
- vty_outln (vty, " bgp bestpath compare-routerid");
+ vty_out (vty, " bgp bestpath compare-routerid\n");
if (bgp_flag_check (bgp, BGP_FLAG_MED_CONFED)
|| bgp_flag_check (bgp, BGP_FLAG_MED_MISSING_AS_WORST))
{
/* BGP network import check. */
if (!!bgp_flag_check (bgp, BGP_FLAG_IMPORT_CHECK)
!= DFLT_BGP_IMPORT_CHECK)
- vty_outln (vty, " %sbgp network import-check",
+ vty_out (vty, " %sbgp network import-check\n",
bgp_flag_check(bgp, BGP_FLAG_IMPORT_CHECK) ? "" : "no ");
/* BGP flag dampening. */
/* BGP timers configuration. */
if (bgp->default_keepalive != BGP_DEFAULT_KEEPALIVE
&& bgp->default_holdtime != BGP_DEFAULT_HOLDTIME)
- vty_outln (vty, " timers bgp %u %u", bgp->default_keepalive,
+ vty_out (vty, " timers bgp %u %u\n", bgp->default_keepalive,
bgp->default_holdtime);
/* peer-group */
/* No auto-summary */
if (bgp_option_check (BGP_OPT_CONFIG_CISCO))
- vty_outln (vty, " no auto-summary");
+ vty_out (vty, " no auto-summary\n");
/* IPv4 unicast configuration. */
write += bgp_config_write_family (vty, bgp, AFI_IP, SAFI_UNICAST);
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "VNC not configured");
+ vty_out (vty, "VNC not configured\n");
return CMD_WARNING;
}
ecomadd = ecommunity_str2com (argv[0]->arg, ECOMMUNITY_ROUTE_TARGET, 0);
if (!ecomadd)
{
- vty_outln (vty, "Malformed community-list value");
+ vty_out (vty, "Malformed community-list value\n");
if (ecom)
ecommunity_free (&ecom);
return CMD_WARNING;
if (!argv[1]->arg[8] || *end)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
if (value32 > 0xffff)
{
- vty_outln (vty, "%% Malformed rd (must be less than %u",
+ vty_out (vty, "%% Malformed rd (must be less than %u\n",
0x0ffff);
return CMD_WARNING;
}
ret = str2prefix_rd (argv[1]->arg, &prd);
if (!ret)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
}
}
if ((value_l < 1) || (value_l > 0xff))
{
- vty_outln (vty,
- "%% Malformed l2 nve id (must be greater than 0 and less than %u",
+ vty_out (vty,
+ "%% Malformed l2 nve id (must be greater than 0 and less than %u\n",
0x100);
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "RFAPI not configured");
+ vty_out (vty, "RFAPI not configured\n");
return CMD_WARNING;
}
localadmin = strtoul (argv[4]->arg, &endptr, 0);
if (!argv[4]->arg[0] || *endptr)
{
- vty_outln (vty, "%% Malformed value");
+ vty_out (vty, "%% Malformed value\n");
return CMD_WARNING;
}
if (localadmin > 0xffff)
{
- vty_outln (vty, "%% Value out of range (0-%d)", 0xffff);
+ vty_out (vty, "%% Value out of range (0-%d)\n", 0xffff);
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "RFAPI not configured");
+ vty_out (vty, "RFAPI not configured\n");
return CMD_WARNING;
}
break;
default:
- vty_outln (vty, "unknown redistribute mode");
+ vty_out (vty, "unknown redistribute mode\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "RFAPI not configured");
+ vty_out (vty, "RFAPI not configured\n");
return CMD_WARNING;
}
if (rfapi_str2route_type (argv[2]->arg, argv[3]->arg, &afi, &type))
{
- vty_outln (vty, "%% Invalid route type");
+ vty_out (vty, "%% Invalid route type\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "RFAPI not configured");
+ vty_out (vty, "RFAPI not configured\n");
return CMD_WARNING;
}
if (rfapi_str2route_type (argv[3]->arg, argv[4]->arg, &afi, &type))
{
- vty_outln (vty, "%% Invalid route type");
+ vty_out (vty, "%% Invalid route type\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "RFAPI not configured");
+ vty_out (vty, "RFAPI not configured\n");
return CMD_WARNING;
}
if (rfapi_str2route_type (argv[2]->arg, "bgp-direct-to-nve-groups", &afi, &type))
{
- vty_outln (vty, "%% Invalid route type");
+ vty_out (vty, "%% Invalid route type\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "VNC not configured");
+ vty_out (vty, "VNC not configured\n");
return CMD_WARNING;
}
newmode = BGP_VNC_CONFIG_EXPORT_BGP_MODE_RH;
break;
default:
- vty_outln (vty, "Invalid mode specified");
+ vty_out (vty, "Invalid mode specified\n");
return CMD_WARNING;
}
if (newmode == oldmode)
{
- vty_outln (vty, "Mode unchanged");
+ vty_out (vty, "Mode unchanged\n");
return CMD_SUCCESS;
}
/*
* export to zebra with RH mode is not yet implemented
*/
- vty_outln (vty,"Changing modes for zebra export not implemented yet");
+ vty_out (vty,"Changing modes for zebra export not implemented yet\n");
return CMD_WARNING;
oldmode = bgp->rfapi_cfg->flags & BGP_VNC_CONFIG_EXPORT_ZEBRA_MODE_BITS;
}
break;
default:
- vty_outln (vty, "Invalid mode");
+ vty_out (vty, "Invalid mode\n");
return CMD_WARNING;
}
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!(hc = bgp->rfapi_cfg))
{
- vty_outln (vty, "rfapi not configured");
+ vty_out (vty, "rfapi not configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
afi = family2afi (p.family);
if (!afi)
{
- vty_outln (vty, "Unsupported address family");
+ vty_out (vty, "Unsupported address family\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
}
if ((value_l < 1) || (value_l > 0xff))
{
- vty_outln (vty,
- "%% Malformed l2 nve id (must be greater than 0 and less than %u",
+ vty_out (vty,
+ "%% Malformed l2 nve id (must be greater than 0 and less than %u\n",
0x100);
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!argv[1]->arg[8] || *end)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
if (value32 > 0xffff)
{
- vty_outln (vty, "%% Malformed rd (must be less than %u",
+ vty_out (vty, "%% Malformed rd (must be less than %u\n",
0x0ffff);
return CMD_WARNING;
}
ret = str2prefix_rd (argv[1]->arg, &prd);
if (!ret)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
return bgp_rfapi_delete_named_nve_group (vty, bgp, argv[2]->arg, RFAPI_GROUP_CFG_VRF);
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current VRF group no longer exists");
+ vty_out (vty, "Current VRF group no longer exists\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current VRF no longer exists");
+ vty_out (vty, "Current VRF no longer exists\n");
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return CMD_WARNING;
}
if (!*(argv[1]->arg + 5) || *end)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
if (value32 > 0xffff)
{
- vty_outln (vty, "%% Malformed rd (must be less than %u",
+ vty_out (vty, "%% Malformed rd (must be less than %u\n",
0x0ffff);
return CMD_WARNING;
}
ret = str2prefix_rd (argv[1]->arg, &prd);
if (!ret)
{
- vty_outln (vty, "%% Malformed rd");
+ vty_out (vty, "%% Malformed rd\n");
return CMD_WARNING;
}
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
return bgp_rfapi_delete_named_l2_group (vty, bgp, argv[3]->arg);
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->l2_groups, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current L2 group no longer exists");
+ vty_out (vty, "Current L2 group no longer exists\n");
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->l2_groups, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current L2 group no longer exists");
+ vty_out (vty, "Current L2 group no longer exists\n");
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->l2_groups, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current L2 group no longer exists");
+ vty_out (vty, "Current L2 group no longer exists\n");
return CMD_WARNING;
}
ll = rfg->labels;
if (ll == NULL)
{
- vty_outln (vty, "Label no longer associated with group");
+ vty_out (vty, "Label no longer associated with group\n");
return CMD_WARNING;
}
do_export = 1;
break;
default:
- vty_outln (vty, "Unknown option, %s", argv[1]->arg);
+ vty_out (vty, "Unknown option, %s\n", argv[1]->arg);
return CMD_ERR_NO_MATCH;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!listnode_lookup (bgp->rfapi_cfg->l2_groups, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current L2 group no longer exists");
+ vty_out (vty, "Current L2 group no longer exists\n");
return CMD_WARNING;
}
if (bgp->rfapi == NULL || hc == NULL)
return write;
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
for (ALL_LIST_ELEMENTS (hc->nve_groups_sequential, node, nnode, rfg))
if (rfg->type == RFAPI_GROUP_CFG_VRF)
{
++write;
- vty_outln (vty, " vrf-policy %s", rfg->name);
+ vty_out (vty, " vrf-policy %s\n", rfg->name);
if (rfg->label <= MPLS_LABEL_MAX)
{
- vty_outln (vty, " label %u", rfg->label);
+ vty_out (vty, " label %u\n", rfg->label);
}
if (CHECK_FLAG (rfg->flags, RFAPI_RFG_VPN_NH_SELF))
{
- vty_outln (vty, " nexthop self");
+ vty_out (vty, " nexthop self\n");
}
else
}
else
{
- vty_outln (vty, " nexthop %s", buf);
+ vty_out (vty, " nexthop %s\n", buf);
}
}
}
value = ((rfg->rd.val[6] << 8) & 0x0ff00) |
(rfg->rd.val[7] & 0x0ff);
- vty_outln (vty, " rd auto:nh:%d", value);
+ vty_out (vty, " rd auto:nh:%d\n", value);
}
else
!buf[0] || buf[BUFSIZ - 1])
{
- vty_outln (vty, "!Error: Can't convert rd");
+ vty_out (vty, "!Error: Can't convert rd\n");
}
else
{
- vty_outln (vty, " rd %s", buf);
+ vty_out (vty, " rd %s\n", buf);
}
}
}
{
char *b = ecommunity_ecom2str (rfg->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt both %s", b);
+ vty_out (vty, " rt both %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
else
{
char *b = ecommunity_ecom2str (rfg->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt import %s", b);
+ vty_out (vty, " rt import %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
if (rfg->rt_export_list)
{
char *b = ecommunity_ecom2str (rfg->rt_export_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt export %s", b);
+ vty_out (vty, " rt export %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
}
if (rfg->plist_export_bgp_name[afi])
{
- vty_outln (vty, " export bgp %s prefix-list %s",
+ vty_out (vty, " export bgp %s prefix-list %s\n",
afistr,rfg->plist_export_bgp_name[afi]);
}
if (rfg->plist_export_zebra_name[afi])
{
- vty_outln (vty, " export zebra %s prefix-list %s",
+ vty_out (vty, " export zebra %s prefix-list %s\n",
afistr,rfg->plist_export_zebra_name[afi]);
}
/*
*/
if (rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT][afi])
{
- vty_outln (vty, " redistribute bgp-direct %s prefix-list %s",
+ vty_out (vty, " redistribute bgp-direct %s prefix-list %s\n",
afistr,
rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT][afi]);
}
if (rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT][afi])
{
- vty_outln (vty,
- " redistribute bgp-direct-to-nve-groups %s prefix-list %s",
+ vty_out (vty,
+ " redistribute bgp-direct-to-nve-groups %s prefix-list %s\n",
afistr,
rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT][afi]);
}
if (rfg->routemap_export_bgp_name)
{
- vty_outln (vty, " export bgp route-map %s",
+ vty_out (vty, " export bgp route-map %s\n",
rfg->routemap_export_bgp_name);
}
if (rfg->routemap_export_zebra_name)
{
- vty_outln (vty, " export zebra route-map %s",
+ vty_out (vty, " export zebra route-map %s\n",
rfg->routemap_export_zebra_name);
}
if (rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT])
{
- vty_outln (vty, " redistribute bgp-direct route-map %s",
+ vty_out (vty, " redistribute bgp-direct route-map %s\n",
rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT]);
}
if (rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT])
{
- vty_outln (vty,
- " redistribute bgp-direct-to-nve-groups route-map %s",
+ vty_out (vty,
+ " redistribute bgp-direct-to-nve-groups route-map %s\n",
rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT]);
}
- vty_outln (vty, " exit-vrf-policy");
- vty_outln (vty, "!");
+ vty_out (vty, " exit-vrf-policy\n");
+ vty_out (vty, "!\n");
}
if (hc->flags & BGP_VNC_CONFIG_ADV_UN_METHOD_ENCAP)
{
- vty_outln (vty, " vnc advertise-un-method encap-safi");
+ vty_out (vty, " vnc advertise-un-method encap-safi\n");
write++;
}
write += (bgp->rfapi->rfp_methods.cfg_cb) (vty, bgp->rfapi->rfp);
if (write)
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
if (hc->l2_groups)
{
struct listnode *lnode;
void *data;
++write;
- vty_outln (vty, " vnc l2-group %s", rfg->name);
+ vty_out (vty, " vnc l2-group %s\n", rfg->name);
if (rfg->logical_net_id != 0)
- vty_outln (vty, " logical-network-id %u",
+ vty_out (vty, " logical-network-id %u\n",
rfg->logical_net_id);
if (rfg->labels != NULL && listhead (rfg->labels) != NULL)
{
{
char *b = ecommunity_ecom2str (rfg->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt both %s", b);
+ vty_out (vty, " rt both %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
else
{
char *b = ecommunity_ecom2str (rfg->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt import %s", b);
+ vty_out (vty, " rt import %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
if (rfg->rt_export_list)
{
char *b = ecommunity_ecom2str (rfg->rt_export_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt export %s", b);
+ vty_out (vty, " rt export %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
}
RFAPI_RFP_CFG_GROUP_L2,
rfg->name,
rfg->rfp_cfg);
- vty_outln (vty, " exit-vnc");
- vty_outln (vty, "!");
+ vty_out (vty, " exit-vnc\n");
+ vty_out (vty, "!\n");
}
}
++write;
- vty_outln (vty, " vnc defaults");
+ vty_out (vty, " vnc defaults\n");
if (hc->default_rd.prefixlen)
{
value = ((hc->default_rd.val[6] << 8) & 0x0ff00) |
(hc->default_rd.val[7] & 0x0ff);
- vty_outln (vty, " rd auto:vn:%d", value);
+ vty_out (vty, " rd auto:vn:%d\n", value);
}
else
!buf[0] || buf[BUFSIZ - 1])
{
- vty_outln (vty, "!Error: Can't convert rd");
+ vty_out (vty, "!Error: Can't convert rd\n");
}
else
{
- vty_outln (vty, " rd %s", buf);
+ vty_out (vty, " rd %s\n", buf);
}
}
}
{
char *b = ecommunity_ecom2str (hc->default_rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt both %s", b);
+ vty_out (vty, " rt both %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
else
{
char *b = ecommunity_ecom2str (hc->default_rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt import %s", b);
+ vty_out (vty, " rt import %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
if (hc->default_rt_export_list)
{
char *b = ecommunity_ecom2str (hc->default_rt_export_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt export %s", b);
+ vty_out (vty, " rt export %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
}
RFAPI_RFP_CFG_GROUP_DEFAULT,
NULL,
bgp->rfapi_cfg->default_rfp_cfg);
- vty_outln (vty, " exit-vnc");
- vty_outln (vty, "!");
+ vty_out (vty, " exit-vnc\n");
+ vty_out (vty, "!\n");
}
for (ALL_LIST_ELEMENTS (hc->nve_groups_sequential, node, nnode, rfg))
if (rfg->type == RFAPI_GROUP_CFG_NVE)
{
++write;
- vty_outln (vty, " vnc nve-group %s", rfg->name);
+ vty_out (vty, " vnc nve-group %s\n", rfg->name);
if (rfg->vn_prefix.family && rfg->vn_node)
{
prefix2str (&rfg->vn_prefix, buf, BUFSIZ);
if (!buf[0] || buf[BUFSIZ - 1])
{
- vty_outln (vty, "!Error: Can't convert prefix");
+ vty_out (vty, "!Error: Can't convert prefix\n");
}
else
{
- vty_outln (vty, " prefix %s %s", "vn", buf);
+ vty_out (vty, " prefix %s %s\n", "vn", buf);
}
}
prefix2str (&rfg->un_prefix, buf, BUFSIZ);
if (!buf[0] || buf[BUFSIZ - 1])
{
- vty_outln (vty, "!Error: Can't convert prefix");
+ vty_out (vty, "!Error: Can't convert prefix\n");
}
else
{
- vty_outln (vty, " prefix %s %s", "un", buf);
+ vty_out (vty, " prefix %s %s\n", "un", buf);
}
}
value = ((rfg->rd.val[6] << 8) & 0x0ff00) |
(rfg->rd.val[7] & 0x0ff);
- vty_outln (vty, " rd auto:vn:%d", value);
+ vty_out (vty, " rd auto:vn:%d\n", value);
}
else
!buf[0] || buf[BUFSIZ - 1])
{
- vty_outln (vty, "!Error: Can't convert rd");
+ vty_out (vty, "!Error: Can't convert rd\n");
}
else
{
- vty_outln (vty, " rd %s", buf);
+ vty_out (vty, " rd %s\n", buf);
}
}
}
char *b = ecommunity_ecom2str (rfg->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP,
ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt both %s", b);
+ vty_out (vty, " rt both %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
else
char *b = ecommunity_ecom2str (rfg->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP,
ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt import %s", b);
+ vty_out (vty, " rt import %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
if (rfg->rt_export_list)
{
char *b = ecommunity_ecom2str (rfg->rt_export_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET);
- vty_outln (vty, " rt export %s", b);
+ vty_out (vty, " rt export %s\n", b);
XFREE (MTYPE_ECOMMUNITY_STR, b);
}
}
if (rfg->plist_export_bgp_name[afi])
{
- vty_outln (vty, " export bgp %s prefix-list %s",
+ vty_out (vty, " export bgp %s prefix-list %s\n",
afistr,rfg->plist_export_bgp_name[afi]);
}
if (rfg->plist_export_zebra_name[afi])
{
- vty_outln (vty, " export zebra %s prefix-list %s",
+ vty_out (vty, " export zebra %s prefix-list %s\n",
afistr,rfg->plist_export_zebra_name[afi]);
}
/*
*/
if (rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT][afi])
{
- vty_outln (vty, " redistribute bgp-direct %s prefix-list %s",
+ vty_out (vty, " redistribute bgp-direct %s prefix-list %s\n",
afistr,
rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT][afi]);
}
if (rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT][afi])
{
- vty_outln (vty,
- " redistribute bgp-direct-to-nve-groups %s prefix-list %s",
+ vty_out (vty,
+ " redistribute bgp-direct-to-nve-groups %s prefix-list %s\n",
afistr,
rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT][afi]);
}
if (rfg->routemap_export_bgp_name)
{
- vty_outln (vty, " export bgp route-map %s",
+ vty_out (vty, " export bgp route-map %s\n",
rfg->routemap_export_bgp_name);
}
if (rfg->routemap_export_zebra_name)
{
- vty_outln (vty, " export zebra route-map %s",
+ vty_out (vty, " export zebra route-map %s\n",
rfg->routemap_export_zebra_name);
}
if (rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT])
{
- vty_outln (vty, " redistribute bgp-direct route-map %s",
+ vty_out (vty, " redistribute bgp-direct route-map %s\n",
rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT]);
}
if (rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT])
{
- vty_outln (vty,
- " redistribute bgp-direct-to-nve-groups route-map %s",
+ vty_out (vty,
+ " redistribute bgp-direct-to-nve-groups route-map %s\n",
rfg->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT_EXT]);
}
if (bgp->rfapi->rfp_methods.cfg_group_cb)
bgp->rfapi->rfp,
RFAPI_RFP_CFG_GROUP_NVE,
rfg->name, rfg->rfp_cfg);
- vty_outln (vty, " exit-vnc");
- vty_outln (vty, "!");
+ vty_out (vty, " exit-vnc\n");
+ vty_out (vty, "!\n");
}
} /* have listen ports */
*/
if (VNC_EXPORT_BGP_GRP_ENABLED (hc))
{
- vty_outln (vty, " vnc export bgp mode group-nve");
+ vty_out (vty, " vnc export bgp mode group-nve\n");
}
else if (VNC_EXPORT_BGP_RH_ENABLED (hc))
{
- vty_outln (vty, " vnc export bgp mode registering-nve");
+ vty_out (vty, " vnc export bgp mode registering-nve\n");
}
else if (VNC_EXPORT_BGP_CE_ENABLED (hc))
{
- vty_outln (vty, " vnc export bgp mode ce");
+ vty_out (vty, " vnc export bgp mode ce\n");
}
if (VNC_EXPORT_ZEBRA_GRP_ENABLED (hc))
{
- vty_outln (vty, " vnc export zebra mode group-nve");
+ vty_out (vty, " vnc export zebra mode group-nve\n");
}
else if (VNC_EXPORT_ZEBRA_RH_ENABLED (hc))
{
- vty_outln (vty, " vnc export zebra mode registering-nve");
+ vty_out (vty, " vnc export zebra mode registering-nve\n");
}
if (hc->rfg_export_direct_bgp_l)
for (ALL_LIST_ELEMENTS (hc->rfg_export_direct_bgp_l, node, nnode, rfgn))
{
- vty_outln (vty, " vnc export bgp group-nve group %s",
+ vty_out (vty, " vnc export bgp group-nve group %s\n",
rfgn->name);
}
}
for (ALL_LIST_ELEMENTS (hc->rfg_export_zebra_l, node, nnode, rfgn))
{
- vty_outln (vty, " vnc export zebra group-nve group %s",
+ vty_out (vty, " vnc export zebra group-nve group %s\n",
rfgn->name);
}
}
if (hc->rfg_redist_name)
{
- vty_outln (vty, " vnc redistribute nve-group %s",
+ vty_out (vty, " vnc redistribute nve-group %s\n",
hc->rfg_redist_name);
}
if (hc->redist_lifetime)
{
- vty_outln (vty, " vnc redistribute lifetime %d",
+ vty_out (vty, " vnc redistribute lifetime %d\n",
hc->redist_lifetime);
}
if (hc->resolve_nve_roo_local_admin !=
BGP_VNC_CONFIG_RESOLVE_NVE_ROO_LOCAL_ADMIN_DEFAULT)
{
- vty_outln (vty, " vnc redistribute resolve-nve roo-ec-local-admin %d",
+ vty_out (vty, " vnc redistribute resolve-nve roo-ec-local-admin %d\n",
hc->resolve_nve_roo_local_admin);
}
}
if (s)
{
- vty_outln (vty, " vnc redistribute mode %s", s);
+ vty_out (vty, " vnc redistribute mode %s\n", s);
}
}
if (hc->plist_export_bgp_name[afi])
{
- vty_outln (vty, " vnc export bgp %s prefix-list %s",
+ vty_out (vty, " vnc export bgp %s prefix-list %s\n",
afistr, hc->plist_export_bgp_name[afi]);
}
if (hc->plist_export_zebra_name[afi])
{
- vty_outln (vty, " vnc export zebra %s prefix-list %s",
+ vty_out (vty, " vnc export zebra %s prefix-list %s\n",
afistr, hc->plist_export_zebra_name[afi]);
}
if (hc->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT][afi])
{
- vty_outln (vty, " vnc redistribute bgp-direct %s prefix-list %s",
+ vty_out (vty, " vnc redistribute bgp-direct %s prefix-list %s\n",
afistr,hc->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT][afi]);
}
}
if (hc->routemap_export_bgp_name)
{
- vty_outln (vty, " vnc export bgp route-map %s",
+ vty_out (vty, " vnc export bgp route-map %s\n",
hc->routemap_export_bgp_name);
}
if (hc->routemap_export_zebra_name)
{
- vty_outln (vty, " vnc export zebra route-map %s",
+ vty_out (vty, " vnc export zebra route-map %s\n",
hc->routemap_export_zebra_name);
}
if (hc->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT])
{
- vty_outln (vty, " vnc redistribute bgp-direct route-map %s",
+ vty_out (vty, " vnc redistribute bgp-direct route-map %s\n",
hc->routemap_redist_name[ZEBRA_ROUTE_BGP_DIRECT]);
}
if (type == ZEBRA_ROUTE_BGP_DIRECT_EXT &&
hc->redist_bgp_exterior_view_name)
{
- vty_outln (vty, " vnc redistribute %s %s view %s",
+ vty_out (vty, " vnc redistribute %s %s view %s\n",
((afi == AFI_IP) ? "ipv4" : "ipv6"),
zebra_route_string (type),
hc->redist_bgp_exterior_view_name);
}
else
{
- vty_outln (vty, " vnc redistribute %s %s",
+ vty_out (vty, " vnc redistribute %s %s\n",
((afi == AFI_IP) ? "ipv4" : "ipv6"),
zebra_route_string(type));
}
if (hc == NULL)
return;
- vty_outln (vty, "%-39s %-19s %s", "VNC Advertise method:",
+ vty_out (vty, "%-39s %-19s %s\n", "VNC Advertise method:",
(hc->flags & BGP_VNC_CONFIG_ADV_UN_METHOD_ENCAP
? "Encapsulation SAFI" : "Tunnel Encap attribute"),
((hc->flags & BGP_VNC_CONFIG_ADV_UN_METHOD_ENCAP) == (BGP_VNC_CONFIG_ADV_UN_METHOD_ENCAP & BGP_VNC_CONFIG_FLAGS_DEFAULT) ? "(default)" : ""));
vty_out (vty, "%sToZebra {Registering NVE}", (redist == 1 ? "" : " "));
/* note filters, route-maps not shown */
}
- vty_outln (vty, "%-19s %s", (redist ? "" : "Off"),
+ vty_out (vty, "%-19s %s\n", (redist ? "" : "Off"),
(redist ? "" : "(default)"));
/* Redistribution */
}
}
}
- vty_outln (vty, "%-19s %s", (redist ? "" : "Off"),
+ vty_out (vty, "%-19s %s\n", (redist ? "" : "Off"),
(redist ? "" : "(default)"));
- vty_outln (vty, "%-39s %3u%-16s %s", "RFP Registration Hold-Down Factor:",
+ vty_out (vty, "%-39s %3u%-16s %s\n", "RFP Registration Hold-Down Factor:",
hc->rfp_cfg.holddown_factor, "%",
(hc->rfp_cfg.holddown_factor == RFAPI_RFP_CFG_DEFAULT_HOLDDOWN_FACTOR ? "(default)" : ""));
- vty_outln (vty, "%-39s %-19s %s", "RFP Updated responses:",
+ vty_out (vty, "%-39s %-19s %s\n", "RFP Updated responses:",
(hc->rfp_cfg.use_updated_response == 0 ? "Off" : "On"),
(hc->rfp_cfg.use_updated_response == 0 ? "(default)" : ""));
- vty_outln (vty, "%-39s %-19s %s", "RFP Removal responses:",
+ vty_out (vty, "%-39s %-19s %s\n", "RFP Removal responses:",
(hc->rfp_cfg.use_removes == 0 ? "Off" : "On"),
(hc->rfp_cfg.use_removes == 0 ? "(default)" : ""));
- vty_outln (vty, "%-39s %-19s %s", "RFP Full table download:",
+ vty_out (vty, "%-39s %-19s %s\n", "RFP Full table download:",
(hc->rfp_cfg.download_type ==
RFAPI_RFP_DOWNLOAD_FULL ? "On" : "Off"),
(hc->rfp_cfg.download_type == RFAPI_RFP_DOWNLOAD_PARTIAL ? "(default)" : ""));
sprintf (tmp, "%u seconds", hc->rfp_cfg.ftd_advertisement_interval);
- vty_outln (vty, "%-39s %-19s %s", " Advertisement Interval:", tmp,
+ vty_out (vty, "%-39s %-19s %s\n", " Advertisement Interval:", tmp,
(hc->rfp_cfg.ftd_advertisement_interval == RFAPI_RFP_CFG_DEFAULT_FTD_ADVERTISEMENT_INTERVAL ? "(default)" : ""));
- vty_outln (vty, "%-39s %d seconds", "Default RFP response lifetime:",
+ vty_out (vty, "%-39s %d seconds\n", "Default RFP response lifetime:",
hc->default_response_lifetime);
vty_out (vty, VTYNL);
return;
rc = rfapi_open (rfapi_get_rfp_start_val_by_bgp (bgp_get_default ()),
&vn, &un, /*&uo */ NULL, &lifetime, NULL, &handle);
- vty_outln (vty, "rfapi_open: status %d, handle %p, lifetime %d",
+ vty_out (vty, "rfapi_open: status %d, handle %p, lifetime %d\n",
rc, handle, lifetime);
rc = rfapi_set_response_cb (handle, test_nexthops_callback);
- vty_outln (vty, "rfapi_set_response_cb: status %d", rc);
+ vty_out (vty, "rfapi_set_response_cb: status %d\n", rc);
return CMD_SUCCESS;
}
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[4]->arg, argv[6]->arg);
return CMD_WARNING;
}
rc = rfapi_close (handle);
- vty_outln (vty, "rfapi_close(handle=%p): status %d", handle,rc);
+ vty_out (vty, "rfapi_close(handle=%p): status %d\n", handle,rc);
return CMD_SUCCESS;
}
if (*endptr != '\0' || (uintptr_t) handle == UINTPTR_MAX)
{
- vty_outln (vty, "Invalid value: %s", argv[4]->arg);
+ vty_out (vty, "Invalid value: %s\n", argv[4]->arg);
return CMD_WARNING;
}
rc = rfapi_close (handle);
- vty_outln (vty, "rfapi_close(handle=%p): status %d", handle,rc);
+ vty_out (vty, "rfapi_close(handle=%p): status %d\n", handle,rc);
return CMD_SUCCESS;
}
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[4]->arg, argv[6]->arg);
return CMD_WARNING;
}
rc = rfapi_register (handle, &hpfx, lifetime, NULL, NULL, 0);
if (rc)
{
- vty_outln (vty, "rfapi_register failed with rc=%d (%s)", rc,
+ vty_out (vty, "rfapi_register failed with rc=%d (%s)\n", rc,
strerror(rc));
}
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[4]->arg, argv[6]->arg);
return CMD_WARNING;
}
rc = rfapi_register (handle, &hpfx, lifetime, NULL /* &uo */ , opt, 0);
if (rc)
{
- vty_outln (vty, "rfapi_register failed with rc=%d (%s)", rc,
+ vty_out (vty, "rfapi_register failed with rc=%d (%s)\n", rc,
strerror(rc));
}
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[4]->arg, argv[6]->arg);
return CMD_WARNING;
}
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[4]->arg, argv[6]->arg);
return CMD_WARNING;
}
if (rc)
{
- vty_outln (vty, "rfapi_query failed with rc=%d (%s)", rc,
+ vty_out (vty, "rfapi_query failed with rc=%d (%s)\n", rc,
strerror(rc));
}
else
if ((rc = rfapiCliGetRfapiIpAddr (vty, argv[2], &target)))
return rc;
#else
- vty_outln (vty, "%% This command is broken.");
+ vty_out (vty, "%% This command is broken.\n");
return CMD_WARNING;
#endif
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[4]->arg, argv[6]->arg);
return CMD_WARNING;
}
if (rc)
{
- vty_outln (vty, "rfapi_query failed with rc=%d (%s)", rc,
+ vty_out (vty, "rfapi_query failed with rc=%d (%s)\n", rc,
strerror(rc));
}
else
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[5]->arg, argv[7]->arg);
return CMD_WARNING;
}
*/
rc = rfapi_query_done (handle, &target);
- vty_outln (vty, "rfapi_query_done returned %d", rc);
+ vty_out (vty, "rfapi_query_done returned %d\n", rc);
return CMD_SUCCESS;
}
bgp = bgp_get_default (); /* assume 1 instance for now */
if (!bgp)
{
- vty_outln (vty, "No BGP instance");
+ vty_out (vty, "No BGP instance\n");
return CMD_WARNING;
}
h = bgp->rfapi;
if (!h)
{
- vty_outln (vty, "No RFAPI instance");
+ vty_out (vty, "No RFAPI instance\n");
return CMD_WARNING;
}
{
s = ecommunity_ecom2str (it->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP, 0);
- vty_outln (vty, "Import Table %p, RTs: %s", it, s);
+ vty_out (vty, "Import Table %p, RTs: %s\n", it, s);
XFREE (MTYPE_ECOMMUNITY_STR, s);
rfapiShowImportTable (vty, "IP VPN", it->imported_vpn[AFI_IP], 1);
lni = lni_as_ptr;
if (first_l2)
{
- vty_outln (vty, "%sLNI-based Ethernet Tables:",
+ vty_out (vty, "%sLNI-based Ethernet Tables:\n",
VTYNL);
first_l2 = 0;
}
if (rfapi_find_handle_vty (vty, &vn, &un, &handle))
{
- vty_outln (vty, "can't locate handle matching vn=%s, un=%s",
+ vty_out (vty, "can't locate handle matching vn=%s, un=%s\n",
argv[5]->arg, argv[7]->arg);
return CMD_WARNING;
}
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi_cfg)
{
- vty_outln (vty, "VNC not configured");
+ vty_out (vty, "VNC not configured\n");
return CMD_WARNING;
}
if (!rfg || !listnode_lookup (rfc->nve_groups_sequential, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current NVE group no longer exists");
+ vty_out (vty, "Current NVE group no longer exists\n");
return NULL;
}
if (!rfg || !listnode_lookup (rfc->l2_groups, rfg))
{
/* Not in list anymore */
- vty_outln (vty, "Current L2 group no longer exists");
+ vty_out (vty, "Current L2 group no longer exists\n");
return NULL;
}
if (rfg->rfp_cfg == NULL && size > 0)
bgp = bgp_get_default (); /* assume 1 instance for now */
if (!bgp)
{
- vty_outln (vty, "No BGP instance");
+ vty_out (vty, "No BGP instance\n");
return CMD_WARNING;
}
h = bgp->rfapi;
if (!h)
{
- vty_outln (vty, "No RFAPI instance");
+ vty_out (vty, "No RFAPI instance\n");
return CMD_WARNING;
}
if (!bgp)
{
if (vty)
- vty_outln (vty, "BGP not configured");
+ vty_out (vty, "BGP not configured\n");
return CMD_WARNING;
}
if (!h || !rfapi_cfg)
{
if (vty)
- vty_outln (vty, "RFAPI not configured");
+ vty_out (vty, "RFAPI not configured\n");
return CMD_WARNING;
}
{
if (arg_lnh)
{
- vty_outln (vty,"local-next-hop specified more than once");
+ vty_out (vty,"local-next-hop specified more than once\n");
return CMD_WARNING;
}
if (argc <= 1)
{
- vty_outln (vty,"Missing parameter for local-next-hop");
+ vty_out (vty,"Missing parameter for local-next-hop\n");
return CMD_WARNING;
}
++argv, --argc;
{
if (arg_lnh_cost)
{
- vty_outln (vty,"local-cost specified more than once");
+ vty_out (vty,"local-cost specified more than once\n");
return CMD_WARNING;
}
if (argc <= 1)
{
- vty_outln (vty,"Missing parameter for local-cost");
+ vty_out (vty,"Missing parameter for local-cost\n");
return CMD_WARNING;
}
++argv, --argc;
arg_prefix = "0::0/128";
break;
default:
- vty_outln (vty,"Internal error, unknown VN address family");
+ vty_out (vty,"Internal error, unknown VN address family\n");
return CMD_WARNING;
}
cost = strtoul (arg_cost, &endptr, 10);
if (*endptr != '\0' || cost > 255)
{
- vty_outln (vty, "%% Invalid %s value", "cost");
+ vty_out (vty, "%% Invalid %s value\n", "cost");
goto fail;
}
}
lifetime = strtoul (arg_lifetime, &endptr, 10);
if (*endptr != '\0')
{
- vty_outln (vty, "%% Invalid %s value","lifetime");
+ vty_out (vty, "%% Invalid %s value\n","lifetime");
goto fail;
}
}
{
if (!arg_lnh)
{
- vty_outln (vty,
- "%% %s may only be specified with local-next-hop",
+ vty_out (vty,
+ "%% %s may only be specified with local-next-hop\n",
"local-cost");
goto fail;
}
lnh_cost = strtoul (arg_lnh_cost, &endptr, 10);
if (*endptr != '\0' || lnh_cost > 255)
{
- vty_outln (vty, "%% Invalid %s value","local-cost");
+ vty_out (vty, "%% Invalid %s value\n","local-cost");
goto fail;
}
}
{
if (!arg_prefix)
{
- vty_outln (vty, "%% %s may only be specified with prefix",
+ vty_out (vty, "%% %s may only be specified with prefix\n",
"local-next-hop");
goto fail;
}
if (arg_vni && !arg_macaddr)
{
- vty_outln (vty, "%% %s may only be specified with mac address",
+ vty_out (vty, "%% %s may only be specified with mac address\n",
"virtual-network-identifier");
goto fail;
}
if ((rc = rfapiStr2EthAddr (arg_macaddr,
&optary[opt_next].v.l2addr.macaddr)))
{
- vty_outln (vty, "Invalid %s value","mac address");
+ vty_out (vty, "Invalid %s value\n","mac address");
goto fail;
}
/* TBD label, NVE ID */
&rfd);
if (rc)
{
- vty_outln (vty, "Can't open session for this NVE: %s",
+ vty_out (vty, "Can't open session for this NVE: %s\n",
rfapi_error_str(rc));
rc = CMD_WARNING;
goto fail;
}
else
{
- vty_outln (vty, "Can't find session for this NVE: %s",
+ vty_out (vty, "Can't find session for this NVE: %s\n",
rfapi_error_str(rc));
goto fail;
}
vnc_zlog_debug_verbose ("%s: rfapi_register failed", __func__);
vty_out (vty, VTYNL);
- vty_outln (vty, "Registration failed.");
- vty_outln (vty,
- "Confirm that either the VN or UN address matches a configured NVE group.");
+ vty_out (vty, "Registration failed.\n");
+ vty_out (vty,
+ "Confirm that either the VN or UN address matches a configured NVE group.\n");
return CMD_WARNING;
fail:
{
if (!arg_vni)
{
- vty_outln (vty, "Missing VNI");
+ vty_out (vty, "Missing VNI\n");
return rc;
}
if (strcmp (arg_l2addr, "*"))
cda->nves = NULL;
}
if (cda->failed_pfx_count)
- vty_outln (vty, "Failed to delete %d prefixes",
+ vty_out (vty, "Failed to delete %d prefixes\n",
cda->failed_pfx_count);
/* left as "prefixes" even in single case for ease of machine parsing */
- vty_outln (vty,
- "[Local] Cleared %u registrations, %u prefixes, %u responses from %d NVEs",
+ vty_out (vty,
+ "[Local] Cleared %u registrations, %u prefixes, %u responses from %d NVEs\n",
cda->reg_count, cda->pfx_count, cda->query_count,cda->nve_count);
/*
* the command line
*/
- vty_outln (vty, "[Holddown] Cleared %u prefixes from %u NVEs",
+ vty_out (vty, "[Holddown] Cleared %u prefixes from %u NVEs\n",
cda->remote_holddown_pfx_count,cda->remote_holddown_nve_count);
}
if (vty)
{
- vty_outln (vty,
- "VNC is not configured. (There are no configured BGP VPN SAFI peers.)");
+ vty_out (vty,
+ "VNC is not configured. (There are no configured BGP VPN SAFI peers.)\n");
}
return 0; /* not running */
}
return 0;
notcfg:
- vty_outln (vty, "VNC is not configured.");
+ vty_out (vty, "VNC is not configured.\n");
return CMD_WARNING;
}
/* print out a header */
vty_outln (vty,
" " "Active Next Hops");
- vty_outln (vty, "%-15s %-15s %-5s %-5s %-6s %-6s %s",
+ vty_out (vty, "%-15s %-15s %-5s %-5s %-6s %-6s %s\n",
"VN Address",
"UN Address",
"Regis", "Resps", "Reach", "Remove", "Age");
++printed;
- vty_outln (vty, "%-15s %-15s %-5u %-5u %-6u %-6u %s",
+ vty_out (vty, "%-15s %-15s %-5u %-5u %-6u %-6u %s\n",
vn_addr_buf,
un_addr_buf,
rfapiApCount (rfd),
}
if (printed > 0 || vn_prefix || un_prefix)
- vty_outln (vty, "Displayed %d out of %d active NVEs",
+ vty_out (vty, "Displayed %d out of %d active NVEs\n",
printed, total);
return 0;
notcfg:
- vty_outln (vty, "VNC is not configured.");
+ vty_out (vty, "VNC is not configured.\n");
return CMD_WARNING;
}
{
if (!str2prefix (argv[3]->arg, &p))
{
- vty_outln (vty, "Invalid prefix: %s", argv[3]->arg);
+ vty_out (vty, "Invalid prefix: %s\n", argv[3]->arg);
return CMD_SUCCESS;
}
else
{
if (!str2prefix (argv[4]->arg, &p))
{
- vty_outln (vty, "Invalid prefix: %s", argv[4]->arg);
+ vty_out (vty, "Invalid prefix: %s\n", argv[4]->arg);
return CMD_SUCCESS;
}
else
{
if (!str2prefix (argv[3]->arg, &p))
{
- vty_outln (vty, "Invalid prefix: %s", argv[3]->arg);
+ vty_out (vty, "Invalid prefix: %s\n", argv[3]->arg);
return CMD_SUCCESS;
}
else
{
if (!str2prefix (argv[4]->arg, &p))
{
- vty_outln (vty, "Invalid prefix: %s", argv[4]->arg);
+ vty_out (vty, "Invalid prefix: %s\n", argv[4]->arg);
return CMD_SUCCESS;
}
else
{
if (!str2prefix (argv[3]->arg, &pfx))
{
- vty_outln (vty, "Invalid prefix: %s", argv[3]->arg);
+ vty_out (vty, "Invalid prefix: %s\n", argv[3]->arg);
return CMD_WARNING;
}
p = &pfx;
return CMD_SUCCESS;
notcfg:
- vty_outln (vty, "VNC is not configured.");
+ vty_out (vty, "VNC is not configured.\n");
return CMD_WARNING;
}
bgp = bgp_get_default (); /* assume main instance for now */
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi || !bgp->rfapi_cfg)
{
- vty_outln (vty, "VRF support not configured");
+ vty_out (vty, "VRF support not configured\n");
return CMD_WARNING;
}
}
vnc_zlog_debug_verbose ("%s: rfapi_register failed", __func__);
- vty_outln (vty, "Add failed.");
+ vty_out (vty, "Add failed.\n");
return CMD_WARNING;
}
bgp = bgp_get_default (); /* assume main instance for now */
if (!bgp)
{
- vty_outln (vty, "No BGP process is configured");
+ vty_out (vty, "No BGP process is configured\n");
return CMD_WARNING;
}
if (!bgp->rfapi || !bgp->rfapi_cfg)
{
- vty_outln (vty, "VRF support not configured");
+ vty_out (vty, "VRF support not configured\n");
return CMD_WARNING;
}
rfg = bgp_rfapi_cfg_match_byname (bgp, arg_vrf, RFAPI_GROUP_CFG_VRF);
start_count = rfapi_cfg_group_it_count(rfg);
clear_vnc_prefix (&cda);
clear_vnc_vrf_closer (rfg);
- vty_outln (vty, "Cleared %u out of %d prefixes.",
+ vty_out (vty, "Cleared %u out of %d prefixes.\n",
cda.pfx_count, start_count);
return CMD_SUCCESS;
}
else
{
term_vnc_debug |= vncdebug[i].bit;
- vty_outln (vty, "BGP vnc %s debugging is on",
+ vty_out (vty, "BGP vnc %s debugging is on\n",
vncdebug[i].name);
}
return CMD_SUCCESS;
}
}
- vty_outln (vty, "Unknown debug flag: %s", argv[3]->arg);
+ vty_out (vty, "Unknown debug flag: %s\n", argv[3]->arg);
return CMD_WARNING;
}
else
{
term_vnc_debug &= ~vncdebug[i].bit;
- vty_outln (vty, "BGP vnc %s debugging is off",
+ vty_out (vty, "BGP vnc %s debugging is off\n",
vncdebug[i].name);
}
return CMD_SUCCESS;
}
}
- vty_outln (vty, "Unknown debug flag: %s", argv[3]->arg);
+ vty_out (vty, "Unknown debug flag: %s\n", argv[3]->arg);
return CMD_WARNING;
}
VNC_STR)
{
term_vnc_debug = 0;
- vty_outln (vty, "All possible VNC debugging has been turned off");
+ vty_out (vty, "All possible VNC debugging has been turned off\n");
return CMD_SUCCESS;
}
{
size_t i;
- vty_outln (vty, "BGP VNC debugging status:");
+ vty_out (vty, "BGP VNC debugging status:\n");
for (i = 0; i < (sizeof(vncdebug) / sizeof(struct vnc_debug)); ++i)
{
if (term_vnc_debug & vncdebug[i].bit)
{
- vty_outln (vty, " BGP VNC %s debugging is on",
+ vty_out (vty, " BGP VNC %s debugging is on\n",
vncdebug[i].name);
}
}
{
if (conf_vnc_debug & vncdebug[i].bit)
{
- vty_outln (vty, "debug bgp vnc %s", vncdebug[i].name);
+ vty_out (vty, "debug bgp vnc %s\n", vncdebug[i].name);
write++;
}
}
if (conf_debug_eigrp_packet[i] == 0 && term_debug_eigrp_packet[i] == 0 )
continue;
- vty_outln (vty, "debug eigrp packet %s%s",
+ vty_out (vty, "debug eigrp packet %s%s\n",
type_str[i],detail_str[conf_debug_eigrp_packet[i]]);
write = 1;
}
show_ip_eigrp_interface_header (struct vty *vty, struct eigrp *eigrp)
{
- vty_outln (vty, "%s%s%d%s%s%s %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s%s %-39s %-12s %-7s %-14s %-12s %-8s",
+ vty_out (vty, "%s%s%d%s%s%s %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s%s %-39s %-12s %-7s %-14s %-12s %-8s\n",
VTYNL,
"EIGRP interfaces for AS(",eigrp->AS,")",VTYNL,VTYNL,
"Interface", "Bandwidth", "Delay", "Peers", "Xmit Queue", "Mean",
vty_out (vty, "%-7u", ei->nbrs->count);
vty_out (vty, "%u %c %-10u",0,'/', eigrp_neighbor_packet_queue_sum (ei));
vty_out (vty, "%-7u %-14u %-12u %-8u", 0, 0, 0, 0);
- vty_outln (vty, "%-8u %-8u ",
+ vty_out (vty, "%-8u %-8u \n",
IF_DEF_PARAMS (ei->ifp)->v_hello,
IF_DEF_PARAMS(ei->ifp)->v_wait);
}
show_ip_eigrp_interface_detail (struct vty *vty, struct eigrp *eigrp,
struct eigrp_interface *ei)
{
- vty_outln (vty, "%-2s %s %d %-3s ","","Hello interval is ", 0, " sec");
- vty_outln (vty, "%-2s %s %s ","", "Next xmit serial","<none>");
- vty_outln (vty, "%-2s %s %d %s %d %s %d %s %d ",
+ vty_out (vty, "%-2s %s %d %-3s \n","","Hello interval is ", 0, " sec");
+ vty_out (vty, "%-2s %s %s \n","", "Next xmit serial","<none>");
+ vty_out (vty, "%-2s %s %d %s %d %s %d %s %d \n",
"", "Un/reliable mcasts: ", 0, "/", 0, "Un/reliable ucasts: ",
0, "/", 0);
- vty_outln (vty, "%-2s %s %d %s %d %s %d ",
+ vty_out (vty, "%-2s %s %d %s %d %s %d \n",
"", "Mcast exceptions: ", 0, " CR packets: ",
0, " ACKs supressed: ", 0);
- vty_outln (vty, "%-2s %s %d %s %d ",
+ vty_out (vty, "%-2s %s %d %s %d \n",
"", "Retransmissions sent: ", 0, "Out-of-sequence rcvd: ",
0);
- vty_outln (vty, "%-2s %s %s %s ",
+ vty_out (vty, "%-2s %s %s %s \n",
"", "Authentication mode is ", "not","set");
- vty_outln (vty, "%-2s %s ", "", "Use multicast");
+ vty_out (vty, "%-2s %s \n", "", "Use multicast");
}
void
show_ip_eigrp_neighbor_header (struct vty *vty, struct eigrp *eigrp)
{
- vty_outln (vty, "%s%s%d%s%s%s%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s%s %-41s %-6s %-8s %-6s %-4s %-6s %-5s ",
+ vty_out (vty, "%s%s%d%s%s%s%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s%s %-41s %-6s %-8s %-6s %-4s %-6s %-5s \n",
VTYNL,
"EIGRP neighbors for AS(",eigrp->AS,")",VTYNL,VTYNL,
"H", "Address", "Interface", "Hold", "Uptime",
vty_out (vty,"%-7lu", thread_timer_remain_second (nbr->t_holddown));
vty_out (vty,"%-8u %-6u %-5u", 0, 0, EIGRP_PACKET_RETRANS_TIME);
vty_out (vty,"%-7lu", nbr->retrans_queue->count);
- vty_outln (vty,"%u", nbr->recv_sequence_number);
+ vty_out (vty,"%u\n", nbr->recv_sequence_number);
if (detail)
nbr->tlv_rel_major, nbr->tlv_rel_minor);
vty_out(vty,", Retrans: %lu, Retries: %lu",
nbr->retrans_queue->count, 0UL);
- vty_outln (vty,", %s", eigrp_nbr_state_str(nbr));
+ vty_out (vty,", %s\n", eigrp_nbr_state_str(nbr));
}
}
struct in_addr router_id;
router_id.s_addr = eigrp->router_id;
- vty_outln (vty, "%sEIGRP Topology Table for AS(%d)/ID(%s)%s",
+ vty_out (vty, "%sEIGRP Topology Table for AS(%d)/ID(%s)%s\n",
VTYNL, eigrp->AS, inet_ntoa(router_id), VTYNL);
vty_outln (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, "
"R - Reply%s r - reply Status, s - sia Status%s",
}
if (te->adv_router == eigrp->neighbor_self)
- vty_outln (vty, "%-7s%s, %s", " ", "via Connected",
+ vty_out (vty, "%-7s%s, %s\n", " ", "via Connected",
eigrp_if_name_string(te->ei));
else
{
- vty_outln (vty, "%-7s%s%s (%u/%u), %s",
+ vty_out (vty, "%-7s%s%s (%u/%u), %s\n",
" ", "via ", inet_ntoa (te->adv_router->src),
te->distance, te->reported_distance,
eigrp_if_name_string(te->ei));
{
int i;
- vty_outln (vty, "EIGRP debugging status:");
+ vty_out (vty, "EIGRP debugging status:\n");
/* Show debug status for events. */
if (IS_DEBUG_EIGRP(event,EVENT))
- vty_outln (vty, " EIGRP event debugging is on");
+ vty_out (vty, " EIGRP event debugging is on\n");
/* Show debug status for EIGRP Packets. */
for (i = 0; i < 11 ; i++)
if (IS_DEBUG_EIGRP_PACKET (i, SEND) && IS_DEBUG_EIGRP_PACKET (i, RECV))
{
- vty_outln (vty, " EIGRP packet %s%s debugging is on",
+ vty_out (vty, " EIGRP packet %s%s debugging is on\n",
lookup_msg(eigrp_packet_type_str, i + 1, NULL),
IS_DEBUG_EIGRP_PACKET (i, PACKET_DETAIL) ? " detail" : "");
}
else
{
if (IS_DEBUG_EIGRP_PACKET (i, SEND))
- vty_outln (vty, " EIGRP packet %s send%s debugging is on",
+ vty_out (vty, " EIGRP packet %s send%s debugging is on\n",
lookup_msg(eigrp_packet_type_str, i + 1, NULL),
IS_DEBUG_EIGRP_PACKET (i, PACKET_DETAIL) ? " detail" : "");
if (IS_DEBUG_EIGRP_PACKET (i, RECV))
- vty_outln (vty, " EIGRP packet %s receive%s debugging is on",
+ vty_out (vty, " EIGRP packet %s receive%s debugging is on\n",
lookup_msg(eigrp_packet_type_str, i + 1, NULL),
IS_DEBUG_EIGRP_PACKET (i, PACKET_DETAIL) ? " detail" : "");
}
if(vty != NULL)
{
vty_time_print (vty, 0);
- vty_outln (vty, "Neighbor %s (%s) is down: manually cleared",
+ vty_out (vty, "Neighbor %s (%s) is down: manually cleared\n",
inet_ntoa (nbr->src),
ifindex2ifname(nbr->ei->ifp->ifindex, VRF_DEFAULT));
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% Can't find rule.");
+ vty_out (vty, "%% Can't find rule.\n");
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% Argument is malformed.");
+ vty_out (vty, "%% Argument is malformed.\n");
return CMD_WARNING;
}
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% Can't find rule.");
+ vty_out (vty, "%% Can't find rule.\n");
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% Argument is malformed.");
+ vty_out (vty, "%% Argument is malformed.\n");
return CMD_WARNING;
}
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% Can't find rule.");
+ vty_out (vty, "%% Can't find rule.\n");
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
/* rip, ripng and other protocols share the set metric command
if metric is out of range for rip and ripng, it is not for
other protocols. Do not return an error */
if (strcmp(command, "metric")) {
- vty_outln (vty, "%% Argument is malformed.");
+ vty_out (vty, "%% Argument is malformed.\n");
return CMD_WARNING;
}
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% Can't find rule.");
+ vty_out (vty, "%% Can't find rule.\n");
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% Argument is malformed.");
+ vty_out (vty, "%% Argument is malformed.\n");
return CMD_WARNING;
}
}
ret = str2sockunion (argv[0], &su);
if (ret < 0)
{
- vty_outln (vty, "%% Malformed next-hop address");
+ vty_out (vty, "%% Malformed next-hop address\n");
return CMD_WARNING;
}
if(vty != NULL)
{
vty_time_print (vty, 0);
- vty_outln (vty, "Neighbor %s (%s) is resync: manually cleared",
+ vty_out (vty, "Neighbor %s (%s) is resync: manually cleared\n",
inet_ntoa (nbr->src),
ifindex2ifname(nbr->ei->ifp->ifindex, VRF_DEFAULT));
}
if (rn->info)
{
/* Network print. */
- vty_outln (vty, " network %s/%d ",
+ vty_out (vty, " network %s/%d \n",
inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen);
}
if (eigrp->max_paths != EIGRP_MAX_PATHS_DEFAULT)
- vty_outln (vty, " maximum-paths %d", eigrp->max_paths);
+ vty_out (vty, " maximum-paths %d\n", eigrp->max_paths);
if (eigrp->variance != EIGRP_VARIANCE_DEFAULT)
- vty_outln (vty, " variance %d", eigrp->variance);
+ vty_out (vty, " variance %d\n", eigrp->variance);
/*Separate EIGRP configuration from the rest of the config*/
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
return 0;
}
for (ALL_LIST_ELEMENTS_RO (eigrp->eiflist, node, ei))
{
- vty_outln (vty, "interface %s", ei->ifp->name);
+ vty_out (vty, "interface %s\n", ei->ifp->name);
if ((IF_DEF_PARAMS (ei->ifp)->auth_type) == EIGRP_AUTH_TYPE_MD5)
{
- vty_outln (vty, " ip authentication mode eigrp %d md5", eigrp->AS);
+ vty_out (vty, " ip authentication mode eigrp %d md5\n", eigrp->AS);
}
if ((IF_DEF_PARAMS (ei->ifp)->auth_type) == EIGRP_AUTH_TYPE_SHA256)
{
- vty_outln (vty, " ip authentication mode eigrp %d hmac-sha-256",
+ vty_out (vty, " ip authentication mode eigrp %d hmac-sha-256\n",
eigrp->AS);
}
if(IF_DEF_PARAMS (ei->ifp)->auth_keychain)
{
- vty_outln (vty, " ip authentication key-chain eigrp %d %s",eigrp->AS,
+ vty_out (vty, " ip authentication key-chain eigrp %d %s\n",eigrp->AS,
IF_DEF_PARAMS(ei->ifp)->auth_keychain);
}
if ((IF_DEF_PARAMS (ei->ifp)->v_hello) != EIGRP_HELLO_INTERVAL_DEFAULT)
{
- vty_outln (vty, " ip hello-interval eigrp %d",
+ vty_out (vty, " ip hello-interval eigrp %d\n",
IF_DEF_PARAMS(ei->ifp)->v_hello);
}
if ((IF_DEF_PARAMS (ei->ifp)->v_wait) != EIGRP_HOLD_INTERVAL_DEFAULT)
{
- vty_outln (vty, " ip hold-time eigrp %d",
+ vty_out (vty, " ip hold-time eigrp %d\n",
IF_DEF_PARAMS(ei->ifp)->v_wait);
}
/*Separate this EIGRP interface configuration from the others*/
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
return 0;
struct interface *ifp;
for (ALL_LIST_ELEMENTS_RO (vrf_iflist(VRF_DEFAULT), node, ifp)) {
- vty_outln (vty, "interface %s",ifp->name);
+ vty_out (vty, "interface %s\n",ifp->name);
if (ifp->desc)
- vty_outln (vty, " description %s",ifp->desc);
+ vty_out (vty, " description %s\n",ifp->desc);
if (IF_DEF_PARAMS (ifp)->bandwidth != EIGRP_BANDWIDTH_DEFAULT)
- vty_outln (vty, " bandwidth %u",IF_DEF_PARAMS(ifp)->bandwidth);
+ vty_out (vty, " bandwidth %u\n",IF_DEF_PARAMS(ifp)->bandwidth);
if (IF_DEF_PARAMS (ifp)->delay != EIGRP_DELAY_DEFAULT)
- vty_outln (vty, " delay %u", IF_DEF_PARAMS(ifp)->delay);
+ vty_out (vty, " delay %u\n", IF_DEF_PARAMS(ifp)->delay);
if (IF_DEF_PARAMS (ifp)->v_hello != EIGRP_HELLO_INTERVAL_DEFAULT)
- vty_outln (vty, " ip hello-interval eigrp %u",
+ vty_out (vty, " ip hello-interval eigrp %u\n",
IF_DEF_PARAMS(ifp)->v_hello);
if (IF_DEF_PARAMS (ifp)->v_wait != EIGRP_HOLD_INTERVAL_DEFAULT)
- vty_outln (vty, " ip hold-time eigrp %u",
+ vty_out (vty, " ip hold-time eigrp %u\n",
IF_DEF_PARAMS(ifp)->v_wait);
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
return 0;
int write=0;
/* `router eigrp' print. */
- vty_outln (vty, "router eigrp %d", eigrp->AS);
+ vty_out (vty, "router eigrp %d\n", eigrp->AS);
write++;
{
struct in_addr router_id_static;
router_id_static.s_addr = htonl(eigrp->router_id_static);
- vty_outln (vty, " eigrp router-id %s",
+ vty_out (vty, " eigrp router-id %s\n",
inet_ntoa(router_id_static));
}
config_write_eigrp_distribute (vty, eigrp);
/*Separate EIGRP configuration from the rest of the config*/
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
return write;
}
eigrp = eigrp_lookup ();
if (eigrp->AS != atoi (argv[3]->arg))
{
- vty_outln (vty,"%% Attempting to deconfigure non-existent AS");
+ vty_out (vty,"%% Attempting to deconfigure non-existent AS\n");
return CMD_WARNING;
}
if (ret == 0)
{
- vty_outln (vty, "There is already same network statement.");
+ vty_out (vty, "There is already same network statement.\n");
return CMD_WARNING;
}
if (ret == 0)
{
- vty_outln (vty,"Can't find specified network configuration.");
+ vty_out (vty,"Can't find specified network configuration.\n");
return CMD_WARNING;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, "EIGRP Routing Process not enabled");
+ vty_out (vty, "EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, "EIGRP Routing Process not enabled");
+ vty_out (vty, "EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
IF_DEF_PARAMS (ifp)->auth_keychain = strdup(keychain->name);
}
else
- vty_outln (vty,"Key chain with specified name not found");
+ vty_out (vty,"Key chain with specified name not found\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, "EIGRP Routing Process not enabled");
+ vty_out (vty, "EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
IF_DEF_PARAMS (ifp)->auth_keychain = NULL;
}
else
- vty_outln (vty,
- "Key chain with specified name not configured on interface");
+ vty_out (vty,
+ "Key chain with specified name not configured on interface\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, "EIGRP Routing Process not enabled");
+ vty_out (vty, "EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
variance = atoi(argv[1]->arg);
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, "EIGRP Routing Process not enabled");
+ vty_out (vty, "EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, "EIGRP Routing Process not enabled");
+ vty_out (vty, "EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, "EIGRP Routing Process not enabled");
+ vty_out (vty, "EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
inet_ntoa (nbr->src),
ifindex2ifname (nbr->ei->ifp->ifindex, VRF_DEFAULT));
vty_time_print (vty, 0);
- vty_outln (vty, "Neighbor %s (%s) is down: manually cleared",
+ vty_out (vty, "Neighbor %s (%s) is down: manually cleared\n",
inet_ntoa (nbr->src),
ifindex2ifname(nbr->ei->ifp->ifindex, VRF_DEFAULT));
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
ei = eigrp_if_lookup_by_name(eigrp, argv[idx]->arg);
if(ei == NULL)
{
- vty_outln (vty, " Interface (%s) doesn't exist", argv[idx]->arg);
+ vty_out (vty, " Interface (%s) doesn't exist\n", argv[idx]->arg);
return CMD_WARNING;
}
inet_ntoa (nbr->src),
ifindex2ifname (nbr->ei->ifp->ifindex, VRF_DEFAULT));
vty_time_print (vty, 0);
- vty_outln (vty, "Neighbor %s (%s) is down: manually cleared",
+ vty_out (vty, "Neighbor %s (%s) is down: manually cleared\n",
inet_ntoa (nbr->src),
ifindex2ifname(nbr->ei->ifp->ifindex, VRF_DEFAULT));
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
/* if neighbor doesn't exists, notify user and exit */
if(nbr == NULL)
{
- vty_outln (vty, "Neighbor with entered address doesn't exists.");
+ vty_out (vty, "Neighbor with entered address doesn't exists.\n");
return CMD_WARNING;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
ei = eigrp_if_lookup_by_name(eigrp, argv[4]->arg);
if(ei == NULL)
{
- vty_outln (vty, " Interface (%s) doesn't exist", argv[4]->arg);
+ vty_out (vty, " Interface (%s) doesn't exist\n", argv[4]->arg);
return CMD_WARNING;
}
eigrp = eigrp_lookup ();
if (eigrp == NULL)
{
- vty_outln (vty, " EIGRP Routing Process not enabled");
+ vty_out (vty, " EIGRP Routing Process not enabled\n");
return CMD_SUCCESS;
}
/* if neighbor doesn't exists, notify user and exit */
if(nbr == NULL)
{
- vty_outln (vty, "Neighbor with entered address doesn't exists.");
+ vty_out (vty, "Neighbor with entered address doesn't exists.\n");
return CMD_WARNING;
}
vty_out (vty, VTYNL);
if (adj->mt_count != 1 || adj->mt_set[0] != ISIS_MT_IPV4_UNICAST)
{
- vty_outln (vty, " Topologies:");
+ vty_out (vty, " Topologies:\n");
for (unsigned int i = 0; i < adj->mt_count; i++)
- vty_outln (vty, " %s", isis_mtid2str(adj->mt_set[i]));
+ vty_out (vty, " %s\n", isis_mtid2str(adj->mt_set[i]));
}
vty_out (vty, " SNPA: %s", snpa_print (adj->snpa));
if (adj->circuit && (adj->circuit->circ_type == CIRCUIT_T_BROADCAST))
if (adj->area_addrs && listcount (adj->area_addrs) > 0)
{
struct area_addr *area_addr;
- vty_outln (vty, " Area Address(es):");
+ vty_out (vty, " Area Address(es):\n");
for (ALL_LIST_ELEMENTS_RO (adj->area_addrs, node, area_addr))
- vty_outln (vty, " %s",
+ vty_out (vty, " %s\n",
isonet_print(area_addr->area_addr, area_addr->addr_len));
}
if (adj->ipv4_addrs && listcount (adj->ipv4_addrs) > 0)
{
- vty_outln (vty, " IPv4 Address(es):");
+ vty_out (vty, " IPv4 Address(es):\n");
for (ALL_LIST_ELEMENTS_RO (adj->ipv4_addrs, node, ip_addr))
- vty_outln (vty, " %s", inet_ntoa(*ip_addr));
+ vty_out (vty, " %s\n", inet_ntoa(*ip_addr));
}
if (adj->ipv6_addrs && listcount (adj->ipv6_addrs) > 0)
{
- vty_outln (vty, " IPv6 Address(es):");
+ vty_out (vty, " IPv6 Address(es):\n");
for (ALL_LIST_ELEMENTS_RO (adj->ipv6_addrs, node, ipv6_addr))
{
inet_ntop (AF_INET6, ipv6_addr, (char *)ip6, INET6_ADDRSTRLEN);
- vty_outln (vty, " %s", ip6);
+ vty_out (vty, " %s\n", ip6);
}
}
vty_out (vty, VTYNL);
vty_out (vty, VTYNL);
if (circuit->is_type & IS_LEVEL_1)
{
- vty_outln (vty, " Level-1 Information:");
+ vty_out (vty, " Level-1 Information:\n");
if (circuit->area->newmetric)
vty_out (vty, " Metric: %d", circuit->te_metric[0]);
else
circuit->metric[0]);
if (!circuit->is_passive)
{
- vty_outln (vty, ", Active neighbors: %u",
+ vty_out (vty, ", Active neighbors: %u\n",
circuit->upadjcount[0]);
vty_outln (vty, " Hello interval: %u, "
"Holddown count: %u %s",
circuit->csnp_interval[0],
circuit->psnp_interval[0]);
if (circuit->circ_type == CIRCUIT_T_BROADCAST)
- vty_outln (vty, " LAN Priority: %u, %s",
+ vty_out (vty, " LAN Priority: %u, %s\n",
circuit->priority[0],
(circuit->u.bc.is_dr[0] ? "is DIS" : "is not DIS"));
}
}
if (circuit->is_type & IS_LEVEL_2)
{
- vty_outln (vty, " Level-2 Information:");
+ vty_out (vty, " Level-2 Information:\n");
if (circuit->area->newmetric)
vty_out (vty, " Metric: %d", circuit->te_metric[1]);
else
circuit->metric[1]);
if (!circuit->is_passive)
{
- vty_outln (vty, ", Active neighbors: %u",
+ vty_out (vty, ", Active neighbors: %u\n",
circuit->upadjcount[1]);
vty_outln (vty, " Hello interval: %u, "
"Holddown count: %u %s",
circuit->csnp_interval[1],
circuit->psnp_interval[1]);
if (circuit->circ_type == CIRCUIT_T_BROADCAST)
- vty_outln (vty, " LAN Priority: %u, %s",
+ vty_out (vty, " LAN Priority: %u, %s\n",
circuit->priority[1],
(circuit->u.bc.is_dr[1] ? "is DIS" : "is not DIS"));
}
}
if (circuit->ip_addrs && listcount (circuit->ip_addrs) > 0)
{
- vty_outln (vty, " IP Prefix(es):");
+ vty_out (vty, " IP Prefix(es):\n");
for (ALL_LIST_ELEMENTS_RO (circuit->ip_addrs, node, ip_addr))
{
prefix2str (ip_addr, buf, sizeof (buf)),
- vty_outln (vty, " %s", buf);
+ vty_out (vty, " %s\n", buf);
}
}
if (circuit->ipv6_link && listcount(circuit->ipv6_link) > 0)
{
- vty_outln (vty, " IPv6 Link-Locals:");
+ vty_out (vty, " IPv6 Link-Locals:\n");
for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_link, node, ip_addr))
{
prefix2str(ip_addr, (char*)buf, BUFSIZ),
- vty_outln (vty, " %s", buf);
+ vty_out (vty, " %s\n", buf);
}
}
if (circuit->ipv6_non_link && listcount(circuit->ipv6_non_link) > 0)
{
- vty_outln (vty, " IPv6 Prefixes:");
+ vty_out (vty, " IPv6 Prefixes:\n");
for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_non_link, node, ip_addr))
{
prefix2str(ip_addr, (char*)buf, BUFSIZ),
- vty_outln (vty, " %s", buf);
+ vty_out (vty, " %s\n", buf);
}
}
continue;
/* IF name */
- vty_outln (vty, "interface %s", ifp->name);
+ vty_out (vty, "interface %s\n", ifp->name);
write++;
/* IF desc */
if (ifp->desc)
{
- vty_outln (vty, " description %s", ifp->desc);
+ vty_out (vty, " description %s\n", ifp->desc);
write++;
}
/* ISIS Circuit */
continue;
if (circuit->ip_router)
{
- vty_outln (vty, " ip router isis %s",area->area_tag);
+ vty_out (vty, " ip router isis %s\n",area->area_tag);
write++;
}
if (circuit->is_passive)
{
- vty_outln (vty, " isis passive");
+ vty_out (vty, " isis passive\n");
write++;
}
if (circuit->circ_type_config == CIRCUIT_T_P2P)
{
- vty_outln (vty, " isis network point-to-point");
+ vty_out (vty, " isis network point-to-point\n");
write++;
}
if (circuit->ipv6_router)
{
- vty_outln (vty, " ipv6 router isis %s",area->area_tag);
+ vty_out (vty, " ipv6 router isis %s\n",area->area_tag);
write++;
}
/* ISIS - circuit type */
if (circuit->is_type == IS_LEVEL_1)
{
- vty_outln (vty, " isis circuit-type level-1");
+ vty_out (vty, " isis circuit-type level-1\n");
write++;
}
else
{
if (circuit->is_type == IS_LEVEL_2)
{
- vty_outln (vty," isis circuit-type level-2-only");
+ vty_out (vty," isis circuit-type level-2-only\n");
write++;
}
}
{
if (circuit->csnp_interval[0] != DEFAULT_CSNP_INTERVAL)
{
- vty_outln (vty, " isis csnp-interval %d",
+ vty_out (vty, " isis csnp-interval %d\n",
circuit->csnp_interval[0]);
write++;
}
{
if (circuit->csnp_interval[i] != DEFAULT_CSNP_INTERVAL)
{
- vty_outln (vty, " isis csnp-interval %d level-%d",
+ vty_out (vty, " isis csnp-interval %d level-%d\n",
circuit->csnp_interval[i], i + 1);
write++;
}
{
if (circuit->psnp_interval[0] != DEFAULT_PSNP_INTERVAL)
{
- vty_outln (vty, " isis psnp-interval %d",
+ vty_out (vty, " isis psnp-interval %d\n",
circuit->psnp_interval[0]);
write++;
}
{
if (circuit->psnp_interval[i] != DEFAULT_PSNP_INTERVAL)
{
- vty_outln (vty, " isis psnp-interval %d level-%d",
+ vty_out (vty, " isis psnp-interval %d level-%d\n",
circuit->psnp_interval[i], i + 1);
write++;
}
/* ISIS - Hello padding - Defaults to true so only display if false */
if (circuit->pad_hellos == 0)
{
- vty_outln (vty, " no isis hello padding");
+ vty_out (vty, " no isis hello padding\n");
write++;
}
{
if (circuit->hello_interval[0] != DEFAULT_HELLO_INTERVAL)
{
- vty_outln (vty, " isis hello-interval %d",
+ vty_out (vty, " isis hello-interval %d\n",
circuit->hello_interval[0]);
write++;
}
{
if (circuit->hello_interval[i] != DEFAULT_HELLO_INTERVAL)
{
- vty_outln (vty, " isis hello-interval %d level-%d",
+ vty_out (vty, " isis hello-interval %d level-%d\n",
circuit->hello_interval[i], i + 1);
write++;
}
{
if (circuit->hello_multiplier[0] != DEFAULT_HELLO_MULTIPLIER)
{
- vty_outln (vty, " isis hello-multiplier %d",
+ vty_out (vty, " isis hello-multiplier %d\n",
circuit->hello_multiplier[0]);
write++;
}
{
if (circuit->hello_multiplier[i] != DEFAULT_HELLO_MULTIPLIER)
{
- vty_outln (vty, " isis hello-multiplier %d level-%d",
+ vty_out (vty, " isis hello-multiplier %d level-%d\n",
circuit->hello_multiplier[i],i + 1);
write++;
}
{
if (circuit->priority[0] != DEFAULT_PRIORITY)
{
- vty_outln (vty, " isis priority %d",
+ vty_out (vty, " isis priority %d\n",
circuit->priority[0]);
write++;
}
{
if (circuit->priority[i] != DEFAULT_PRIORITY)
{
- vty_outln (vty, " isis priority %d level-%d",
+ vty_out (vty, " isis priority %d level-%d\n",
circuit->priority[i], i + 1);
write++;
}
{
if (circuit->te_metric[0] != DEFAULT_CIRCUIT_METRIC)
{
- vty_outln (vty, " isis metric %d",circuit->te_metric[0]);
+ vty_out (vty, " isis metric %d\n",circuit->te_metric[0]);
write++;
}
}
{
if (circuit->te_metric[i] != DEFAULT_CIRCUIT_METRIC)
{
- vty_outln (vty, " isis metric %d level-%d",
+ vty_out (vty, " isis metric %d level-%d\n",
circuit->te_metric[i], i + 1);
write++;
}
}
if (circuit->passwd.type == ISIS_PASSWD_TYPE_HMAC_MD5)
{
- vty_outln (vty, " isis password md5 %s",
+ vty_out (vty, " isis password md5 %s\n",
circuit->passwd.passwd);
write++;
}
else if (circuit->passwd.type == ISIS_PASSWD_TYPE_CLEARTXT)
{
- vty_outln (vty, " isis password clear %s",
+ vty_out (vty, " isis password clear %s\n",
circuit->passwd.passwd);
write++;
}
write += circuit_write_mt_settings(circuit, vty);
}
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
return write;
struct listnode *node;
struct isis_dynhn *dyn;
- vty_outln (vty, "Level System ID Dynamic Hostname");
+ vty_out (vty, "Level System ID Dynamic Hostname\n");
for (ALL_LIST_ELEMENTS_RO (dyn_cache, node, dyn))
{
vty_out (vty, "%-7d", dyn->level);
- vty_outln (vty, "%-15s%-15s", sysid_print (dyn->id),dyn->name.name);
+ vty_out (vty, "%-15s%-15s\n", sysid_print (dyn->id),dyn->name.name);
}
- vty_outln (vty, " * %s %s", sysid_print (isis->sysid),unix_hostname());
+ vty_out (vty, " * %s %s\n", sysid_print (isis->sysid),unix_hostname());
return;
}
}
else
vty_out (vty, " %5u ", ntohs (lsp->lsp_header->rem_lifetime));
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
lsp_bits2string(&lsp->lsp_header->lsp_bits));
}
lspid_print(neigh->neigh_id, lspid, dynhost, 0);
if (mtid == ISIS_MT_IPV4_UNICAST)
{
- vty_outln(vty, " Metric : %-8u IS-Extended : %s",
+ vty_out(vty, " Metric : %-8u IS-Extended : %s\n",
GET_TE_METRIC(neigh), lspid);
}
else
{
- vty_outln(vty, " Metric : %-8u MT-Reach : %s %s",
+ vty_out(vty, " Metric : %-8u MT-Reach : %s %s\n",
GET_TE_METRIC(neigh), lspid,
isis_mtid2str(mtid));
}
if (lsp->tlv_data.area_addrs)
for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.area_addrs, lnode, area_addr))
{
- vty_outln (vty, " Area Address: %s",
+ vty_out (vty, " Area Address: %s\n",
isonet_print(area_addr->area_addr, area_addr->addr_len));
}
{
case NLPID_IP:
case NLPID_IPV6:
- vty_outln (vty, " NLPID : 0x%X",
+ vty_out (vty, " NLPID : 0x%X\n",
lsp->tlv_data.nlpids->nlpids[i]);
break;
default:
- vty_outln (vty, " NLPID : %s", "unknown");
+ vty_out (vty, " NLPID : %s\n", "unknown");
break;
}
}
for (ALL_LIST_ELEMENTS_RO(lsp->tlv_data.mt_router_info, lnode, mt_router_info))
{
- vty_outln (vty, " MT : %s%s",
+ vty_out (vty, " MT : %s%s\n",
isis_mtid2str(mt_router_info->mtid),
mt_router_info->overload ? " (overload)" : "");
}
bzero (hostname, sizeof (hostname));
memcpy (hostname, lsp->tlv_data.hostname->name,
lsp->tlv_data.hostname->namelen);
- vty_outln (vty, " Hostname : %s", hostname);
+ vty_out (vty, " Hostname : %s\n", hostname);
}
/* authentication tlv */
if (lsp->tlv_data.auth_info.type != ISIS_PASSWD_TYPE_UNUSED)
{
if (lsp->tlv_data.auth_info.type == ISIS_PASSWD_TYPE_HMAC_MD5)
- vty_outln (vty, " Auth type : md5");
+ vty_out (vty, " Auth type : md5\n");
else if (lsp->tlv_data.auth_info.type == ISIS_PASSWD_TYPE_CLEARTXT)
- vty_outln (vty, " Auth type : clear text");
+ vty_out (vty, " Auth type : clear text\n");
}
/* TE router id */
{
memcpy (ipv4_address, inet_ntoa (lsp->tlv_data.router_id->id),
sizeof (ipv4_address));
- vty_outln (vty, " Router ID : %s", ipv4_address);
+ vty_out (vty, " Router ID : %s\n", ipv4_address);
}
if (lsp->tlv_data.ipv4_addrs)
for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.ipv4_addrs, lnode, ipv4_addr))
{
memcpy (ipv4_address, inet_ntoa (*ipv4_addr), sizeof (ipv4_address));
- vty_outln (vty, " IPv4 Address: %s", ipv4_address);
+ vty_out (vty, " IPv4 Address: %s\n", ipv4_address);
}
/* for the IS neighbor tlv */
{
if (setting->mtid == ISIS_MT_IPV4_UNICAST)
continue; /* always enabled, no need to write out config */
- vty_outln (vty, " topology %s%s", name,
+ vty_out (vty, " topology %s%s\n", name,
setting->overload ? " overload" : "");
written++;
}
const char *name = isis_mtid2str(setting->mtid);
if (name && !setting->enabled)
{
- vty_outln (vty, " no isis topology %s", name);
+ vty_out (vty, " no isis topology %s\n", name);
written++;
}
}
if ((area->is_type & level) != level)
{
- vty_outln (vty, "Node is not a level-%d IS", level);
+ vty_out (vty, "Node is not a level-%d IS\n", level);
return CMD_WARNING;
}
if ((area->is_type & level) != level)
{
- vty_outln (vty, "Node is not a level-%d IS", level);
+ vty_out (vty, "Node is not a level-%d IS\n", level);
return CMD_WARNING;
}
if (family == AF_INET6 && originate_type != DEFAULT_ORIGINATE_ALWAYS)
{
- vty_outln (vty,
- "Zebra doesn't implement default-originate for IPv6 yet");
- vty_outln (vty, "so use with care or use default-originate always.");
+ vty_out (vty,
+ "Zebra doesn't implement default-originate for IPv6 yet\n");
+ vty_out (vty, "so use with care or use default-originate always.\n");
}
isis_redist_set(area, level, family, DEFAULT_ROUTE, metric, routemap, originate_type);
for (ALL_LIST_ELEMENTS_RO (isis->area_list, node, area))
{
- vty_outln (vty, "Area %s:",area->area_tag ? area->area_tag : "null");
+ vty_out (vty, "Area %s:\n",area->area_tag ? area->area_tag : "null");
for (int level = ISIS_LEVEL1; level <= ISIS_LEVELS; level++)
{
if (area->ip_circuits > 0 && area->spftree[level-1]
&& area->spftree[level-1]->paths->count > 0)
{
- vty_outln (vty, "IS-IS paths to level-%d routers that speak IP",
+ 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);
if (area->ipv6_circuits > 0 && area->spftree6[level-1]
&& area->spftree6[level-1]->paths->count > 0)
{
- vty_outln (vty,
- "IS-IS paths to level-%d routers that speak IPv6",
+ vty_out (vty,
+ "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);
{
if (vty != NULL)
- vty_outln (vty, " Administrative Group: 0x%x",
+ vty_out (vty, " Administrative Group: 0x%x\n",
(u_int32_t)ntohl(tlv->value));
else
zlog_debug (" Administrative Group: 0x%x",
{
if (vty != NULL)
{
- vty_outln (vty, " Link Local ID: %d",(u_int32_t)ntohl(tlv->local));
- vty_outln (vty, " Link Remote ID: %d",
+ vty_out (vty, " Link Local ID: %d\n",(u_int32_t)ntohl(tlv->local));
+ vty_out (vty, " Link Remote ID: %d\n",
(u_int32_t)ntohl(tlv->remote));
}
else
show_vty_subtlv_local_ipaddr (struct vty *vty, struct te_subtlv_local_ipaddr *tlv)
{
if (vty != NULL)
- vty_outln (vty, " Local Interface IP Address(es): %s",
+ vty_out (vty, " Local Interface IP Address(es): %s\n",
inet_ntoa(tlv->value));
else
zlog_debug (" Local Interface IP Address(es): %s", inet_ntoa (tlv->value));
show_vty_subtlv_rmt_ipaddr (struct vty *vty, struct te_subtlv_rmt_ipaddr *tlv)
{
if (vty != NULL)
- vty_outln (vty, " Remote Interface IP Address(es): %s",
+ vty_out (vty, " Remote Interface IP Address(es): %s\n",
inet_ntoa(tlv->value));
else
zlog_debug (" Remote Interface IP Address(es): %s", inet_ntoa (tlv->value));
fval = ntohf (tlv->value);
if (vty != NULL)
- vty_outln (vty, " Maximum Bandwidth: %g (Bytes/sec)", fval);
+ vty_out (vty, " Maximum Bandwidth: %g (Bytes/sec)\n", fval);
else
zlog_debug (" Maximum Bandwidth: %g (Bytes/sec)", fval);
fval = ntohf (tlv->value);
if (vty != NULL)
- vty_outln (vty, " Maximum Reservable Bandwidth: %g (Bytes/sec)",fval);
+ vty_out (vty, " Maximum Reservable Bandwidth: %g (Bytes/sec)\n",fval);
else
zlog_debug (" Maximum Reservable Bandwidth: %g (Bytes/sec)", fval);
int i;
if (vty != NULL)
- vty_outln (vty, " Unreserved Bandwidth:");
+ vty_out (vty, " Unreserved Bandwidth:\n");
else
zlog_debug (" Unreserved Bandwidth:");
fval1 = ntohf (tlv->value[i]);
fval2 = ntohf (tlv->value[i+1]);
if (vty != NULL)
- vty_outln (vty, " [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)", i, fval1, i+1,
+ vty_out (vty, " [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)\n", i, fval1, i+1,
fval2);
else
zlog_debug (" [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)", i, fval1, i+1, fval2);
te_metric = tlv->value[2] | tlv->value[1] << 8 | tlv->value[0] << 16;
if (vty != NULL)
- vty_outln (vty, " Traffic Engineering Metric: %u", te_metric);
+ vty_out (vty, " Traffic Engineering Metric: %u\n", te_metric);
else
zlog_debug (" Traffic Engineering Metric: %u", te_metric);
show_vty_subtlv_ras (struct vty *vty, struct te_subtlv_ras *tlv)
{
if (vty != NULL)
- vty_outln (vty, " Inter-AS TE Remote AS number: %u",
+ vty_out (vty, " Inter-AS TE Remote AS number: %u\n",
ntohl(tlv->value));
else
zlog_debug (" Inter-AS TE Remote AS number: %u", ntohl (tlv->value));
show_vty_subtlv_rip (struct vty *vty, struct te_subtlv_rip *tlv)
{
if (vty != NULL)
- vty_outln (vty, " Inter-AS TE Remote ASBR IP address: %s",
+ vty_out (vty, " Inter-AS TE Remote ASBR IP address: %s\n",
inet_ntoa(tlv->value));
else
zlog_debug (" Inter-AS TE Remote ASBR IP address: %s", inet_ntoa (tlv->value));
A = (u_int32_t) ntohl (tlv->value) & TE_EXT_ANORMAL;
if (vty != NULL)
- vty_outln (vty, " %s Average Link Delay: %d (micro-sec)", A ? "Anomalous" : "Normal",
+ vty_out (vty, " %s Average Link Delay: %d (micro-sec)\n", A ? "Anomalous" : "Normal",
delay);
else
zlog_debug (" %s Average Link Delay: %d (micro-sec)", A ? "Anomalous" : "Normal", delay);
high = (u_int32_t) ntohl (tlv->high) & TE_EXT_MASK;
if (vty != NULL)
- vty_outln (vty, " %s Min/Max Link Delay: %d / %d (micro-sec)", A ? "Anomalous" : "Normal", low,
+ vty_out (vty, " %s Min/Max Link Delay: %d / %d (micro-sec)\n", A ? "Anomalous" : "Normal", low,
high);
else
zlog_debug (" %s Min/Max Link Delay: %d / %d (micro-sec)", A ? "Anomalous" : "Normal", low, high);
jitter = (u_int32_t) ntohl (tlv->value) & TE_EXT_MASK;
if (vty != NULL)
- vty_outln (vty, " Delay Variation: %d (micro-sec)", jitter);
+ vty_out (vty, " Delay Variation: %d (micro-sec)\n", jitter);
else
zlog_debug (" Delay Variation: %d (micro-sec)", jitter);
A = (u_int32_t) ntohl (tlv->value) & TE_EXT_ANORMAL;
if (vty != NULL)
- vty_outln (vty, " %s Link Packet Loss: %g (%%)", A ? "Anomalous" : "Normal",
+ vty_out (vty, " %s Link Packet Loss: %g (%%)\n", A ? "Anomalous" : "Normal",
fval);
else
zlog_debug (" %s Link Packet Loss: %g (%%)", A ? "Anomalous" : "Normal", fval);
fval = ntohf(tlv->value);
if (vty != NULL)
- vty_outln (vty, " Unidirectional Residual Bandwidth: %g (Bytes/sec)",
+ vty_out (vty, " Unidirectional Residual Bandwidth: %g (Bytes/sec)\n",
fval);
else
zlog_debug (" Unidirectional Residual Bandwidth: %g (Bytes/sec)", fval);
fval = ntohf (tlv->value);
if (vty != NULL)
- vty_outln (vty, " Unidirectional Available Bandwidth: %g (Bytes/sec)",
+ vty_out (vty, " Unidirectional Available Bandwidth: %g (Bytes/sec)\n",
fval);
else
zlog_debug (" Unidirectional Available Bandwidth: %g (Bytes/sec)", fval);
fval = ntohf (tlv->value);
if (vty != NULL)
- vty_outln (vty, " Unidirectional Utilized Bandwidth: %g (Bytes/sec)",
+ vty_out (vty, " Unidirectional Utilized Bandwidth: %g (Bytes/sec)\n",
fval);
else
zlog_debug (" Unidirectional Utilized Bandwidth: %g (Bytes/sec)", fval);
{
if (tlvh->length != 0)
{
- vty_outln (vty, " Unknown TLV: [type(%#.2x), length(%#.2x)]",
+ vty_out (vty, " Unknown TLV: [type(%#.2x), length(%#.2x)]\n",
tlvh->type, tlvh->length);
vty_out(vty, " Dump: [00]");
rtn = 1; /* initialize end of line counter */
vty_out (vty, VTYNL);
}
else
- vty_outln (vty, " Unknown TLV: [type(%#.2x), length(%#.2x)]",
+ vty_out (vty, " Unknown TLV: [type(%#.2x), length(%#.2x)]\n",
tlvh->type, tlvh->length);
}
else
{
if (IS_MPLS_TE(isisMplsTE))
{
- vty_outln (vty, " mpls-te on");
- vty_outln (vty, " mpls-te router-address %s",
+ vty_out (vty, " mpls-te on\n");
+ vty_out (vty, " mpls-te router-address %s\n",
inet_ntoa(isisMplsTE.router_id));
}
if (! inet_aton (argv[idx_ipv4]->arg, &value))
{
- vty_outln (vty, "Please specify Router-Addr by A.B.C.D");
+ vty_out (vty, "Please specify Router-Addr by A.B.C.D\n");
return CMD_WARNING;
}
"AREA native mode self originate INTER-AS LSP with L1 and L2 flooding scope)\n"
"AS native mode self originate INTER-AS LSP with L2 only flooding scope\n")
{
- vty_outln (vty, "Not yet supported");
+ vty_out (vty, "Not yet supported\n");
return CMD_SUCCESS;
}
"Disable MPLS-TE Inter-AS support\n")
{
- vty_outln (vty, "Not yet supported");
+ vty_out (vty, "Not yet supported\n");
return CMD_SUCCESS;
}
{
if (IS_MPLS_TE(isisMplsTE))
{
- vty_outln (vty, "--- MPLS-TE router parameters ---");
+ vty_out (vty, "--- MPLS-TE router parameters ---\n");
if (ntohs (isisMplsTE.router_id.s_addr) != 0)
- vty_outln (vty, " Router-Address: %s",
+ vty_out (vty, " Router-Address: %s\n",
inet_ntoa(isisMplsTE.router_id));
else
- vty_outln (vty, " N/A");
+ vty_out (vty, " N/A\n");
}
else
- vty_outln (vty, " MPLS-TE is disable on this router");
+ vty_out (vty, " MPLS-TE is disable on this router\n");
return CMD_SUCCESS;
}
{
if (IS_INTER_AS(mtc->type))
{
- vty_outln (vty, "-- Inter-AS TEv2 link parameters for %s --",
+ vty_out (vty, "-- Inter-AS TEv2 link parameters for %s --\n",
ifp->name);
}
else
{
/* MPLS-TE is not activate on this interface */
/* or this interface is passive and Inter-AS TEv2 is not activate */
- vty_outln (vty, " %s: MPLS-TE is disabled on this interface",
+ vty_out (vty, " %s: MPLS-TE is disabled on this interface\n",
ifp->name);
return;
}
}
else
{
- vty_outln (vty, "-- MPLS-TE link parameters for %s --",
+ vty_out (vty, "-- MPLS-TE link parameters for %s --\n",
ifp->name);
}
show_vty_subtlv_res_bw (vty, &mtc->res_bw);
show_vty_subtlv_ava_bw (vty, &mtc->ava_bw);
show_vty_subtlv_use_bw (vty, &mtc->use_bw);
- vty_outln (vty, "---------------%s", VTYNL);
+ vty_out (vty, "---------------%s\n", VTYNL);
}
else
{
- vty_outln (vty, " %s: MPLS-TE is disabled on this interface",
+ vty_out (vty, " %s: MPLS-TE is disabled on this interface\n",
ifp->name);
}
else
{
if ((ifp = if_lookup_by_name (argv[idx_interface]->arg, VRF_DEFAULT)) == NULL)
- vty_outln (vty, "No such interface name");
+ vty_out (vty, "No such interface name\n");
else
show_mpls_te_sub (vty, ifp);
}
if (!ifp)
{
- vty_outln (vty, "Invalid interface ");
+ vty_out (vty, "Invalid interface \n");
return NULL;
}
circuit = circuit_scan_by_ifp (ifp);
if (!circuit)
{
- vty_outln (vty, "ISIS is not enabled on circuit %s",
+ vty_out (vty, "ISIS is not enabled on circuit %s\n",
ifp->name);
return NULL;
}
{
if (strcmp (circuit->area->area_tag, area_tag))
{
- vty_outln (vty, "ISIS circuit is already defined on %s",
+ vty_out (vty, "ISIS circuit is already defined on %s\n",
circuit->area->area_tag);
return CMD_ERR_NOTHING_TODO;
}
if (circuit->state != C_STATE_CONF && circuit->state != C_STATE_UP)
{
- vty_outln (vty, "Couldn't bring up interface, please check log.");
+ vty_out (vty, "Couldn't bring up interface, please check log.\n");
return CMD_WARNING;
}
}
area = isis_area_lookup (area_tag);
if (!area)
{
- vty_outln (vty, "Can't find ISIS instance %s",
+ vty_out (vty, "Can't find ISIS instance %s\n",
argv[idx_afi]->arg);
return CMD_ERR_NO_MATCH;
}
circuit = circuit_lookup_by_ifp (ifp, area->circuit_list);
if (!circuit)
{
- vty_outln (vty, "ISIS is not enabled on circuit %s",
+ vty_out (vty, "ISIS is not enabled on circuit %s\n",
ifp->name);
return CMD_ERR_NO_MATCH;
}
if (if_is_loopback (circuit->interface))
{
- vty_outln (vty,"Can't set no passive for loopback interface");
+ vty_out (vty,"Can't set no passive for loopback interface\n");
return CMD_ERR_AMBIGUOUS;
}
is_type = string2circuit_t (argv[idx_level]->arg);
if (!is_type)
{
- vty_outln (vty, "Unknown circuit-type ");
+ vty_out (vty, "Unknown circuit-type \n");
return CMD_ERR_AMBIGUOUS;
}
circuit->area->is_type != IS_LEVEL_1_AND_2 &&
circuit->area->is_type != is_type)
{
- vty_outln (vty, "Invalid circuit level for area %s.",
+ vty_out (vty, "Invalid circuit level for area %s.\n",
circuit->area->area_tag);
return CMD_ERR_AMBIGUOUS;
}
rv = isis_circuit_passwd_cleartext_set(circuit, argv[idx_word]->arg);
if (rv)
{
- vty_outln (vty, "Too long circuit password (>254)");
+ vty_out (vty, "Too long circuit password (>254)\n");
return CMD_ERR_AMBIGUOUS;
}
prio = atoi (argv[idx_number]->arg);
if (prio < MIN_PRIORITY || prio > MAX_PRIORITY)
{
- vty_outln (vty, "Invalid priority %d - should be <0-127>",
+ vty_out (vty, "Invalid priority %d - should be <0-127>\n",
prio);
return CMD_ERR_AMBIGUOUS;
}
prio = atoi (argv[idx_number]->arg);
if (prio < MIN_PRIORITY || prio > MAX_PRIORITY)
{
- vty_outln (vty, "Invalid priority %d - should be <0-127>",
+ vty_out (vty, "Invalid priority %d - should be <0-127>\n",
prio);
return CMD_ERR_AMBIGUOUS;
}
prio = atoi (argv[idx_number]->arg);
if (prio < MIN_PRIORITY || prio > MAX_PRIORITY)
{
- vty_outln (vty, "Invalid priority %d - should be <0-127>",
+ vty_out (vty, "Invalid priority %d - should be <0-127>\n",
prio);
return CMD_ERR_AMBIGUOUS;
}
interval = atoi (argv[idx_number]->arg);
if (interval < MIN_HELLO_INTERVAL || interval > MAX_HELLO_INTERVAL)
{
- vty_outln (vty, "Invalid hello-interval %d - should be <1-600>",
+ vty_out (vty, "Invalid hello-interval %d - should be <1-600>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
interval = atoi (argv[idx_number]->arg);
if (interval < MIN_HELLO_INTERVAL || interval > MAX_HELLO_INTERVAL)
{
- vty_outln (vty, "Invalid hello-interval %ld - should be <1-600>",
+ vty_out (vty, "Invalid hello-interval %ld - should be <1-600>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
interval = atoi (argv[idx_number]->arg);
if (interval < MIN_HELLO_INTERVAL || interval > MAX_HELLO_INTERVAL)
{
- vty_outln (vty, "Invalid hello-interval %ld - should be <1-600>",
+ vty_out (vty, "Invalid hello-interval %ld - should be <1-600>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
mult = atoi (argv[idx_number]->arg);
if (mult < MIN_HELLO_MULTIPLIER || mult > MAX_HELLO_MULTIPLIER)
{
- vty_outln (vty, "Invalid hello-multiplier %d - should be <2-100>",
+ vty_out (vty, "Invalid hello-multiplier %d - should be <2-100>\n",
mult);
return CMD_ERR_AMBIGUOUS;
}
mult = atoi (argv[idx_number]->arg);
if (mult < MIN_HELLO_MULTIPLIER || mult > MAX_HELLO_MULTIPLIER)
{
- vty_outln (vty, "Invalid hello-multiplier %d - should be <2-100>",
+ vty_out (vty, "Invalid hello-multiplier %d - should be <2-100>\n",
mult);
return CMD_ERR_AMBIGUOUS;
}
mult = atoi (argv[idx_number]->arg);
if (mult < MIN_HELLO_MULTIPLIER || mult > MAX_HELLO_MULTIPLIER)
{
- vty_outln (vty, "Invalid hello-multiplier %d - should be <2-100>",
+ vty_out (vty, "Invalid hello-multiplier %d - should be <2-100>\n",
mult);
return CMD_ERR_AMBIGUOUS;
}
interval = atol (argv[idx_number]->arg);
if (interval < MIN_CSNP_INTERVAL || interval > MAX_CSNP_INTERVAL)
{
- vty_outln (vty, "Invalid csnp-interval %lu - should be <1-600>",
+ vty_out (vty, "Invalid csnp-interval %lu - should be <1-600>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
interval = atol (argv[idx_number]->arg);
if (interval < MIN_CSNP_INTERVAL || interval > MAX_CSNP_INTERVAL)
{
- vty_outln (vty, "Invalid csnp-interval %lu - should be <1-600>",
+ vty_out (vty, "Invalid csnp-interval %lu - should be <1-600>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
interval = atol (argv[idx_number]->arg);
if (interval < MIN_CSNP_INTERVAL || interval > MAX_CSNP_INTERVAL)
{
- vty_outln (vty, "Invalid csnp-interval %lu - should be <1-600>",
+ vty_out (vty, "Invalid csnp-interval %lu - should be <1-600>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
interval = atol (argv[idx_number]->arg);
if (interval < MIN_PSNP_INTERVAL || interval > MAX_PSNP_INTERVAL)
{
- vty_outln (vty, "Invalid psnp-interval %lu - should be <1-120>",
+ vty_out (vty, "Invalid psnp-interval %lu - should be <1-120>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
interval = atol (argv[idx_number]->arg);
if (interval < MIN_PSNP_INTERVAL || interval > MAX_PSNP_INTERVAL)
{
- vty_outln (vty, "Invalid psnp-interval %lu - should be <1-120>",
+ vty_out (vty, "Invalid psnp-interval %lu - should be <1-120>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
interval = atol (argv[idx_number]->arg);
if (interval < MIN_PSNP_INTERVAL || interval > MAX_PSNP_INTERVAL)
{
- vty_outln (vty, "Invalid psnp-interval %lu - should be <1-120>",
+ vty_out (vty, "Invalid psnp-interval %lu - should be <1-120>\n",
interval);
return CMD_ERR_AMBIGUOUS;
}
if (circuit->area && circuit->area->oldmetric)
{
- vty_outln (vty,
- "Multi topology IS-IS can only be used with wide metrics");
+ vty_out (vty,
+ "Multi topology IS-IS can only be used with wide metrics\n");
return CMD_ERR_AMBIGUOUS;
}
if (mtid == (uint16_t)-1)
{
- vty_outln (vty, "Don't know topology '%s'", arg);
+ vty_out (vty, "Don't know topology '%s'\n", arg);
return CMD_ERR_AMBIGUOUS;
}
if (circuit->area && circuit->area->oldmetric)
{
- vty_outln (vty,
- "Multi topology IS-IS can only be used with wide metrics");
+ vty_out (vty,
+ "Multi topology IS-IS can only be used with wide metrics\n");
return CMD_ERR_AMBIGUOUS;
}
if (mtid == (uint16_t)-1)
{
- vty_outln (vty, "Don't know topology '%s'", arg);
+ vty_out (vty, "Don't know topology '%s'\n", arg);
return CMD_ERR_AMBIGUOUS;
}
if (! area)
{
- vty_outln (vty, "ISIS area is invalid");
+ vty_out (vty, "ISIS area is invalid\n");
return CMD_ERR_AMBIGUOUS;
}
(circuit->is_type & IS_LEVEL_1) &&
(circuit->te_metric[0] > MAX_NARROW_LINK_METRIC))
{
- vty_outln (vty, "ISIS circuit %s metric is invalid",
+ vty_out (vty, "ISIS circuit %s metric is invalid\n",
circuit->interface->name);
return CMD_ERR_AMBIGUOUS;
}
(circuit->is_type & IS_LEVEL_2) &&
(circuit->te_metric[1] > MAX_NARROW_LINK_METRIC))
{
- vty_outln (vty, "ISIS circuit %s metric is invalid",
+ vty_out (vty, "ISIS circuit %s metric is invalid\n",
circuit->interface->name);
return CMD_ERR_AMBIGUOUS;
}
if (area_is_mt(area))
{
- vty_outln (vty,
- "Narrow metrics cannot be used while multi topology IS-IS is active");
+ vty_out (vty,
+ "Narrow metrics cannot be used while multi topology IS-IS is active\n");
return CMD_ERR_AMBIGUOUS;
}
if (area_is_mt(area))
{
- vty_outln (vty,
- "Narrow metrics cannot be used while multi topology IS-IS is active");
+ vty_out (vty,
+ "Narrow metrics cannot be used while multi topology IS-IS is active\n");
return CMD_ERR_AMBIGUOUS;
}
continue;
if(lsp_mtu > isis_circuit_pdu_size(circuit))
{
- vty_outln (vty, "ISIS area contains circuit %s, which has a maximum PDU size of %zu.",
+ vty_out (vty, "ISIS area contains circuit %s, which has a maximum PDU size of %zu.\n",
circuit->interface->name,isis_circuit_pdu_size(circuit));
return CMD_ERR_AMBIGUOUS;
}
type = string2circuit_t (argv[idx_level]->arg);
if (!type)
{
- vty_outln (vty, "Unknown IS level ");
+ vty_out (vty, "Unknown IS level \n");
return CMD_SUCCESS;
}
if (passwd && strlen(passwd) > 254)
{
- vty_outln (vty, "Too long area password (>254)");
+ vty_out (vty, "Too long area password (>254)\n");
return CMD_ERR_AMBIGUOUS;
}
if (area == NULL)
{
- vty_outln (vty, "Can't find ISIS instance ");
+ vty_out (vty, "Can't find ISIS instance \n");
return CMD_ERR_NO_MATCH;
}
/* We check that we are not over the maximal number of addresses */
if (listcount (area->area_addrs) >= isis->max_area_addrs)
{
- vty_outln (vty, "Maximum of area addresses (%d) already reached ",
+ vty_out (vty, "Maximum of area addresses (%d) already reached \n",
isis->max_area_addrs);
return CMD_ERR_NOTHING_TODO;
}
#endif /* EXTREME_DEBUG */
if (addr->addr_len < 8 || addr->addr_len > 20)
{
- vty_outln (vty, "area address must be at least 8..20 octets long (%d)",
+ vty_out (vty, "area address must be at least 8..20 octets long (%d)\n",
addr->addr_len);
XFREE (MTYPE_ISIS_AREA_ADDR, addr);
return CMD_ERR_AMBIGUOUS;
if (addr->area_addr[addr->addr_len-1] != 0)
{
- vty_outln (vty,"nsel byte (last byte) in area address must be 0");
+ vty_out (vty,"nsel byte (last byte) in area address must be 0\n");
XFREE (MTYPE_ISIS_AREA_ADDR, addr);
return CMD_ERR_AMBIGUOUS;
}
addr.addr_len = dotformat2buff (buff, net_title);
if (addr.addr_len < 8 || addr.addr_len > 20)
{
- vty_outln (vty, "Unsupported area address length %d, should be 8...20 ",
+ vty_out (vty, "Unsupported area address length %d, should be 8...20 \n",
addr.addr_len);
return CMD_ERR_AMBIGUOUS;
}
if (!addrp)
{
- vty_outln (vty, "No area address %s for area %s ", net_title,
+ vty_out (vty, "No area address %s for area %s \n", net_title,
area->area_tag);
return CMD_ERR_NO_MATCH;
}
if (!isis)
{
- vty_outln (vty, "IS-IS Routing Process not enabled");
+ vty_out (vty, "IS-IS Routing Process not enabled\n");
return CMD_SUCCESS;
}
for (ALL_LIST_ELEMENTS_RO (isis->area_list, anode, area))
{
- vty_outln (vty, "Area %s:", area->area_tag);
+ vty_out (vty, "Area %s:\n", area->area_tag);
if (detail == ISIS_UI_LEVEL_BRIEF)
- vty_outln (vty," Interface CircId State Type Level");
+ vty_out (vty," Interface CircId State Type Level\n");
for (ALL_LIST_ELEMENTS_RO (area->circuit_list, cnode, circuit))
if (!ifname)
if (!isis)
{
- vty_outln (vty, "IS-IS Routing Process not enabled");
+ vty_out (vty, "IS-IS Routing Process not enabled\n");
return CMD_SUCCESS;
}
dynhn = dynhn_find_by_name (id);
if (dynhn == NULL)
{
- vty_outln (vty, "Invalid system id %s", id);
+ vty_out (vty, "Invalid system id %s\n", id);
return CMD_SUCCESS;
}
memcpy (sysid, dynhn->id, ISIS_SYS_ID_LEN);
for (ALL_LIST_ELEMENTS_RO (isis->area_list, anode, area))
{
- vty_outln (vty, "Area %s:", area->area_tag);
+ vty_out (vty, "Area %s:\n", area->area_tag);
if (detail == ISIS_UI_LEVEL_BRIEF)
vty_outln (vty,
if (!isis)
{
- vty_outln (vty, "IS-IS Routing Process not enabled");
+ vty_out (vty, "IS-IS Routing Process not enabled\n");
return CMD_SUCCESS;
}
dynhn = dynhn_find_by_name (id);
if (dynhn == NULL)
{
- vty_outln (vty, "Invalid system id %s", id);
+ vty_out (vty, "Invalid system id %s\n", id);
return CMD_SUCCESS;
}
memcpy (sysid, dynhn->id, ISIS_SYS_ID_LEN);
strcpy (onoffs, "off");
if (flags & DEBUG_ADJ_PACKETS)
- vty_outln (vty, "IS-IS Adjacency related packets debugging is %s",
+ vty_out (vty, "IS-IS Adjacency related packets debugging is %s\n",
onoffs);
if (flags & DEBUG_CHECKSUM_ERRORS)
- vty_outln (vty, "IS-IS checksum errors debugging is %s",onoffs);
+ vty_out (vty, "IS-IS checksum errors debugging is %s\n",onoffs);
if (flags & DEBUG_LOCAL_UPDATES)
- vty_outln (vty, "IS-IS local updates debugging is %s",onoffs);
+ vty_out (vty, "IS-IS local updates debugging is %s\n",onoffs);
if (flags & DEBUG_PROTOCOL_ERRORS)
- vty_outln (vty, "IS-IS protocol errors debugging is %s",onoffs);
+ vty_out (vty, "IS-IS protocol errors debugging is %s\n",onoffs);
if (flags & DEBUG_SNP_PACKETS)
- vty_outln (vty, "IS-IS CSNP/PSNP packets debugging is %s",onoffs);
+ vty_out (vty, "IS-IS CSNP/PSNP packets debugging is %s\n",onoffs);
if (flags & DEBUG_SPF_EVENTS)
- vty_outln (vty, "IS-IS SPF events debugging is %s", onoffs);
+ vty_out (vty, "IS-IS SPF events debugging is %s\n", onoffs);
if (flags & DEBUG_SPF_STATS)
- vty_outln (vty, "IS-IS SPF Timing and Statistics Data debugging is %s",
+ vty_out (vty, "IS-IS SPF Timing and Statistics Data debugging is %s\n",
onoffs);
if (flags & DEBUG_SPF_TRIGGERS)
- vty_outln (vty, "IS-IS SPF triggering events debugging is %s",onoffs);
+ vty_out (vty, "IS-IS SPF triggering events debugging is %s\n",onoffs);
if (flags & DEBUG_UPDATE_PACKETS)
- vty_outln (vty, "IS-IS Update related packet debugging is %s",onoffs);
+ vty_out (vty, "IS-IS Update related packet debugging is %s\n",onoffs);
if (flags & DEBUG_RTE_EVENTS)
- vty_outln (vty, "IS-IS Route related debuggin is %s",onoffs);
+ vty_out (vty, "IS-IS Route related debuggin is %s\n",onoffs);
if (flags & DEBUG_EVENTS)
- vty_outln (vty, "IS-IS Event debugging is %s", onoffs);
+ vty_out (vty, "IS-IS Event debugging is %s\n", onoffs);
if (flags & DEBUG_PACKET_DUMP)
- vty_outln (vty, "IS-IS Packet dump debugging is %s", onoffs);
+ vty_out (vty, "IS-IS Packet dump debugging is %s\n", onoffs);
if (flags & DEBUG_LSP_GEN)
- vty_outln (vty, "IS-IS LSP generation debugging is %s", onoffs);
+ vty_out (vty, "IS-IS LSP generation debugging is %s\n", onoffs);
if (flags & DEBUG_LSP_SCHED)
- vty_outln (vty, "IS-IS LSP scheduling debugging is %s", onoffs);
+ vty_out (vty, "IS-IS LSP scheduling debugging is %s\n", onoffs);
}
DEFUN (show_debugging,
ISIS_STR)
{
if (isis->debugs) {
- vty_outln (vty, "IS-IS:");
+ vty_out (vty, "IS-IS:\n");
print_debug (vty, isis->debugs, 1);
}
return CMD_SUCCESS;
if (flags & DEBUG_ADJ_PACKETS)
{
- vty_outln (vty, "debug isis adj-packets");
+ vty_out (vty, "debug isis adj-packets\n");
write++;
}
if (flags & DEBUG_CHECKSUM_ERRORS)
{
- vty_outln (vty, "debug isis checksum-errors");
+ vty_out (vty, "debug isis checksum-errors\n");
write++;
}
if (flags & DEBUG_LOCAL_UPDATES)
{
- vty_outln (vty, "debug isis local-updates");
+ vty_out (vty, "debug isis local-updates\n");
write++;
}
if (flags & DEBUG_PROTOCOL_ERRORS)
{
- vty_outln (vty, "debug isis protocol-errors");
+ vty_out (vty, "debug isis protocol-errors\n");
write++;
}
if (flags & DEBUG_SNP_PACKETS)
{
- vty_outln (vty, "debug isis snp-packets");
+ vty_out (vty, "debug isis snp-packets\n");
write++;
}
if (flags & DEBUG_SPF_EVENTS)
{
- vty_outln (vty, "debug isis spf-events");
+ vty_out (vty, "debug isis spf-events\n");
write++;
}
if (flags & DEBUG_SPF_STATS)
{
- vty_outln (vty, "debug isis spf-statistics");
+ vty_out (vty, "debug isis spf-statistics\n");
write++;
}
if (flags & DEBUG_SPF_TRIGGERS)
{
- vty_outln (vty, "debug isis spf-triggers");
+ vty_out (vty, "debug isis spf-triggers\n");
write++;
}
if (flags & DEBUG_UPDATE_PACKETS)
{
- vty_outln (vty, "debug isis update-packets");
+ vty_out (vty, "debug isis update-packets\n");
write++;
}
if (flags & DEBUG_RTE_EVENTS)
{
- vty_outln (vty, "debug isis route-events");
+ vty_out (vty, "debug isis route-events\n");
write++;
}
if (flags & DEBUG_EVENTS)
{
- vty_outln (vty, "debug isis events");
+ vty_out (vty, "debug isis events\n");
write++;
}
if (flags & DEBUG_PACKET_DUMP)
{
- vty_outln (vty, "debug isis packet-dump");
+ vty_out (vty, "debug isis packet-dump\n");
write++;
}
if (flags & DEBUG_LSP_GEN)
{
- vty_outln (vty, "debug isis lsp-gen");
+ vty_out (vty, "debug isis lsp-gen\n");
write++;
}
if (flags & DEBUG_LSP_SCHED)
{
- vty_outln (vty, "debug isis lsp-sched");
+ vty_out (vty, "debug isis lsp-sched\n");
write++;
}
write += spf_backoff_write_config(vty);
{
if (!isis)
{
- vty_outln (vty, "ISIS is not running");
+ vty_out (vty, "ISIS is not running\n");
return CMD_SUCCESS;
}
for (ALL_LIST_ELEMENTS_RO (isis->area_list, node, area))
{
- vty_outln (vty, "Area %s:",area->area_tag ? area->area_tag : "null");
+ vty_out (vty, "Area %s:\n",area->area_tag ? area->area_tag : "null");
for (int level = ISIS_LEVEL1; level <= ISIS_LEVELS; level++)
{
if ((area->is_type & level) == 0)
continue;
- vty_outln (vty, " Level-%d:", level);
+ vty_out (vty, " Level-%d:\n", level);
vty_out (vty, " SPF delay status: ");
if (area->spf_timer[level -1])
{
struct timeval remain = thread_timer_remain(area->spf_timer[level - 1]);
- vty_outln (vty, "Pending, due in %ld msec",
+ vty_out (vty, "Pending, due in %ld msec\n",
remain.tv_sec * 1000 + remain.tv_usec / 1000);
}
else
{
- vty_outln (vty, "Not scheduled");
+ vty_out (vty, "Not scheduled\n");
}
if (area->spf_delay_ietf[level - 1]) {
- vty_outln (vty, " Using draft-ietf-rtgwg-backoff-algo-04");
+ vty_out (vty, " Using draft-ietf-rtgwg-backoff-algo-04\n");
spf_backoff_show(area->spf_delay_ietf[level - 1], vty, " ");
} else {
- vty_outln (vty, " Using legacy backoff algo");
+ vty_out (vty, " Using legacy backoff algo\n");
}
}
}
if (isis == NULL)
{
- vty_outln (vty, "ISIS is not running");
+ vty_out (vty, "ISIS is not running\n");
return CMD_SUCCESS;
}
- vty_outln (vty, "Process Id : %ld",isis->process_id);
+ vty_out (vty, "Process Id : %ld\n",isis->process_id);
if (isis->sysid_set)
- vty_outln (vty, "System Id : %s",sysid_print(isis->sysid));
+ vty_out (vty, "System Id : %s\n",sysid_print(isis->sysid));
vty_out (vty, "Up time : ");
vty_out_timestr(vty, isis->uptime);
vty_out (vty, VTYNL);
if (isis->area_list)
- vty_outln (vty, "Number of areas : %d",isis->area_list->count);
+ vty_out (vty, "Number of areas : %d\n",isis->area_list->count);
for (ALL_LIST_ELEMENTS_RO (isis->area_list, node, area))
{
- vty_outln (vty, "Area %s:",area->area_tag ? area->area_tag : "null");
+ vty_out (vty, "Area %s:\n",area->area_tag ? area->area_tag : "null");
if (listcount (area->area_addrs) > 0)
{
struct area_addr *area_addr;
for (ALL_LIST_ELEMENTS_RO (area->area_addrs, node2, area_addr))
{
- vty_outln (vty, " Net: %s",
+ vty_out (vty, " Net: %s\n",
isonet_print(area_addr->area_addr, area_addr->addr_len + ISIS_SYS_ID_LEN + 1));
}
}
if ((area->is_type & level) == 0)
continue;
- vty_outln (vty, " Level-%d:", level);
+ vty_out (vty, " Level-%d:\n", level);
spftree = area->spftree[level - 1];
if (area->spf_timer[level - 1])
- vty_outln (vty, " SPF: (pending)");
+ vty_out (vty, " SPF: (pending)\n");
else
- vty_outln (vty, " SPF:");
+ vty_out (vty, " SPF:\n");
vty_out (vty, " minimum interval : %d",
area->min_spf_interval[level - 1]);
vty_out (vty, " (not used, IETF SPF delay activated)");
vty_out (vty, VTYNL);
- vty_outln (vty, " IPv4 route computation:");
+ 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_outln (vty, " last run duration : %u usec",
+ vty_out (vty, " last run duration : %u usec\n",
(u_int32_t)spftree->last_run_duration);
- vty_outln (vty, " run count : %d",
+ vty_out (vty, " run count : %d\n",
spftree->runcount);
spftree = area->spftree6[level - 1];
- vty_outln (vty, " IPv6 route computation:");
+ vty_out (vty, " IPv6 route computation:\n");
vty_out (vty, " last run elapsed : ");
vty_out_timestr(vty, spftree->last_run_timestamp);
vty_out (vty, VTYNL);
- vty_outln (vty, " last run duration : %llu msec",
+ vty_out (vty, " last run duration : %llu msec\n",
(unsigned long long)spftree->last_run_duration);
- vty_outln (vty, " run count : %d",
+ vty_out (vty, " run count : %d\n",
spftree->runcount);
}
}
for (ALL_LIST_ELEMENTS_RO (isis->area_list, node, area))
{
- vty_outln (vty, "Area %s:",area->area_tag ? area->area_tag : "null");
+ vty_out (vty, "Area %s:\n",area->area_tag ? area->area_tag : "null");
for (level = 0; level < ISIS_LEVELS; level++)
{
if (lsp != NULL || argv == NULL)
{
- vty_outln (vty, "IS-IS Level-%d link-state database:",
+ vty_out (vty, "IS-IS Level-%d link-state database:\n",
level + 1);
/* print the title in all cases */
ui_level,
area->dynhostname);
- vty_outln (vty, " %u LSPs%s",
+ vty_out (vty, " %u LSPs%s\n",
lsp_count, VTYNL);
}
}
if (area->oldmetric)
{
- vty_outln (vty,
- "Multi topology IS-IS can only be used with wide metrics");
+ vty_out (vty,
+ "Multi topology IS-IS can only be used with wide metrics\n");
return CMD_ERR_AMBIGUOUS;
}
if (mtid == (uint16_t)-1)
{
- vty_outln (vty, "Don't know topology '%s'", arg);
+ vty_out (vty, "Don't know topology '%s'\n", arg);
return CMD_ERR_AMBIGUOUS;
}
if (mtid == ISIS_MT_IPV4_UNICAST)
{
- vty_outln (vty, "Cannot configure IPv4 unicast topology");
+ vty_out (vty, "Cannot configure IPv4 unicast topology\n");
return CMD_ERR_AMBIGUOUS;
}
if (area->oldmetric)
{
- vty_outln (vty,
- "Multi topology IS-IS can only be used with wide metrics");
+ vty_out (vty,
+ "Multi topology IS-IS can only be used with wide metrics\n");
return CMD_ERR_AMBIGUOUS;
}
if (mtid == (uint16_t)-1)
{
- vty_outln (vty, "Don't know topology '%s'", arg);
+ vty_out (vty, "Don't know topology '%s'\n", arg);
return CMD_ERR_AMBIGUOUS;
}
if (mtid == ISIS_MT_IPV4_UNICAST)
{
- vty_outln (vty, "Cannot configure IPv4 unicast topology");
+ vty_out (vty, "Cannot configure IPv4 unicast topology\n");
return CMD_ERR_AMBIGUOUS;
}
for (ALL_LIST_ELEMENTS_RO (isis->area_list, node, area))
{
/* ISIS - Area name */
- vty_outln (vty, "router isis %s", area->area_tag);
+ vty_out (vty, "router isis %s\n", area->area_tag);
write++;
/* ISIS - Net */
if (listcount (area->area_addrs) > 0)
struct area_addr *area_addr;
for (ALL_LIST_ELEMENTS_RO (area->area_addrs, node2, area_addr))
{
- vty_outln (vty, " net %s",
+ vty_out (vty, " net %s\n",
isonet_print(area_addr->area_addr, area_addr->addr_len + ISIS_SYS_ID_LEN + 1));
write++;
}
* false. */
if (!area->dynhostname)
{
- vty_outln (vty, " no hostname dynamic");
+ vty_out (vty, " no hostname dynamic\n");
write++;
}
/* ISIS - Metric-Style - when true displays wide */
if (area->newmetric)
{
if (!area->oldmetric)
- vty_outln (vty, " metric-style wide");
+ vty_out (vty, " metric-style wide\n");
else
- vty_outln (vty, " metric-style transition");
+ vty_out (vty, " metric-style transition\n");
write++;
}
else
{
- vty_outln (vty, " metric-style narrow");
+ vty_out (vty, " metric-style narrow\n");
write++;
}
/* ISIS - overload-bit */
if (area->overload_bit)
{
- vty_outln (vty, " set-overload-bit");
+ vty_out (vty, " set-overload-bit\n");
write++;
}
/* ISIS - Area is-type (level-1-2 is default) */
if (area->is_type == IS_LEVEL_1)
{
- vty_outln (vty, " is-type level-1");
+ vty_out (vty, " is-type level-1\n");
write++;
}
else if (area->is_type == IS_LEVEL_2)
{
- vty_outln (vty, " is-type level-2-only");
+ vty_out (vty, " is-type level-2-only\n");
write++;
}
write += isis_redist_config_write(vty, area, AF_INET);
{
if (area->lsp_gen_interval[0] != DEFAULT_MIN_LSP_GEN_INTERVAL)
{
- vty_outln (vty, " lsp-gen-interval %d",
+ vty_out (vty, " lsp-gen-interval %d\n",
area->lsp_gen_interval[0]);
write++;
}
{
if (area->lsp_gen_interval[0] != DEFAULT_MIN_LSP_GEN_INTERVAL)
{
- vty_outln (vty, " lsp-gen-interval level-1 %d",
+ vty_out (vty, " lsp-gen-interval level-1 %d\n",
area->lsp_gen_interval[0]);
write++;
}
if (area->lsp_gen_interval[1] != DEFAULT_MIN_LSP_GEN_INTERVAL)
{
- vty_outln (vty, " lsp-gen-interval level-2 %d",
+ vty_out (vty, " lsp-gen-interval level-2 %d\n",
area->lsp_gen_interval[1]);
write++;
}
{
if (area->max_lsp_lifetime[0] != DEFAULT_LSP_LIFETIME)
{
- vty_outln (vty, " max-lsp-lifetime %u",
+ vty_out (vty, " max-lsp-lifetime %u\n",
area->max_lsp_lifetime[0]);
write++;
}
{
if (area->max_lsp_lifetime[0] != DEFAULT_LSP_LIFETIME)
{
- vty_outln (vty, " max-lsp-lifetime level-1 %u",
+ vty_out (vty, " max-lsp-lifetime level-1 %u\n",
area->max_lsp_lifetime[0]);
write++;
}
if (area->max_lsp_lifetime[1] != DEFAULT_LSP_LIFETIME)
{
- vty_outln (vty, " max-lsp-lifetime level-2 %u",
+ vty_out (vty, " max-lsp-lifetime level-2 %u\n",
area->max_lsp_lifetime[1]);
write++;
}
{
if (area->lsp_refresh[0] != DEFAULT_MAX_LSP_GEN_INTERVAL)
{
- vty_outln (vty, " lsp-refresh-interval %u",
+ vty_out (vty, " lsp-refresh-interval %u\n",
area->lsp_refresh[0]);
write++;
}
{
if (area->lsp_refresh[0] != DEFAULT_MAX_LSP_GEN_INTERVAL)
{
- vty_outln (vty, " lsp-refresh-interval level-1 %u",
+ vty_out (vty, " lsp-refresh-interval level-1 %u\n",
area->lsp_refresh[0]);
write++;
}
if (area->lsp_refresh[1] != DEFAULT_MAX_LSP_GEN_INTERVAL)
{
- vty_outln (vty, " lsp-refresh-interval level-2 %u",
+ vty_out (vty, " lsp-refresh-interval level-2 %u\n",
area->lsp_refresh[1]);
write++;
}
}
if (area->lsp_mtu != DEFAULT_LSP_MTU)
{
- vty_outln (vty, " lsp-mtu %u", area->lsp_mtu);
+ vty_out (vty, " lsp-mtu %u\n", area->lsp_mtu);
write++;
}
{
if (area->min_spf_interval[0] != MINIMUM_SPF_INTERVAL)
{
- vty_outln (vty, " spf-interval %d",
+ vty_out (vty, " spf-interval %d\n",
area->min_spf_interval[0]);
write++;
}
{
if (area->min_spf_interval[0] != MINIMUM_SPF_INTERVAL)
{
- vty_outln (vty, " spf-interval level-1 %d",
+ vty_out (vty, " spf-interval level-1 %d\n",
area->min_spf_interval[0]);
write++;
}
if (area->min_spf_interval[1] != MINIMUM_SPF_INTERVAL)
{
- vty_outln (vty, " spf-interval level-2 %d",
+ vty_out (vty, " spf-interval level-2 %d\n",
area->min_spf_interval[1]);
write++;
}
/* IETF SPF interval */
if (area->spf_delay_ietf[0])
{
- vty_outln (vty, " spf-delay-ietf init-delay %ld short-delay %ld long-delay %ld holddown %ld time-to-learn %ld",
+ vty_out (vty, " spf-delay-ietf init-delay %ld short-delay %ld long-delay %ld holddown %ld time-to-learn %ld\n",
spf_backoff_init_delay(area->spf_delay_ietf[0]),
spf_backoff_short_delay(area->spf_delay_ietf[0]),
spf_backoff_long_delay(area->spf_delay_ietf[0]),
if (area->log_adj_changes)
{
- vty_outln (vty, " log-adjacency-changes");
+ vty_out (vty, " log-adjacency-changes\n");
write++;
}
int
ldp_vty_show_debugging(struct vty *vty)
{
- vty_outln (vty, "LDP debugging status:");
+ vty_out (vty, "LDP debugging status:\n");
if (LDP_DEBUG(hello, HELLO_RECV))
- vty_outln (vty," LDP discovery debugging is on (inbound)");
+ vty_out (vty," LDP discovery debugging is on (inbound)\n");
if (LDP_DEBUG(hello, HELLO_SEND))
- vty_outln (vty," LDP discovery debugging is on (outbound)");
+ vty_out (vty," LDP discovery debugging is on (outbound)\n");
if (LDP_DEBUG(errors, ERRORS))
- vty_outln (vty, " LDP errors debugging is on");
+ vty_out (vty, " LDP errors debugging is on\n");
if (LDP_DEBUG(event, EVENT))
- vty_outln (vty, " LDP events debugging is on");
+ vty_out (vty, " LDP events debugging is on\n");
if (LDP_DEBUG(msg, MSG_RECV_ALL))
vty_outln (vty,
" LDP detailed messages debugging is on " "(inbound)");
else if (LDP_DEBUG(msg, MSG_RECV))
- vty_outln (vty," LDP messages debugging is on (inbound)");
+ vty_out (vty," LDP messages debugging is on (inbound)\n");
if (LDP_DEBUG(msg, MSG_SEND_ALL))
vty_outln (vty,
" LDP detailed messages debugging is on " "(outbound)");
else if (LDP_DEBUG(msg, MSG_SEND))
- vty_outln (vty," LDP messages debugging is on (outbound)");
+ vty_out (vty," LDP messages debugging is on (outbound)\n");
if (LDP_DEBUG(zebra, ZEBRA))
- vty_outln (vty, " LDP zebra debugging is on");
+ vty_out (vty, " LDP zebra debugging is on\n");
vty_out (vty, VTYNL);
return (CMD_SUCCESS);
int write = 0;
if (CONF_LDP_DEBUG(hello, HELLO_RECV)) {
- vty_outln (vty,"debug mpls ldp discovery hello recv");
+ vty_out (vty,"debug mpls ldp discovery hello recv\n");
write = 1;
}
if (CONF_LDP_DEBUG(hello, HELLO_SEND)) {
- vty_outln (vty,"debug mpls ldp discovery hello sent");
+ vty_out (vty,"debug mpls ldp discovery hello sent\n");
write = 1;
}
if (CONF_LDP_DEBUG(errors, ERRORS)) {
- vty_outln (vty, "debug mpls ldp errors");
+ vty_out (vty, "debug mpls ldp errors\n");
write = 1;
}
if (CONF_LDP_DEBUG(event, EVENT)) {
- vty_outln (vty, "debug mpls ldp event");
+ vty_out (vty, "debug mpls ldp event\n");
write = 1;
}
if (CONF_LDP_DEBUG(msg, MSG_RECV_ALL)) {
- vty_outln (vty, "debug mpls ldp messages recv all");
+ vty_out (vty, "debug mpls ldp messages recv all\n");
write = 1;
} else if (CONF_LDP_DEBUG(msg, MSG_RECV)) {
- vty_outln (vty, "debug mpls ldp messages recv");
+ vty_out (vty, "debug mpls ldp messages recv\n");
write = 1;
}
if (CONF_LDP_DEBUG(msg, MSG_SEND_ALL)) {
- vty_outln (vty, "debug mpls ldp messages sent all");
+ vty_out (vty, "debug mpls ldp messages sent all\n");
write = 1;
} else if (CONF_LDP_DEBUG(msg, MSG_SEND)) {
- vty_outln (vty, "debug mpls ldp messages sent");
+ vty_out (vty, "debug mpls ldp messages sent\n");
write = 1;
}
if (CONF_LDP_DEBUG(zebra, ZEBRA)) {
- vty_outln (vty, "debug mpls ldp zebra");
+ vty_out (vty, "debug mpls ldp zebra\n");
write = 1;
}
if (!ia->enabled)
continue;
- vty_outln (vty, " !");
- vty_outln (vty, " interface %s", iface->name);
+ vty_out (vty, " !\n");
+ vty_out (vty, " interface %s\n", iface->name);
if (ia->hello_holdtime != LINK_DFLT_HOLDTIME &&
ia->hello_holdtime != 0)
- vty_outln (vty, " discovery hello holdtime %u",
+ vty_out (vty, " discovery hello holdtime %u\n",
ia->hello_holdtime);
if (ia->hello_interval != DEFAULT_HELLO_INTERVAL &&
ia->hello_interval != 0)
- vty_outln (vty, " discovery hello interval %u",
+ vty_out (vty, " discovery hello interval %u\n",
ia->hello_interval);
}
}
if (!(af_conf->flags & F_LDPD_AF_ENABLED))
return;
- vty_outln (vty, " !");
- vty_outln (vty, " address-family %s", af_name(af));
+ vty_out (vty, " !\n");
+ vty_out (vty, " address-family %s\n", af_name(af));
if (af_conf->lhello_holdtime != LINK_DFLT_HOLDTIME &&
af_conf->lhello_holdtime != 0 )
- vty_outln (vty, " discovery hello holdtime %u",
+ vty_out (vty, " discovery hello holdtime %u\n",
af_conf->lhello_holdtime);
if (af_conf->lhello_interval != DEFAULT_HELLO_INTERVAL &&
af_conf->lhello_interval != 0)
- vty_outln (vty, " discovery hello interval %u",
+ vty_out (vty, " discovery hello interval %u\n",
af_conf->lhello_interval);
if (af_conf->flags & F_LDPD_AF_THELLO_ACCEPT) {
if (af_conf->thello_holdtime != TARGETED_DFLT_HOLDTIME &&
af_conf->thello_holdtime != 0)
- vty_outln (vty, " discovery targeted-hello holdtime %u",
+ vty_out (vty, " discovery targeted-hello holdtime %u\n",
af_conf->thello_holdtime);
if (af_conf->thello_interval != DEFAULT_HELLO_INTERVAL &&
af_conf->thello_interval != 0)
- vty_outln (vty, " discovery targeted-hello interval %u",
+ vty_out (vty, " discovery targeted-hello interval %u\n",
af_conf->thello_interval);
if (ldp_addrisset(af, &af_conf->trans_addr))
- vty_outln (vty, " discovery transport-address %s",
+ vty_out (vty, " discovery transport-address %s\n",
log_addr(af, &af_conf->trans_addr));
else
vty_outln (vty,
}
if (af_conf->flags & F_LDPD_AF_NO_GTSM)
- vty_outln (vty, " ttl-security disable");
+ vty_out (vty, " ttl-security disable\n");
if (af_conf->keepalive != DEFAULT_KEEPALIVE)
- vty_outln (vty, " session holdtime %u",af_conf->keepalive);
+ vty_out (vty, " session holdtime %u\n",af_conf->keepalive);
RB_FOREACH(tnbr, tnbr_head, &ldpd_conf->tnbr_tree) {
if (tnbr->af == af) {
- vty_outln (vty, " !");
- vty_outln (vty, " neighbor %s targeted",
+ vty_out (vty, " !\n");
+ vty_out (vty, " neighbor %s targeted\n",
log_addr(tnbr->af, &tnbr->addr));
}
}
ldp_af_iface_config_write(vty, af);
- vty_outln (vty, " !");
+ vty_out (vty, " !\n");
}
int
if (!(ldpd_conf->flags & F_LDPD_ENABLED))
return (0);
- vty_outln (vty, "mpls ldp");
+ vty_out (vty, "mpls ldp\n");
if (ldpd_conf->rtr_id.s_addr != 0)
- vty_outln (vty, " router-id %s",
+ vty_out (vty, " router-id %s\n",
inet_ntoa(ldpd_conf->rtr_id));
if (ldpd_conf->lhello_holdtime != LINK_DFLT_HOLDTIME &&
ldpd_conf->lhello_holdtime != 0)
- vty_outln (vty, " discovery hello holdtime %u",
+ vty_out (vty, " discovery hello holdtime %u\n",
ldpd_conf->lhello_holdtime);
if (ldpd_conf->lhello_interval != DEFAULT_HELLO_INTERVAL &&
ldpd_conf->lhello_interval != 0)
- vty_outln (vty, " discovery hello interval %u",
+ vty_out (vty, " discovery hello interval %u\n",
ldpd_conf->lhello_interval);
if (ldpd_conf->thello_holdtime != TARGETED_DFLT_HOLDTIME &&
ldpd_conf->thello_holdtime != 0)
- vty_outln (vty, " discovery targeted-hello holdtime %u",
+ vty_out (vty, " discovery targeted-hello holdtime %u\n",
ldpd_conf->thello_holdtime);
if (ldpd_conf->thello_interval != DEFAULT_HELLO_INTERVAL &&
ldpd_conf->thello_interval != 0)
- vty_outln (vty, " discovery targeted-hello interval %u",
+ vty_out (vty, " discovery targeted-hello interval %u\n",
ldpd_conf->thello_interval);
if (ldpd_conf->trans_pref == DUAL_STACK_LDPOV4)
- vty_outln (vty,
- " dual-stack transport-connection prefer ipv4");
+ vty_out (vty,
+ " dual-stack transport-connection prefer ipv4\n");
if (ldpd_conf->flags & F_LDPD_DS_CISCO_INTEROP)
- vty_outln (vty, " dual-stack cisco-interop");
+ vty_out (vty, " dual-stack cisco-interop\n");
RB_FOREACH(nbrp, nbrp_head, &ldpd_conf->nbrp_tree) {
if (nbrp->flags & F_NBRP_KEEPALIVE)
- vty_outln (vty, " neighbor %s session holdtime %u",
+ vty_out (vty, " neighbor %s session holdtime %u\n",
inet_ntoa(nbrp->lsr_id),nbrp->keepalive);
if (nbrp->flags & F_NBRP_GTSM) {
}
if (nbrp->auth.method == AUTH_MD5SIG)
- vty_outln (vty, " neighbor %s password %s",
+ vty_out (vty, " neighbor %s password %s\n",
inet_ntoa(nbrp->lsr_id),nbrp->auth.md5key);
}
ldp_af_config_write(vty, AF_INET, ldpd_conf, &ldpd_conf->ipv4);
ldp_af_config_write(vty, AF_INET6, ldpd_conf, &ldpd_conf->ipv6);
- vty_outln (vty, " !");
- vty_outln (vty, "!");
+ vty_out (vty, " !\n");
+ vty_out (vty, "!\n");
return (1);
}
int missing_lsrid = 0;
int missing_pwid = 0;
- vty_outln (vty, " !");
- vty_outln (vty, " member pseudowire %s", pw->ifname);
+ vty_out (vty, " !\n");
+ vty_out (vty, " member pseudowire %s\n", pw->ifname);
if (pw->lsr_id.s_addr != INADDR_ANY)
- vty_outln (vty, " neighbor lsr-id %s",inet_ntoa(pw->lsr_id));
+ vty_out (vty, " neighbor lsr-id %s\n",inet_ntoa(pw->lsr_id));
else
missing_lsrid = 1;
if (pw->flags & F_PW_STATIC_NBR_ADDR)
- vty_outln (vty, " neighbor address %s",
+ vty_out (vty, " neighbor address %s\n",
log_addr(pw->af, &pw->addr));
if (pw->pwid != 0)
- vty_outln (vty, " pw-id %u", pw->pwid);
+ vty_out (vty, " pw-id %u\n", pw->pwid);
else
missing_pwid = 1;
if (!(pw->flags & F_PW_CWORD_CONF))
- vty_outln (vty, " control-word exclude");
+ vty_out (vty, " control-word exclude\n");
if (!(pw->flags & F_PW_STATUSTLV_CONF))
- vty_outln (vty, " pw-status disable");
+ vty_out (vty, " pw-status disable\n");
if (missing_lsrid)
vty_outln (vty,
" ! Incomplete config, specify a neighbor " "lsr-id");
if (missing_pwid)
- vty_outln (vty," ! Incomplete config, specify a pw-id");
+ vty_out (vty," ! Incomplete config, specify a pw-id\n");
}
int
struct l2vpn_pw *pw;
RB_FOREACH(l2vpn, l2vpn_head, &ldpd_conf->l2vpn_tree) {
- vty_outln (vty, "l2vpn %s type vpls", l2vpn->name);
+ vty_out (vty, "l2vpn %s type vpls\n", l2vpn->name);
if (l2vpn->pw_type != DEFAULT_PW_TYPE)
- vty_outln (vty, " vc type ethernet-tagged");
+ vty_out (vty, " vc type ethernet-tagged\n");
if (l2vpn->mtu != DEFAULT_L2VPN_MTU)
- vty_outln (vty, " mtu %u", l2vpn->mtu);
+ vty_out (vty, " mtu %u\n", l2vpn->mtu);
if (l2vpn->br_ifname[0] != '\0')
- vty_outln (vty, " bridge %s",l2vpn->br_ifname);
+ vty_out (vty, " bridge %s\n",l2vpn->br_ifname);
RB_FOREACH(lif, l2vpn_if_head, &l2vpn->if_tree)
- vty_outln (vty, " member interface %s",lif->ifname);
+ vty_out (vty, " member interface %s\n",lif->ifname);
RB_FOREACH(pw, l2vpn_pw_head, &l2vpn->pw_tree)
ldp_l2vpn_pw_config_write(vty, pw);
RB_FOREACH(pw, l2vpn_pw_head, &l2vpn->pw_inactive_tree)
ldp_l2vpn_pw_config_write(vty, pw);
- vty_outln (vty, " !");
- vty_outln (vty, "!");
+ vty_out (vty, " !\n");
+ vty_out (vty, "!\n");
}
return (0);
secs = strtol(seconds_str, &ep, 10);
if (*ep != '\0' || secs < MIN_HOLDTIME || secs > MAX_HOLDTIME) {
- vty_outln (vty, "%% Invalid holdtime");
+ vty_out (vty, "%% Invalid holdtime\n");
return (CMD_WARNING);
}
secs = strtol(seconds_str, &ep, 10);
if (*ep != '\0' || secs < MIN_HELLO_INTERVAL ||
secs > MAX_HELLO_INTERVAL) {
- vty_outln (vty, "%% Invalid interval");
+ vty_out (vty, "%% Invalid interval\n");
return (CMD_WARNING);
}
if (inet_pton(AF_INET, lsr_id_str, &lsr_id) != 1 ||
bad_addr_v4(lsr_id)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_WARNING);
}
secs = strtol(seconds_str, &ep, 10);
if (*ep != '\0' || secs < MIN_KEEPALIVE || secs > MAX_KEEPALIVE) {
- vty_outln (vty, "%% Invalid holdtime");
+ vty_out (vty, "%% Invalid holdtime\n");
return (CMD_SUCCESS);
}
secs = strtol(seconds_str, &ep, 10);
if (*ep != '\0' || secs < MIN_KEEPALIVE || secs > MAX_KEEPALIVE) {
- vty_outln (vty, "%% Invalid holdtime");
+ vty_out (vty, "%% Invalid holdtime\n");
return (CMD_SUCCESS);
}
if (iface == NULL) {
if (ldp_iface_is_configured(vty_conf, ifname)) {
- vty_outln (vty,"%% Interface is already in use");
+ vty_out (vty,"%% Interface is already in use\n");
return (CMD_SUCCESS);
}
else {
if (inet_pton(af, addr_str, &af_conf->trans_addr) != 1 ||
bad_addr(af, &af_conf->trans_addr)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_SUCCESS);
}
}
if (inet_pton(af, addr_str, &addr) != 1 ||
bad_addr(af, &addr)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_WARNING);
}
if (af == AF_INET6 && IN6_IS_SCOPE_EMBED(&addr.v6)) {
- vty_outln (vty, "%% Address can not be link-local");
+ vty_out (vty, "%% Address can not be link-local\n");
return (CMD_WARNING);
}
else {
if (inet_pton(AF_INET, addr_str, &vty_conf->rtr_id) != 1 ||
bad_addr_v4(vty_conf->rtr_id)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_SUCCESS);
}
}
if (inet_pton(AF_INET, lsr_id_str, &lsr_id) != 1 ||
bad_addr_v4(lsr_id)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_WARNING);
}
if (inet_pton(AF_INET, lsr_id_str, &lsr_id) != 1 ||
bad_addr_v4(lsr_id)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_WARNING);
}
if (hops_str) {
hops = strtol(hops_str, &ep, 10);
if (*ep != '\0' || hops < 1 || hops > 254) {
- vty_outln (vty, "%% Invalid hop count");
+ vty_out (vty, "%% Invalid hop count\n");
return (CMD_SUCCESS);
}
}
mtu = strtol(mtu_str, &ep, 10);
if (*ep != '\0' || mtu < MIN_L2VPN_MTU || mtu > MAX_L2VPN_MTU) {
- vty_outln (vty, "%% Invalid MTU");
+ vty_out (vty, "%% Invalid MTU\n");
return (CMD_WARNING);
}
return (CMD_SUCCESS);
if (ldp_iface_is_configured(vty_conf, ifname)) {
- vty_outln (vty, "%% Interface is already in use");
+ vty_out (vty, "%% Interface is already in use\n");
return (CMD_SUCCESS);
}
}
if (ldp_iface_is_configured(vty_conf, ifname)) {
- vty_outln (vty, "%% Interface is already in use");
+ vty_out (vty, "%% Interface is already in use\n");
return (CMD_SUCCESS);
}
if (ldp_get_address(addr_str, &af, &addr) == -1 ||
bad_addr(af, &addr)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_WARNING);
}
if (inet_pton(AF_INET, lsr_id_str, &lsr_id) != 1 ||
bad_addr_v4(lsr_id)) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_WARNING);
}
pwid = strtol(pwid_str, &ep, 10);
if (*ep != '\0' || pwid < MIN_PWID_ID || pwid > MAX_PWID_ID) {
- vty_outln (vty, "%% Invalid pw-id");
+ vty_out (vty, "%% Invalid pw-id\n");
return (CMD_WARNING);
}
snprintf(timers, sizeof(timers), "%u/%u",
iface->hello_interval, iface->hello_holdtime);
- vty_outln (vty, "%-4s %-11s %-6s %-8s %-12s %3u",
+ vty_out (vty, "%-4s %-11s %-6s %-8s %-12s %3u\n",
af_name(iface->af), iface->name,
if_state_name(iface->state), iface->uptime == 0 ?
"00:00:00" : log_time(iface->uptime), timers,
vty_out(vty, "%s%46s", VTYNL, " ");
break;
}
- vty_outln (vty, "%9u", adj->holdtime);
+ vty_out (vty, "%9u\n", adj->holdtime);
break;
case IMSG_CTL_END:
vty_out (vty, VTYNL);
break;
case IMSG_CTL_END:
rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf);
- vty_outln (vty, "Local:");
- vty_outln (vty, " LSR Id: %s:0",inet_ntoa(rtr_id));
+ vty_out (vty, "Local:\n");
+ vty_out (vty, " LSR Id: %s:0\n",inet_ntoa(rtr_id));
if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED)
- vty_outln (vty, " Transport Address (IPv4): %s",
+ vty_out (vty, " Transport Address (IPv4): %s\n",
log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr));
if (ldpd_conf->ipv6.flags & F_LDPD_AF_ENABLED)
- vty_outln (vty, " Transport Address (IPv6): %s",
+ vty_out (vty, " Transport Address (IPv6): %s\n",
log_addr(AF_INET6, &ldpd_conf->ipv6.trans_addr));
- vty_outln (vty, "Discovery Sources:");
- vty_outln (vty, " Interfaces:");
+ vty_out (vty, "Discovery Sources:\n");
+ vty_out (vty, " Interfaces:\n");
vty_out(vty, "%s", ifaces_buffer);
- vty_outln (vty, " Targeted Hellos:");
+ vty_out (vty, " Targeted Hellos:\n");
vty_out(vty, "%s", tnbrs_buffer);
vty_out (vty, VTYNL);
return (1);
nbr_state_name(nbr->nbr_state), addr);
if (strlen(addr) > 15)
vty_out(vty, "%s%48s", VTYNL, " ");
- vty_outln (vty, " %8s", log_time(nbr->uptime));
+ vty_out (vty, " %8s\n", log_time(nbr->uptime));
break;
case IMSG_CTL_END:
return (1);
v4adjs_buffer[0] = '\0';
v6adjs_buffer[0] = '\0';
- vty_outln (vty, "Peer LDP Identifier: %s:0",
+ vty_out (vty, "Peer LDP Identifier: %s:0\n",
inet_ntoa(nbr->id));
- vty_outln (vty, " TCP connection: %s:%u - %s:%u",
+ vty_out (vty, " TCP connection: %s:%u - %s:%u\n",
log_addr(nbr->af, &nbr->laddr), ntohs(nbr->lport),
log_addr(nbr->af, &nbr->raddr),ntohs(nbr->rport));
- vty_outln (vty, " Authentication: %s",
+ vty_out (vty, " Authentication: %s\n",
(nbr->auth_method == AUTH_MD5SIG) ? "TCP MD5 Signature" : "none");
vty_outln(vty, " Session Holdtime: %u secs; "
"KeepAlive interval: %u secs", nbr->holdtime,
nbr->holdtime / KEEPALIVE_PER_PERIOD);
- vty_outln(vty, " State: %s; Downstream-Unsolicited",
+ vty_out(vty, " State: %s; Downstream-Unsolicited\n",
nbr_state_name(nbr->nbr_state));
- vty_outln (vty, " Up time: %s",log_time(nbr->uptime));
+ vty_out (vty, " Up time: %s\n",log_time(nbr->uptime));
stats = &nbr->stats;
- vty_outln (vty, " Messages sent/rcvd:");
- vty_outln (vty, " - Keepalive Messages: %u/%u",
+ vty_out (vty, " Messages sent/rcvd:\n");
+ vty_out (vty, " - Keepalive Messages: %u/%u\n",
stats->kalive_sent, stats->kalive_rcvd);
- vty_outln (vty, " - Address Messages: %u/%u",
+ vty_out (vty, " - Address Messages: %u/%u\n",
stats->addr_sent, stats->addr_rcvd);
- vty_outln (vty, " - Address Withdraw Messages: %u/%u",
+ vty_out (vty, " - Address Withdraw Messages: %u/%u\n",
stats->addrwdraw_sent, stats->addrwdraw_rcvd);
- vty_outln (vty, " - Notification Messages: %u/%u",
+ vty_out (vty, " - Notification Messages: %u/%u\n",
stats->notif_sent, stats->notif_rcvd);
- vty_outln (vty, " - Capability Messages: %u/%u",
+ vty_out (vty, " - Capability Messages: %u/%u\n",
stats->capability_sent, stats->capability_rcvd);
- vty_outln (vty, " - Label Mapping Messages: %u/%u",
+ vty_out (vty, " - Label Mapping Messages: %u/%u\n",
stats->labelmap_sent, stats->labelmap_rcvd);
- vty_outln (vty, " - Label Request Messages: %u/%u",
+ vty_out (vty, " - Label Request Messages: %u/%u\n",
stats->labelreq_sent, stats->labelreq_rcvd);
- vty_outln (vty, " - Label Withdraw Messages: %u/%u",
+ vty_out (vty, " - Label Withdraw Messages: %u/%u\n",
stats->labelwdraw_sent, stats->labelwdraw_rcvd);
- vty_outln (vty, " - Label Release Messages: %u/%u",
+ vty_out (vty, " - Label Release Messages: %u/%u\n",
stats->labelrel_sent, stats->labelrel_rcvd);
- vty_outln (vty, " - Label Abort Request Messages: %u/%u",
+ vty_out (vty, " - Label Abort Request Messages: %u/%u\n",
stats->labelabreq_sent, stats->labelabreq_rcvd);
show_nbr_capabilities(vty, nbr);
}
break;
case IMSG_CTL_SHOW_NBR_END:
- vty_outln (vty, " LDP Discovery Sources:");
+ vty_out (vty, " LDP Discovery Sources:\n");
if (v4adjs_buffer[0] != '\0') {
- vty_outln (vty, " IPv4:");
+ vty_out (vty, " IPv4:\n");
vty_out(vty, "%s", v4adjs_buffer);
}
if (v6adjs_buffer[0] != '\0') {
- vty_outln (vty, " IPv6:");
+ vty_out (vty, " IPv6:\n");
vty_out(vty, "%s", v6adjs_buffer);
}
vty_out (vty, VTYNL);
" - Typed Wildcard (0x050B)%s"
" - Unrecognized Notification (0x0603)",
VTYNL, VTYNL, VTYNL);
- vty_outln (vty, " Capabilities Received:");
+ vty_out (vty, " Capabilities Received:\n");
if (nbr->flags & F_NBR_CAP_DYNAMIC)
- vty_outln (vty," - Dynamic Announcement (0x0506)");
+ vty_out (vty," - Dynamic Announcement (0x0506)\n");
if (nbr->flags & F_NBR_CAP_TWCARD)
- vty_outln (vty, " - Typed Wildcard (0x050B)");
+ vty_out (vty, " - Typed Wildcard (0x050B)\n");
if (nbr->flags & F_NBR_CAP_UNOTIF)
- vty_outln (vty," - Unrecognized Notification (0x0603)");
+ vty_out (vty," - Unrecognized Notification (0x0603)\n");
}
static int
if (nbr->nbr_state != NBR_STA_OPER)
break;
- vty_outln (vty, "Peer LDP Identifier: %s:0",
+ 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, "%-4s %-20s", af_name(rt->af), dstnet);
if (strlen(dstnet) > 20)
vty_out(vty, "%s%25s", VTYNL, " ");
- vty_outln (vty, " %-15s %-11s %-13s %6s", inet_ntoa(rt->nexthop),
+ vty_out (vty, " %-15s %-11s %-13s %6s\n", inet_ntoa(rt->nexthop),
log_label(rt->local_label), log_label(rt->remote_label),
rt->in_use ? "yes" : "no");
break;
snprintf(dstnet, sizeof(dstnet), "%s/%d",
log_addr(rt->af, &rt->prefix), rt->prefixlen);
- vty_outln (vty, "%s", dstnet);
- vty_outln (vty, "%-8sLocal binding: label: %s", "",
+ vty_out (vty, "%s\n", dstnet);
+ vty_out (vty, "%-8sLocal binding: label: %s\n", "",
log_label(rt->local_label));
break;
case IMSG_CTL_SHOW_LIB_SENT:
break;
case IMSG_CTL_SHOW_LIB_END:
if (upstream) {
- vty_outln (vty, "%-8sAdvertised to:", "");
+ vty_out (vty, "%-8sAdvertised to:\n", "");
vty_out(vty, "%s", sent_buffer);
}
if (downstream) {
- vty_outln (vty, "%-8sRemote bindings:", "");
+ vty_out (vty, "%-8sRemote bindings:\n", "");
vty_out(vty, "%s", rcvd_buffer);
} else
- vty_outln (vty, "%-8sNo remote bindings","");
+ vty_out (vty, "%-8sNo remote bindings\n","");
break;
case IMSG_CTL_END:
vty_out (vty, VTYNL);
case IMSG_CTL_SHOW_L2VPN_BINDING:
pw = imsg->data;
- vty_outln (vty, " Destination Address: %s, VC ID: %u",
+ vty_out (vty, " Destination Address: %s, VC ID: %u\n",
inet_ntoa(pw->lsr_id), pw->pwid);
/* local binding */
if (pw->local_label != NO_LABEL) {
- vty_outln (vty, " Local Label: %u",
+ vty_out (vty, " Local Label: %u\n",
pw->local_label);
vty_outln (vty, "%-8sCbit: %u, VC Type: %s, "
"GroupID: %u", "", pw->local_cword,
pw_type_name(pw->type),pw->local_gid);
- vty_outln (vty, "%-8sMTU: %u", "",pw->local_ifmtu);
+ vty_out (vty, "%-8sMTU: %u\n", "",pw->local_ifmtu);
} else
- vty_outln (vty," Local Label: unassigned");
+ vty_out (vty," Local Label: unassigned\n");
/* remote binding */
if (pw->remote_label != NO_LABEL) {
- vty_outln (vty, " Remote Label: %u",
+ vty_out (vty, " Remote Label: %u\n",
pw->remote_label);
vty_outln (vty, "%-8sCbit: %u, VC Type: %s, "
"GroupID: %u", "", pw->remote_cword,
pw_type_name(pw->type),pw->remote_gid);
- vty_outln (vty, "%-8sMTU: %u", "",pw->remote_ifmtu);
+ vty_out (vty, "%-8sMTU: %u\n", "",pw->remote_ifmtu);
} else
- vty_outln (vty," Remote Label: unassigned");
+ vty_out (vty," Remote Label: unassigned\n");
break;
case IMSG_CTL_END:
vty_out (vty, VTYNL);
case IMSG_CTL_SHOW_L2VPN_PW:
pw = imsg->data;
- vty_outln (vty, "%-9s %-15s %-10u %-16s %-10s", pw->ifname,
+ vty_out (vty, "%-9s %-15s %-10u %-16s %-10s\n", pw->ifname,
inet_ntoa(pw->lsr_id), pw->pwid, pw->l2vpn_name,
(pw->status ? "UP" : "DOWN"));
break;
done:
close(ibuf->fd);
if (json) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
params.json = json;
if (!params.detail && !params.json)
- vty_outln (vty, "%-4s %-20s %-15s %-11s %-13s %6s", "AF",
+ vty_out (vty, "%-4s %-20s %-15s %-11s %-13s %6s\n", "AF",
"Destination", "Nexthop", "Local Label", "Remote Label",
"In Use");
params.json = json;
if (!params.detail && !params.json)
- vty_outln (vty, "%-4s %-15s %-8s %-15s %9s",
+ vty_out (vty, "%-4s %-15s %-8s %-15s %9s\n",
"AF", "ID", "Type", "Source", "Holdtime");
if (params.detail)
/* header */
if (!params.json) {
- vty_outln (vty, "%-4s %-11s %-6s %-8s %-12s %3s", "AF",
+ vty_out (vty, "%-4s %-11s %-6s %-8s %-12s %3s\n", "AF",
"Interface", "State", "Uptime", "Hello Timers","ac");
}
"0x0603");
json_object_array_add(json_array, json_cap);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
return (0);
params.detail = 1;
if (!params.detail && !params.json)
- vty_outln (vty, "%-4s %-15s %-11s %-15s %8s",
+ vty_out (vty, "%-4s %-15s %-11s %-15s %8s\n",
"AF", "ID", "State", "Remote Address","Uptime");
imsg_compose(&ibuf, IMSG_CTL_SHOW_NBR, 0, 0, -1, NULL, 0);
if (!params.json) {
/* header */
- vty_outln (vty, "%-9s %-15s %-10s %-16s %-10s",
+ vty_out (vty, "%-9s %-15s %-10s %-16s %-10s\n",
"Interface", "Peer ID", "VC ID", "Name","Status");
- vty_outln (vty, "%-9s %-15s %-10s %-16s %-10s",
+ vty_out (vty, "%-9s %-15s %-10s %-16s %-10s\n",
"---------", "---------------", "----------",
"----------------", "----------");
}
if (addr_str &&
(ldp_get_address(addr_str, &nbr.af, &nbr.raddr) == -1 ||
bad_addr(nbr.af, &nbr.raddr))) {
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return (CMD_WARNING);
}
config_write_agentx (struct vty *vty)
{
if (agentx_enabled)
- vty_outln (vty, "agentx");
+ vty_out (vty, "agentx\n");
return 1;
}
agentx_enabled = 1;
return CMD_SUCCESS;
}
- vty_outln (vty, "SNMP AgentX already enabled");
+ vty_out (vty, "SNMP AgentX already enabled\n");
return CMD_SUCCESS;
}
"SNMP AgentX protocol settings\n")
{
if (!agentx_enabled) return CMD_SUCCESS;
- vty_outln (vty, "SNMP AgentX support cannot be disabled once enabled");
+ vty_out (vty, "SNMP AgentX support cannot be disabled once enabled\n");
return CMD_WARNING;
}
}
else
{
- vty_outln (vty, " %s%sStatus: %s, Last update: %s",
+ vty_out (vty, " %s%sStatus: %s, Last update: %s\n",
(extra_space) ? " ": "", (bfd_tag) ? "BFD: " : " ",
bfd_get_status_str(bfd_info->status), time_buf);
}
}
else
{
- vty_outln (vty, " %sBFD: Type: %s", (extra_space) ? " " : "",
+ vty_out (vty, " %sBFD: Type: %s\n", (extra_space) ? " " : "",
(multihop) ? "multi hop" : "single hop");
}
config_write_host (struct vty *vty)
{
if (host.name)
- vty_outln (vty, "hostname %s", host.name);
+ vty_out (vty, "hostname %s\n", host.name);
if (host.encrypt)
{
if (host.password_encrypt)
- vty_outln (vty, "password 8 %s", host.password_encrypt);
+ vty_out (vty, "password 8 %s\n", host.password_encrypt);
if (host.enable_encrypt)
- vty_outln (vty, "enable password 8 %s", host.enable_encrypt);
+ vty_out (vty, "enable password 8 %s\n", host.enable_encrypt);
}
else
{
if (host.password)
- vty_outln (vty, "password %s", host.password);
+ vty_out (vty, "password %s\n", host.password);
if (host.enable)
- vty_outln (vty, "enable password %s", host.enable);
+ vty_out (vty, "enable password %s\n", host.enable);
}
if (zlog_default->default_lvl != LOG_DEBUG)
{
- vty_outln (vty,"! N.B. The 'log trap' command is deprecated.");
- vty_outln (vty, "log trap %s",
+ vty_out (vty,"! N.B. The 'log trap' command is deprecated.\n");
+ vty_out (vty, "log trap %s\n",
zlog_priority[zlog_default->default_lvl]);
}
}
if (zlog_default->maxlvl[ZLOG_DEST_MONITOR] == ZLOG_DISABLED)
- vty_outln (vty,"no log monitor");
+ vty_out (vty,"no log monitor\n");
else if (zlog_default->maxlvl[ZLOG_DEST_MONITOR] != zlog_default->default_lvl)
- vty_outln (vty,"log monitor %s",
+ vty_out (vty,"log monitor %s\n",
zlog_priority[zlog_default->maxlvl[ZLOG_DEST_MONITOR]]);
if (zlog_default->maxlvl[ZLOG_DEST_SYSLOG] != ZLOG_DISABLED)
}
if (zlog_default->facility != LOG_DAEMON)
- vty_outln (vty, "log facility %s",
+ vty_out (vty, "log facility %s\n",
facility_name(zlog_default->facility));
if (zlog_default->record_priority == 1)
- vty_outln (vty, "log record-priority");
+ vty_out (vty, "log record-priority\n");
if (zlog_default->timestamp_precision > 0)
- vty_outln (vty, "log timestamp precision %d",
+ vty_out (vty, "log timestamp precision %d\n",
zlog_default->timestamp_precision);
if (host.advanced)
- vty_outln (vty, "service advanced-vty");
+ vty_out (vty, "service advanced-vty\n");
if (host.encrypt)
- vty_outln (vty, "service password-encryption");
+ vty_out (vty, "service password-encryption\n");
if (host.lines >= 0)
- vty_outln (vty, "service terminal-length %d",host.lines);
+ vty_out (vty, "service terminal-length %d\n",host.lines);
if (host.motdfile)
- vty_outln (vty, "banner motd file %s", host.motdfile);
+ vty_out (vty, "banner motd file %s\n", host.motdfile);
else if (! host.motd)
- vty_outln (vty, "no banner motd");
+ vty_out (vty, "no banner motd\n");
return 1;
}
vty->node = CONFIG_NODE;
else
{
- vty_outln (vty, "VTY configuration is locked by other VTY");
+ vty_out (vty, "VTY configuration is locked by other VTY\n");
return CMD_WARNING;
}
return CMD_SUCCESS;
SHOW_STR
"Displays zebra version\n")
{
- vty_outln (vty, "%s %s (%s).", FRR_FULL_NAME, FRR_VERSION,
+ vty_out (vty, "%s %s (%s).\n", FRR_FULL_NAME, FRR_VERSION,
host.name ? host.name : "");
- vty_outln (vty, "%s%s", FRR_COPYRIGHT, GIT_INFO);
- vty_outln (vty, "configured with:%s %s", VTYNL,
+ vty_out (vty, "%s%s\n", FRR_COPYRIGHT, GIT_INFO);
+ vty_out (vty, "configured with:%s %s\n", VTYNL,
FRR_CONFIG_ARGS);
return CMD_SUCCESS;
"help",
"Description of the interactive help system\n")
{
- vty_outln (vty,
+ vty_out (vty,
"Quagga VTY provides advanced help feature. When you need help,%s\
anytime at the command line please press '?'.%s\
%s\
argument.%s\
2. Partial help is provided when an abbreviated argument is entered%s\
and you want to know what arguments match the input%s\
- (e.g. 'show me?'.)%s", VTYNL, VTYNL, VTYNL,
+ (e.g. 'show me?'.)%s\n", VTYNL, VTYNL, VTYNL,
VTYNL, VTYNL, VTYNL, VTYNL, VTYNL,
VTYNL, VTYNL, VTYNL, VTYNL);
return CMD_SUCCESS;
if ((element = vector_slot (node->cmd_vector, i)) &&
element->attr != CMD_ATTR_DEPRECATED &&
element->attr != CMD_ATTR_HIDDEN)
- vty_outln (vty, " %s", element->string);
+ vty_out (vty, " %s\n", element->string);
}
return CMD_SUCCESS;
}
if (vty->type == VTY_TERM)
{
- vty_outln (vty, "%sCurrent configuration:",VTYNL);
- vty_outln (vty, "!");
+ vty_out (vty, "%sCurrent configuration:\n",VTYNL);
+ vty_out (vty, "!\n");
}
- vty_outln (vty, "frr version %s", FRR_VER_SHORT);
- vty_outln (vty, "frr defaults %s", DFLT_NAME);
- vty_outln (vty, "!");
+ vty_out (vty, "frr version %s\n", FRR_VER_SHORT);
+ vty_out (vty, "frr defaults %s\n", DFLT_NAME);
+ vty_out (vty, "!\n");
for (i = 0; i < vector_active (cmdvec); i++)
if ((node = vector_slot (cmdvec, i)) && node->func
&& (node->vtysh || vty->type != VTY_SHELL))
{
if ((*node->func) (vty))
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
if (vty->type == VTY_TERM)
{
- vty_outln (vty, "end");
+ vty_out (vty, "end\n");
}
}
/* Check and see if we are operating under vtysh configuration */
if (host.config == NULL)
{
- vty_outln (vty,"Can't save to configuration file, using vtysh.");
+ vty_out (vty,"Can't save to configuration file, using vtysh.\n");
return CMD_WARNING;
}
fd = mkstemp (config_file_tmp);
if (fd < 0)
{
- vty_outln (vty, "Can't open configuration file %s.",config_file_tmp);
+ vty_out (vty, "Can't open configuration file %s.\n",config_file_tmp);
goto finished;
}
if (fchmod (fd, CONFIGFILE_MASK) != 0)
{
- vty_outln (vty, "Can't chmod configuration file %s: %s (%d).",
+ vty_out (vty, "Can't chmod configuration file %s: %s (%d).\n",
config_file_tmp, safe_strerror(errno), errno);
goto finished;
}
if (unlink (config_file_sav) != 0)
if (errno != ENOENT)
{
- vty_outln (vty, "Can't unlink backup configuration file %s.",
+ vty_out (vty, "Can't unlink backup configuration file %s.\n",
config_file_sav);
goto finished;
}
if (link (config_file, config_file_sav) != 0)
{
- vty_outln (vty, "Can't backup old configuration file %s.",
+ vty_out (vty, "Can't backup old configuration file %s.\n",
config_file_sav);
goto finished;
}
}
if (rename (config_file_tmp, config_file) != 0)
{
- vty_outln (vty, "Can't save configuration file %s.",config_file);
+ vty_out (vty, "Can't save configuration file %s.\n",config_file);
goto finished;
}
if (dirfd >= 0)
fsync (dirfd);
- vty_outln (vty, "Configuration saved to %s",config_file);
+ vty_out (vty, "Configuration saved to %s\n",config_file);
ret = CMD_SUCCESS;
finished:
confp = fopen (host.config, "r");
if (confp == NULL)
{
- vty_outln (vty, "Can't open configuration file [%s] due to '%s'",
+ vty_out (vty, "Can't open configuration file [%s] due to '%s'\n",
host.config, safe_strerror(errno));
return CMD_WARNING;
}
cp++;
*cp = '\0';
- vty_outln (vty, "%s", buf);
+ vty_out (vty, "%s\n", buf);
}
fclose (confp);
if (!isalpha((int) word->arg[0]))
{
- vty_outln (vty, "Please specify string starting with alphabet");
+ vty_out (vty, "Please specify string starting with alphabet\n");
return CMD_WARNING;
}
if (!isalnum (argv[idx_8]->arg[0]))
{
- vty_outln (vty,
- "Please specify string starting with alphanumeric");
+ vty_out (vty,
+ "Please specify string starting with alphanumeric\n");
return CMD_WARNING;
}
}
else
{
- vty_outln (vty, "Unknown encryption type.");
+ vty_out (vty, "Unknown encryption type.\n");
return CMD_WARNING;
}
}
if (!isalnum (argv[idx_8]->arg[0]))
{
- vty_outln (vty,
- "Please specify string starting with alphanumeric");
+ vty_out (vty,
+ "Please specify string starting with alphanumeric\n");
return CMD_WARNING;
}
{
char *message;
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
((message = argv_concat(argv, argc, 1)) ? message : ""));
if (message)
XFREE(MTYPE_TMP, message);
zl->filename);
vty_out (vty, VTYNL);
- vty_outln (vty, "Protocol name: %s",
+ vty_out (vty, "Protocol name: %s\n",
zl->protoname);
- vty_outln (vty, "Record priority: %s",
+ vty_out (vty, "Record priority: %s\n",
(zl->record_priority ? "enabled" : "disabled"));
- vty_outln (vty, "Timestamp precision: %d",
+ vty_out (vty, "Timestamp precision: %d\n",
zl->timestamp_precision);
return CMD_SUCCESS;
if (! ret)
{
- vty_outln (vty, "distribute list doesn't exist");
+ vty_out (vty, "distribute list doesn't exist\n");
return CMD_WARNING;
}
return CMD_SUCCESS;
if (has_print)
vty_out (vty, VTYNL);
else
- vty_outln (vty, " not set");
+ vty_out (vty, " not set\n");
for (i = 0; i < disthash->size; i++)
for (mp = disthash->index[i]; mp; mp = mp->next)
if (has_print)
vty_out (vty, VTYNL);
else
- vty_outln (vty, " nothing");
+ vty_out (vty, " nothing\n");
}
}
if (has_print)
vty_out (vty, VTYNL);
else
- vty_outln (vty, " not set");
+ vty_out (vty, " not set\n");
for (i = 0; i < disthash->size; i++)
for (mp = disthash->index[i]; mp; mp = mp->next)
if (has_print)
vty_out (vty, VTYNL);
else
- vty_outln (vty, " nothing");
+ vty_out (vty, " nothing\n");
}
}
return 0;
if (dist->list[j]) {
output = j == DISTRIBUTE_V4_OUT || j == DISTRIBUTE_V6_OUT;
v6 = j == DISTRIBUTE_V6_IN || j == DISTRIBUTE_V6_OUT;
- vty_outln (vty, " %sdistribute-list %s %s %s",
+ vty_out (vty, " %sdistribute-list %s %s %s\n",
v6 ? "ipv6 " : "",
dist->list[j],
output ? "out" : "in",
if (dist->prefix[j]) {
output = j == DISTRIBUTE_V4_OUT || j == DISTRIBUTE_V6_OUT;
v6 = j == DISTRIBUTE_V6_IN || j == DISTRIBUTE_V6_OUT;
- vty_outln (vty, " %sdistribute-list prefix %s %s %s",
+ vty_out (vty, " %sdistribute-list prefix %s %s %s\n",
v6 ? "ipv6 " : "",
dist->prefix[j],
output ? "out" : "in",
access = access_list_lookup (afi, name);
if (! access)
{
- vty_outln (vty, "%% access-list %s doesn't exist",name);
+ vty_out (vty, "%% access-list %s doesn't exist\n",name);
return CMD_WARNING;
}
type = FILTER_DENY;
else
{
- vty_outln (vty, "%% filter type must be permit or deny");
+ vty_out (vty, "%% filter type must be permit or deny\n");
return CMD_WARNING;
}
ret = inet_aton (addr_str, &addr);
if (ret <= 0)
{
- vty_outln (vty,"%%Inconsistent address and mask");
+ vty_out (vty,"%%Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = inet_aton (addr_mask_str, &addr_mask);
if (ret <= 0)
{
- vty_outln (vty,"%%Inconsistent address and mask");
+ vty_out (vty,"%%Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = inet_aton (mask_str, &mask);
if (ret <= 0)
{
- vty_outln (vty,"%%Inconsistent address and mask");
+ vty_out (vty,"%%Inconsistent address and mask\n");
return CMD_WARNING;
}
ret = inet_aton (mask_mask_str, &mask_mask);
if (ret <= 0)
{
- vty_outln (vty,"%%Inconsistent address and mask");
+ vty_out (vty,"%%Inconsistent address and mask\n");
return CMD_WARNING;
}
}
type = FILTER_DENY;
else
{
- vty_outln (vty, "filter type must be [permit|deny]");
+ vty_out (vty, "filter type must be [permit|deny]\n");
return CMD_WARNING;
}
ret = str2prefix_ipv4 (prefix_str, (struct prefix_ipv4 *)&p);
if (ret <= 0)
{
- vty_outln (vty,"IP address prefix/prefixlen is malformed");
+ vty_out (vty,"IP address prefix/prefixlen is malformed\n");
return CMD_WARNING;
}
}
ret = str2prefix_ipv6 (prefix_str, (struct prefix_ipv6 *) &p);
if (ret <= 0)
{
- vty_outln (vty,"IPv6 address prefix/prefixlen is malformed");
+ vty_out (vty,"IPv6 address prefix/prefixlen is malformed\n");
return CMD_WARNING;
}
}
access = access_list_lookup (AFI_IP, argv[idx_acl]->arg);
if (access == NULL)
{
- vty_outln (vty, "%% access-list %s doesn't exist",argv[idx_acl]->arg);
+ vty_out (vty, "%% access-list %s doesn't exist\n",argv[idx_acl]->arg);
return CMD_WARNING;
}
access = access_list_lookup (AFI_IP6, argv[idx_word]->arg);
if (access == NULL)
{
- vty_outln (vty, "%% access-list %s doesn't exist",argv[idx_word]->arg);
+ vty_out (vty, "%% access-list %s doesn't exist\n",argv[idx_word]->arg);
return CMD_WARNING;
}
return 0;
/* Print the name of the protocol */
- vty_outln (vty, "%s:", frr_protoname);
+ vty_out (vty, "%s:\n", frr_protoname);
for (access = master->num.head; access; access = access->next)
{
if (write)
{
- vty_outln (vty, "%s IP%s access list %s",
+ vty_out (vty, "%s IP%s access list %s\n",
mfilter->cisco ?
(filter->extended ? "Extended" : "Standard") : "Zebra",
afi == AFI_IP6 ? "v6" : "",
else
{
if (filter->addr_mask.s_addr == 0xffffffff)
- vty_outln (vty, " any");
+ vty_out (vty, " any\n");
else
{
vty_out (vty, " %s", inet_ntoa (filter->addr));
if (write)
{
- vty_outln (vty, "%s IP%s access list %s",
+ vty_out (vty, "%s IP%s access list %s\n",
mfilter->cisco ?
(filter->extended ? "Extended" : "Standard") : "Zebra",
afi == AFI_IP6 ? "v6" : "",
else
{
if (filter->addr_mask.s_addr == 0xffffffff)
- vty_outln (vty, " any");
+ vty_out (vty, " any\n");
else
{
vty_out (vty, " %s", inet_ntoa (filter->addr));
else
{
if (filter->addr_mask.s_addr == 0xffffffff)
- vty_outln (vty, " any");
+ vty_out (vty, " any\n");
else
{
vty_out (vty, " %s", inet_ntoa (filter->addr));
{
if (access->remark)
{
- vty_outln (vty, "%saccess-list %s remark %s",
+ vty_out (vty, "%saccess-list %s remark %s\n",
afi == AFI_IP ? "" : "ipv6 ",
access->name,access->remark);
write++;
{
if (access->remark)
{
- vty_outln (vty, "%saccess-list %s remark %s",
+ vty_out (vty, "%saccess-list %s remark %s\n",
afi == AFI_IP ? "" : "ipv6 ",
access->name,access->remark);
write++;
// print completions
for (i = 0; i < vector_active (comps); i++) {
tkn = vector_slot (comps, i);
- vty_outln (vty, " %-*s %s", width, tkn->text, tkn->desc);
+ vty_out (vty, " %-*s %s\n", width, tkn->text, tkn->desc);
}
for (i = 0; i < vector_active (comps); i++)
vector_free (comps);
}
else
- vty_outln (vty, "%% No match");
+ vty_out (vty, "%% No match\n");
// free resources
list_delete (completions);
// print completions or relevant error message
if (element)
{
- vty_outln (vty, "Matched: %s", element->string);
+ vty_out (vty, "Matched: %s\n", element->string);
struct listnode *ln;
struct cmd_token *token;
for (ALL_LIST_ELEMENTS_RO(argvv,ln,token))
- vty_outln (vty, "%s -- %s", token->text, token->arg);
+ vty_out (vty, "%s -- %s\n", token->text, token->arg);
- vty_outln (vty, "func: %p", element->func);
+ vty_out (vty, "func: %p\n", element->func);
list_delete (argvv);
}
assert(MATCHER_ERROR(result));
switch (result) {
case MATCHER_NO_MATCH:
- vty_outln (vty, "%% Unknown command");
+ vty_out (vty, "%% Unknown command\n");
break;
case MATCHER_INCOMPLETE:
- vty_outln (vty, "%% Incomplete command");
+ vty_out (vty, "%% Incomplete command\n");
break;
case MATCHER_AMBIGUOUS:
- vty_outln (vty, "%% Ambiguous command");
+ vty_out (vty, "%% Ambiguous command\n");
break;
default:
- vty_outln (vty, "%% Unknown error");
+ vty_out (vty, "%% Unknown error\n");
break;
}
}
nodegraph = cnode->cmdgraph;
if (!nodegraph)
continue;
- vty_outln (vty, "scanning node %d", scannode - 1);
+ vty_out (vty, "scanning node %d\n", scannode - 1);
}
commands = cmd_graph_permutations (nodegraph);
{
int same = prev && !strcmp (prev->cmd, cur->cmd);
if (printall && !same)
- vty_outln (vty, "'%s' [%x]", cur->cmd, cur->el->daemon);
+ vty_out (vty, "'%s' [%x]\n", cur->cmd, cur->el->daemon);
if (same)
{
- vty_outln (vty, "'%s' AMBIGUOUS:", cur->cmd);
- vty_outln (vty, " %s%s '%s'", prev->el->name, VTYNL,
+ vty_out (vty, "'%s' AMBIGUOUS:\n", cur->cmd);
+ vty_out (vty, " %s%s '%s'\n", prev->el->name, VTYNL,
prev->el->string);
- vty_outln (vty, " %s%s '%s'", cur->el->name, VTYNL,
+ vty_out (vty, " %s%s '%s'\n", cur->el->name, VTYNL,
cur->el->string);
vty_out (vty, VTYNL);
ambig++;
vty_out (vty, VTYNL);
} while (scan && scannode < LINK_PARAMS_NODE);
- vty_outln (vty, "%d ambiguous commands found.", ambig);
+ vty_out (vty, "%d ambiguous commands found.\n", ambig);
if (scan)
nodegraph = NULL;
cnode = vector_slot (cmdvec, atoi (argv[2]->arg));
if (!cnode)
{
- vty_outln (vty, "%% no such node");
+ vty_out (vty, "%% no such node\n");
return CMD_WARNING;
}
- vty_outln (vty, "node %d", (int)cnode->node);
+ vty_out (vty, "node %d\n", (int)cnode->node);
nodegraph = cnode->cmdgraph;
return CMD_SUCCESS;
}
if (stackpos == MAXDEPTH)
{
- vty_outln (vty, " -aborting! (depth limit)");
+ vty_out (vty, " -aborting! (depth limit)\n");
return;
}
stack[stackpos++] = start;
if (adj == start)
vty_out(vty, "*");
else if (((struct cmd_token *)adj->data)->type == END_TKN)
- vty_outln (vty, "--END");
+ vty_out (vty, "--END\n");
else {
size_t k;
for (k = 0; k < stackpos; k++)
if (stack[k] == adj) {
- vty_outln (vty, "<<loop@%zu ", k);
+ vty_out (vty, "<<loop@%zu \n", k);
break;
}
if (k == stackpos)
struct cmd_token *token = cmd_token_new (START_TKN, 0, NULL, NULL);
graph_new_node (*graph, token, (void (*)(void *)) &cmd_token_del);
if (vty)
- vty_outln (vty, "initialized graph");
+ vty_out (vty, "initialized graph\n");
}
char underln[sizeof(header) + strlen(frr_protonameinst)];
memset (underln, '-', sizeof(underln));
underln[sizeof(underln) - 1] = '\0';
- vty_outln (vty, "%s%s", header, frr_protonameinst);
- vty_outln (vty, "%s", underln);
+ vty_out (vty, "%s%s\n", header, frr_protonameinst);
+ vty_out (vty, "%s\n", underln);
- vty_outln (vty, "# allocated: %d", _hashes->count);
- vty_outln (vty, "# named: %d%s", tt->nrows - 1, VTYNL);
+ vty_out (vty, "# allocated: %d\n", _hashes->count);
+ vty_out (vty, "# named: %d%s\n", tt->nrows - 1, VTYNL);
if (tt->nrows > 1)
{
XFREE (MTYPE_TMP, table);
}
else
- vty_outln (vty, "No named hash tables to display.");
+ vty_out (vty, "No named hash tables to display.\n");
ttable_del (tt);
if (!ifp)
{
- vty_outln (vty, "%% interface %s not in %s", ifname, vrfname);
+ vty_out (vty, "%% interface %s not in %s\n", ifname, vrfname);
return CMD_WARNING;
}
VTY_PUSH_CONTEXT (INTERFACE_NODE, ifp);
type = IF_RMAP_OUT;
else
{
- vty_outln (vty, "route-map direction must be [in|out]");
+ vty_out (vty, "route-map direction must be [in|out]\n");
return CMD_WARNING;
}
type = IF_RMAP_OUT;
else
{
- vty_outln (vty, "route-map direction must be [in|out]");
+ vty_out (vty, "route-map direction must be [in|out]\n");
return CMD_WARNING;
}
ret = if_rmap_unset (argv[idx_ifname]->arg, type, argv[idx_routemap_name]->arg);
if (! ret)
{
- vty_outln (vty, "route-map doesn't exist");
+ vty_out (vty, "route-map doesn't exist\n");
return CMD_WARNING;
}
return CMD_SUCCESS;
if (if_rmap->routemap[IF_RMAP_IN])
{
- vty_outln (vty, " route-map %s in %s",
+ vty_out (vty, " route-map %s in %s\n",
if_rmap->routemap[IF_RMAP_IN],
if_rmap->ifname);
write++;
if (if_rmap->routemap[IF_RMAP_OUT])
{
- vty_outln (vty, " route-map %s out %s",
+ vty_out (vty, " route-map %s out %s\n",
if_rmap->routemap[IF_RMAP_OUT],
if_rmap->ifname);
write++;
if (! keychain)
{
- vty_outln (vty, "Can't find keychain %s", argv[idx_word]->arg);
+ vty_out (vty, "Can't find keychain %s\n", argv[idx_word]->arg);
return CMD_WARNING;
}
key = key_lookup (keychain, index);
if (! key)
{
- vty_outln (vty, "Can't find key %d", index);
+ vty_out (vty, "Can't find key %d\n", index);
return CMD_WARNING;
}
time_start = key_str2time (stime_str, sday_str, smonth_str, syear_str);
if (time_start < 0)
{
- vty_outln (vty, "Malformed time value");
+ vty_out (vty, "Malformed time value\n");
return CMD_WARNING;
}
time_end = key_str2time (etime_str, eday_str, emonth_str, eyear_str);
if (time_end < 0)
{
- vty_outln (vty, "Malformed time value");
+ vty_out (vty, "Malformed time value\n");
return CMD_WARNING;
}
if (time_end <= time_start)
{
- vty_outln (vty, "Expire time is not later than start time");
+ vty_out (vty, "Expire time is not later than start time\n");
return CMD_WARNING;
}
time_start = key_str2time (stime_str, sday_str, smonth_str, syear_str);
if (time_start < 0)
{
- vty_outln (vty, "Malformed time value");
+ vty_out (vty, "Malformed time value\n");
return CMD_WARNING;
}
krange->start = time_start;
time_start = key_str2time (stime_str, sday_str, smonth_str, syear_str);
if (time_start < 0)
{
- vty_outln (vty, "Malformed time value");
+ vty_out (vty, "Malformed time value\n");
return CMD_WARNING;
}
krange->start = time_start;
for (ALL_LIST_ELEMENTS_RO (keychain_list, node, keychain))
{
- vty_outln (vty, "key chain %s", keychain->name);
+ vty_out (vty, "key chain %s\n", keychain->name);
for (ALL_LIST_ELEMENTS_RO (keychain->key, knode, key))
{
- vty_outln (vty, " key %d", key->index);
+ vty_out (vty, " key %d\n", key->index);
if (key->string)
- vty_outln (vty, " key-string %s", key->string);
+ vty_out (vty, " key-string %s\n", key->string);
if (key->accept.start)
{
vty_out (vty, VTYNL);
}
}
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
return 0;
struct mallinfo minfo = mallinfo();
char buf[MTYPE_MEMSTR_LEN];
- vty_outln (vty, "System allocator statistics:");
- vty_outln (vty, " Total heap allocated: %s",
+ vty_out (vty, "System allocator statistics:\n");
+ vty_out (vty, " Total heap allocated: %s\n",
mtype_memstr(buf, MTYPE_MEMSTR_LEN, minfo.arena));
- vty_outln (vty, " Holding block headers: %s",
+ vty_out (vty, " Holding block headers: %s\n",
mtype_memstr(buf, MTYPE_MEMSTR_LEN, minfo.hblkhd));
- vty_outln (vty, " Used small blocks: %s",
+ vty_out (vty, " Used small blocks: %s\n",
mtype_memstr(buf, MTYPE_MEMSTR_LEN, minfo.usmblks));
- vty_outln (vty, " Used ordinary blocks: %s",
+ vty_out (vty, " Used ordinary blocks: %s\n",
mtype_memstr(buf, MTYPE_MEMSTR_LEN, minfo.uordblks));
- vty_outln (vty, " Free small blocks: %s",
+ vty_out (vty, " Free small blocks: %s\n",
mtype_memstr(buf, MTYPE_MEMSTR_LEN, minfo.fsmblks));
- vty_outln (vty, " Free ordinary blocks: %s",
+ vty_out (vty, " Free ordinary blocks: %s\n",
mtype_memstr(buf, MTYPE_MEMSTR_LEN, minfo.fordblks));
- vty_outln (vty, " Ordinary blocks: %ld",
+ vty_out (vty, " Ordinary blocks: %ld\n",
(unsigned long)minfo.ordblks);
- vty_outln (vty, " Small blocks: %ld",
+ vty_out (vty, " Small blocks: %ld\n",
(unsigned long)minfo.smblks);
- vty_outln (vty, " Holding blocks: %ld",
+ vty_out (vty, " Holding blocks: %ld\n",
(unsigned long)minfo.hblks);
- vty_outln (vty,"(see system documentation for 'mallinfo' for meaning)");
+ vty_out (vty,"(see system documentation for 'mallinfo' for meaning)\n");
return 1;
}
#endif /* HAVE_MALLINFO */
{
struct vty *vty = arg;
if (!mt)
- vty_outln (vty, "--- qmem %s ---", mg->name);
+ vty_out (vty, "--- qmem %s ---\n", mg->name);
else {
if (mt->n_alloc != 0) {
char size[32];
snprintf(size, sizeof(size), "%6zu", mt->size);
- vty_outln (vty, "%-30s: %10zu %s",
+ vty_out (vty, "%-30s: %10zu %s\n",
mt->name, mt->n_alloc,
mt->size == 0 ? "" : mt->size == SIZE_VAR ? "(variably sized)" : size);
}
{
struct frrmod_runtime *plug = frrmod_list;
- vty_outln (vty, "%-12s %-25s %s%s",
+ vty_out (vty, "%-12s %-25s %s%s\n",
"Module Name", "Version", "Description",
VTYNL);
while (plug)
{
const struct frrmod_info *i = plug->info;
- vty_outln (vty, "%-12s %-25s %s", i->name, i->version,i->description);
+ vty_out (vty, "%-12s %-25s %s\n", i->name, i->version,i->description);
if (plug->dl_handle)
{
#ifdef HAVE_DLINFO_ORIGIN
{
name = strrchr(lm->l_name, '/');
name = name ? name + 1 : lm->l_name;
- vty_outln (vty, "\tfrom: %s/%s", origin, name);
+ vty_out (vty, "\tfrom: %s/%s\n", origin, name);
}
# else
- vty_outln (vty, "\tfrom: %s ", origin, plug->load_name);
+ vty_out (vty, "\tfrom: %s \n", origin, plug->load_name);
# endif
#else
- vty_outln (vty, "\tfrom: %s", plug->load_name);
+ vty_out (vty, "\tfrom: %s\n", plug->load_name);
#endif
}
plug = plug->next;
if (! result)
{
- vty_outln (vty, "Invalid pathname: %s",safe_strerror(errno));
+ vty_out (vty, "Invalid pathname: %s\n",safe_strerror(errno));
return NULL;
}
return pathname;
if (!ns)
{
- vty_outln (vty, "NS %u is not found", ns_id);
+ vty_out (vty, "NS %u is not found\n", ns_id);
return CMD_SUCCESS;
}
if (ns->name && strcmp (ns->name, pathname) != 0)
{
- vty_outln (vty, "Incorrect NETNS file name");
+ vty_out (vty, "Incorrect NETNS file name\n");
return CMD_WARNING;
}
if (ns->ns_id == NS_DEFAULT || ns->name == NULL)
continue;
- vty_outln (vty, "logical-router %u netns %s", ns->ns_id,ns->name);
+ vty_out (vty, "logical-router %u netns %s\n", ns->ns_id,ns->name);
write = 1;
}
static int
vty_invalid_prefix_range (struct vty *vty, const char *prefix)
{
- vty_outln (vty, "%% Invalid prefix range for %s, make sure: len < ge-value <= le-value",
+ vty_out (vty, "%% Invalid prefix range for %s, make sure: len < ge-value <= le-value\n",
prefix);
return CMD_WARNING;
}
type = PREFIX_DENY;
else
{
- vty_outln (vty, "%% prefix type must be permit or deny");
+ vty_out (vty, "%% prefix type must be permit or deny\n");
return CMD_WARNING;
}
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv4 prefix");
+ vty_out (vty, "%% Malformed IPv4 prefix\n");
return CMD_WARNING;
}
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv6 prefix");
+ vty_out (vty, "%% Malformed IPv6 prefix\n");
return CMD_WARNING;
}
break;
case AFI_L2VPN:
default:
- vty_outln (vty, "%% Unrecognized AFI (%d)", afi);
+ vty_out (vty, "%% Unrecognized AFI (%d)\n", afi);
return CMD_WARNING;
break;
}
plist = prefix_list_lookup (afi, name);
if (! plist)
{
- vty_outln (vty, "%% Can't find specified prefix-list");
+ vty_out (vty, "%% Can't find specified prefix-list\n");
return CMD_WARNING;
}
/* We must have, at a minimum, both the type and prefix here */
if ((typestr == NULL) || (prefix == NULL))
{
- vty_outln (vty, "%% Both prefix and type required");
+ vty_out (vty, "%% Both prefix and type required\n");
return CMD_WARNING;
}
type = PREFIX_DENY;
else
{
- vty_outln (vty, "%% prefix type must be permit or deny");
+ vty_out (vty, "%% prefix type must be permit or deny\n");
return CMD_WARNING;
}
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv4 prefix");
+ vty_out (vty, "%% Malformed IPv4 prefix\n");
return CMD_WARNING;
}
}
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv6 prefix");
+ vty_out (vty, "%% Malformed IPv6 prefix\n");
return CMD_WARNING;
}
}
if (pentry == NULL)
{
- vty_outln (vty, "%% Can't find specified prefix-list");
+ vty_out (vty, "%% Can't find specified prefix-list\n");
return CMD_WARNING;
}
plist = prefix_list_lookup (afi, name);
if (! plist)
{
- vty_outln (vty, "%% Can't find specified prefix-list");
+ vty_out (vty, "%% Can't find specified prefix-list\n");
return CMD_WARNING;
}
if (dtype == normal_display)
{
- vty_outln (vty, "ip%s prefix-list %s: %d entries",
+ vty_out (vty, "ip%s prefix-list %s: %d entries\n",
afi == AFI_IP ? "" : "v6",
plist->name, plist->count);
if (plist->desc)
- vty_outln (vty, " Description: %s", plist->desc);
+ vty_out (vty, " Description: %s\n", plist->desc);
}
else if (dtype == summary_display || dtype == detail_display)
{
- vty_outln (vty, "ip%s prefix-list %s:",
+ vty_out (vty, "ip%s prefix-list %s:\n",
afi == AFI_IP ? "" : "v6", plist->name);
if (plist->desc)
- vty_outln (vty, " Description: %s", plist->desc);
+ vty_out (vty, " Description: %s\n", plist->desc);
- vty_outln (vty, " count: %d, range entries: %d, sequences: %u - %u",
+ vty_out (vty, " count: %d, range entries: %d, sequences: %u - %u\n",
plist->count, plist->rangecount,
plist->head ? plist->head->seq : 0,
plist->tail ? plist->tail->seq : 0);
plist = prefix_list_lookup (afi, name);
if (! plist)
{
- vty_outln (vty, "%% Can't find specified prefix-list");
+ vty_out (vty, "%% Can't find specified prefix-list\n");
return CMD_WARNING;
}
vty_show_prefix_entry (vty, afi, plist, master, dtype, seqnum);
if (dtype == detail_display || dtype == summary_display)
{
if (master->recent)
- vty_outln (vty, "Prefix-list with the last deletion/insertion: %s",
+ vty_out (vty, "Prefix-list with the last deletion/insertion: %s\n",
master->recent->name);
}
plist = prefix_list_lookup (afi, name);
if (! plist)
{
- vty_outln (vty, "%% Can't find specified prefix-list");
+ vty_out (vty, "%% Can't find specified prefix-list\n");
return CMD_WARNING;
}
ret = str2prefix (prefix, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% prefix is malformed");
+ vty_out (vty, "%% prefix is malformed\n");
return CMD_WARNING;
}
plist = prefix_list_lookup (afi, name);
if (! plist)
{
- vty_outln (vty, "%% Can't find specified prefix-list");
+ vty_out (vty, "%% Can't find specified prefix-list\n");
return CMD_WARNING;
}
ret = str2prefix (prefix, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% prefix is malformed");
+ vty_out (vty, "%% prefix is malformed\n");
return CMD_WARNING;
}
}
if (! master->seqnum)
{
- vty_outln (vty, "no ip%s prefix-list sequence-number",
+ vty_out (vty, "no ip%s prefix-list sequence-number\n",
afi == AFI_IP ? "" : "v6");
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
for (plist = master->num.head; plist; plist = plist->next)
{
if (plist->desc)
{
- vty_outln (vty, "ip%s prefix-list %s description %s",
+ vty_out (vty, "ip%s prefix-list %s description %s\n",
afi == AFI_IP ? "" : "v6",
plist->name, plist->desc);
write++;
{
if (plist->desc)
{
- vty_outln (vty, "ip%s prefix-list %s description %s",
+ vty_out (vty, "ip%s prefix-list %s description %s\n",
afi == AFI_IP ? "" : "v6",
plist->name, plist->desc);
write++;
else
json_object_object_add(json, "ipv6PrefixList", json_prefix);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
else
{
- vty_outln (vty, "ip%s prefix-list %s: %d entries",
+ vty_out (vty, "ip%s prefix-list %s: %d entries\n",
afi == AFI_IP ? "" : "v6",
plist->name, plist->count);
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% [%s] Can't find rule.", frr_protonameinst);
+ vty_out (vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.",
+ vty_out (vty, "%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
return CMD_WARNING;
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% [%s] Can't find rule.", frr_protonameinst);
+ vty_out (vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
break;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.",
+ vty_out (vty, "%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
break;
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% [%s] Can't find rule.", frr_protonameinst);
+ vty_out (vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.",
+ vty_out (vty, "%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
return CMD_WARNING;
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% [%s] Can't find rule.", frr_protonameinst);
+ vty_out (vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.",
+ vty_out (vty, "%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
return CMD_WARNING;
}
struct route_map_index *index;
struct route_map_rule *rule;
- vty_outln (vty, "%s:", frr_protonameinst);
+ vty_out (vty, "%s:\n", frr_protonameinst);
for (index = map->head; index; index = index->next)
{
- vty_outln (vty, "route-map %s, %s, sequence %d",
+ vty_out (vty, "route-map %s, %s, sequence %d\n",
map->name, route_map_type_str (index->type),
index->pref);
/* Description */
if (index->description)
- vty_outln (vty, " Description:%s %s", VTYNL,
+ vty_out (vty, " Description:%s %s\n", VTYNL,
index->description);
/* Match clauses */
- vty_outln (vty, " Match clauses:");
+ vty_out (vty, " Match clauses:\n");
for (rule = index->match_list.head; rule; rule = rule->next)
- vty_outln (vty, " %s %s",
+ vty_out (vty, " %s %s\n",
rule->cmd->str, rule->rule_str);
- vty_outln (vty, " Set clauses:");
+ vty_out (vty, " Set clauses:\n");
for (rule = index->set_list.head; rule; rule = rule->next)
- vty_outln (vty, " %s %s",
+ vty_out (vty, " %s %s\n",
rule->cmd->str, rule->rule_str);
/* Call clause */
- vty_outln (vty, " Call clause:");
+ vty_out (vty, " Call clause:\n");
if (index->nextrm)
- vty_outln (vty, " Call %s", index->nextrm);
+ vty_out (vty, " Call %s\n", index->nextrm);
/* Exit Policy */
- vty_outln (vty, " Action:");
+ vty_out (vty, " Action:\n");
if (index->exitpolicy == RMAP_GOTO)
- vty_outln (vty, " Goto %d", index->nextpref);
+ vty_out (vty, " Goto %d\n", index->nextpref);
else if (index->exitpolicy == RMAP_NEXT)
- vty_outln (vty, " Continue to next entry");
+ vty_out (vty, " Continue to next entry\n");
else if (index->exitpolicy == RMAP_EXIT)
- vty_outln (vty, " Exit routemap");
+ vty_out (vty, " Exit routemap\n");
}
}
}
else
{
- vty_outln (vty, "%s: 'route-map %s' not found", frr_protonameinst,
+ vty_out (vty, "%s: 'route-map %s' not found\n", frr_protonameinst,
name);
return CMD_SUCCESS;
}
ret = str2sockunion (argv[idx_ipv4]->arg, &su);
if (ret < 0)
{
- vty_outln (vty, "%% Malformed nexthop address");
+ vty_out (vty, "%% Malformed nexthop address\n");
return CMD_WARNING;
}
if (su.sin.sin_addr.s_addr == 0 ||
ret = inet_pton (AF_INET6, argv[idx_ipv6]->arg, &addr);
if (!ret)
{
- vty_outln (vty, "%% Malformed nexthop address");
+ vty_out (vty, "%% Malformed nexthop address\n");
return CMD_WARNING;
}
if (!IN6_IS_ADDR_LINKLOCAL(&addr))
{
- vty_outln (vty, "%% Invalid link-local nexthop address");
+ vty_out (vty, "%% Invalid link-local nexthop address\n");
return CMD_WARNING;
}
map = route_map_lookup_by_name (mapname);
if (map == NULL)
{
- vty_outln (vty, "%% Could not find route-map %s", mapname);
+ vty_out (vty, "%% Could not find route-map %s\n", mapname);
return CMD_WARNING;
}
map = route_map_lookup_by_name (mapname);
if (map == NULL)
{
- vty_outln (vty, "%% Could not find route-map %s", mapname);
+ vty_out (vty, "%% Could not find route-map %s\n", mapname);
return CMD_WARNING;
}
index = route_map_index_lookup (map, permit, pref);
if (index == NULL)
{
- vty_outln (vty, "%% Could not find route-map entry %s %s",
+ vty_out (vty, "%% Could not find route-map entry %s %s\n",
mapname, prefstr);
return CMD_WARNING;
}
if (index->type == RMAP_DENY)
{
/* Under a deny clause, match means it's finished. No need to set next */
- vty_outln (vty,"on-match next not supported under route-map deny");
+ vty_out (vty,"on-match next not supported under route-map deny\n");
return CMD_WARNING;
}
index->exitpolicy = RMAP_NEXT;
if (index->type == RMAP_DENY)
{
/* Under a deny clause, match means it's finished. No need to go anywhere */
- vty_outln (vty,"on-match goto not supported under route-map deny");
+ vty_out (vty,"on-match goto not supported under route-map deny\n");
return CMD_WARNING;
}
if (d <= index->pref)
{
/* Can't allow you to do that, Dave */
- vty_outln (vty, "can't jump backwards in route-maps");
+ vty_out (vty, "can't jump backwards in route-maps\n");
return CMD_WARNING;
}
else
for (index = map->head; index; index = index->next)
{
if (!first)
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
else
first = 0;
- vty_outln (vty, "route-map %s %s %d",
+ vty_out (vty, "route-map %s %s %d\n",
map->name,
route_map_type_str (index->type),
index->pref);
if (index->description)
- vty_outln (vty, " description %s", index->description);
+ vty_out (vty, " description %s\n", index->description);
for (rule = index->match_list.head; rule; rule = rule->next)
- vty_outln (vty, " match %s %s", rule->cmd->str,
+ vty_out (vty, " match %s %s\n", rule->cmd->str,
rule->rule_str ? rule->rule_str : "");
for (rule = index->set_list.head; rule; rule = rule->next)
- vty_outln (vty, " set %s %s", rule->cmd->str,
+ vty_out (vty, " set %s %s\n", rule->cmd->str,
rule->rule_str ? rule->rule_str : "");
if (index->nextrm)
- vty_outln (vty, " call %s", index->nextrm);
+ vty_out (vty, " call %s\n", index->nextrm);
if (index->exitpolicy == RMAP_GOTO)
- vty_outln (vty, " on-match goto %d", index->nextpref);
+ vty_out (vty, " on-match goto %d\n", index->nextpref);
if (index->exitpolicy == RMAP_NEXT)
- vty_outln (vty," on-match next");
+ vty_out (vty," on-match next\n");
write++;
}
if (!l)
l = skiplist_last_created;
- vty_outln (vty, "Skiplist %p has max level %d", l, l->level);
+ vty_out (vty, "Skiplist %p has max level %d\n", l, l->level);
for (i = l->level; i >= 0; --i)
- vty_outln (vty, " @%d: %ld",
+ vty_out (vty, " @%d: %ld\n",
i,(long)((l->stats->forward[i]) - (struct skiplistnode *)NULL));
}
vty_out (vty, "%s%d", first ? "" : ".", (int) smux_oid[i]);
first = 0;
}
- vty_outln (vty, " %s", smux_passwd);
+ vty_out (vty, " %s\n", smux_passwd);
}
return 0;
}
spf_backoff_show(struct spf_backoff *backoff, struct vty *vty,
const char *prefix)
{
- vty_outln (vty, "%sCurrent state: %s", prefix,
+ vty_out (vty, "%sCurrent state: %s\n", prefix,
spf_backoff_state2str(backoff->state));
- vty_outln (vty, "%sInit timer: %ld msec", prefix,
+ vty_out (vty, "%sInit timer: %ld msec\n", prefix,
backoff->init_delay);
- vty_outln (vty, "%sShort timer: %ld msec", prefix,
+ vty_out (vty, "%sShort timer: %ld msec\n", prefix,
backoff->short_delay);
- vty_outln (vty, "%sLong timer: %ld msec", prefix,
+ vty_out (vty, "%sLong timer: %ld msec\n", prefix,
backoff->long_delay);
- vty_outln (vty, "%sHolddown timer: %ld msec", prefix,
+ vty_out (vty, "%sHolddown timer: %ld msec\n", prefix,
backoff->holddown);
if (backoff->t_holddown)
{
struct timeval remain = thread_timer_remain(backoff->t_holddown);
- vty_outln (vty, "%s Still runs for %ld msec",
+ vty_out (vty, "%s Still runs for %ld msec\n",
prefix, remain.tv_sec * 1000 + remain.tv_usec / 1000);
}
else
{
- vty_outln (vty, "%s Inactive", prefix);
+ vty_out (vty, "%s Inactive\n", prefix);
}
- vty_outln (vty, "%sTimeToLearn timer: %ld msec", prefix,
+ vty_out (vty, "%sTimeToLearn timer: %ld msec\n", prefix,
backoff->timetolearn);
if (backoff->t_timetolearn)
{
struct timeval remain = thread_timer_remain(backoff->t_timetolearn);
- vty_outln (vty, "%s Still runs for %ld msec",
+ vty_out (vty, "%s Still runs for %ld msec\n",
prefix, remain.tv_sec * 1000 + remain.tv_usec / 1000);
}
else
{
- vty_outln (vty, "%s Inactive", prefix);
+ vty_out (vty, "%s Inactive\n", prefix);
}
- vty_outln (vty, "%sFirst event: %s", prefix,
+ vty_out (vty, "%sFirst event: %s\n", prefix,
timeval_format(&backoff->first_event_time));
- vty_outln (vty, "%sLast event: %s", prefix,
+ vty_out (vty, "%sLast event: %s\n", prefix,
timeval_format(&backoff->last_event_time));
}
if (debug_spf_backoff)
{
- vty_outln (vty, "debug spf-delay-ietf");
+ vty_out (vty, "debug spf-delay-ietf\n");
written++;
}
a->total_active, a->cpu.total/1000, a->cpu.total%1000, a->total_calls,
a->cpu.total/a->total_calls, a->cpu.max,
a->real.total/a->total_calls, a->real.max);
- vty_outln (vty, " %c%c%c%c%c %s",
+ vty_out (vty, " %c%c%c%c%c %s\n",
a->types & (1 << THREAD_READ) ? 'R':' ',
a->types & (1 << THREAD_WRITE) ? 'W':' ',
a->types & (1 << THREAD_TIMER) ? 'T':' ',
underline[sizeof(underline)] = '\0';
vty_out (vty, VTYNL);
- vty_outln(vty, "Showing statistics for pthread %s", name);
- vty_outln(vty, "-------------------------------%s", underline);
- vty_outln(vty, "%21s %18s %18s", "", "CPU (user+system):", "Real (wall-clock):");
+ 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):");
vty_out(vty, "Active Runtime(ms) Invoked Avg uSec Max uSecs");
vty_out(vty, " Avg uSec Max uSecs");
- vty_outln(vty, " Type Thread");
+ vty_out(vty, " Type Thread\n");
if (m->cpu_record->count)
hash_iterate(m->cpu_record,
cpu_record_hash_print,
args);
else
- vty_outln(vty, "No data to display yet.");
+ vty_out(vty, "No data to display yet.\n");
vty_out(vty, VTYNL);
}
pthread_mutex_unlock (&masters_mtx);
vty_out(vty, VTYNL);
- vty_outln(vty, "Total thread statistics");
- vty_outln(vty, "-------------------------");
- vty_outln(vty, "%21s %18s %18s", "", "CPU (user+system):", "Real (wall-clock):");
+ vty_out(vty, "Total thread statistics\n");
+ vty_out(vty, "-------------------------\n");
+ vty_out(vty, "%21s %18s %18s\n", "", "CPU (user+system):", "Real (wall-clock):");
vty_out(vty, "Active Runtime(ms) Invoked Avg uSec Max uSecs");
vty_out(vty, " Avg uSec Max uSecs");
- vty_outln(vty, " Type Thread");
+ vty_out(vty, " Type Thread\n");
if (tmp.total_calls > 0)
vty_out_cpu_thread_history(vty, &tmp);
vrf_write_host (struct vty *vty)
{
if (debug_vrf)
- vty_outln (vty, "debug vrf");
+ vty_out (vty, "debug vrf\n");
return 1;
}
for (s = buf + strlen (buf); (s > buf) && isspace ((int)*(s - 1));
s--);
*s = '\0';
- vty_outln (vty, "%s", buf);
+ vty_out (vty, "%s\n", buf);
}
fclose (f);
}
else
- vty_outln (vty, "MOTD file not found");
+ vty_out (vty, "MOTD file not found\n");
}
else if (host.motd)
vty_out (vty, "%s", host.motd);
{
if (vty->node == AUTH_NODE)
{
- vty_outln (vty, "%% Bad passwords, too many failures!");
+ vty_out (vty, "%% Bad passwords, too many failures!\n");
vty->status = VTY_CLOSE;
}
else
{
/* AUTH_ENABLE_NODE */
vty->fail = 0;
- vty_outln (vty, "%% Bad enable passwords, too many failures!");
+ vty_out (vty, "%% Bad enable passwords, too many failures!\n");
vty->status = VTY_CLOSE;
}
}
{
case CMD_WARNING:
if (vty->type == VTY_FILE)
- vty_outln (vty, "Warning...");
+ vty_out (vty, "Warning...\n");
break;
case CMD_ERR_AMBIGUOUS:
- vty_outln (vty, "%% Ambiguous command.");
+ vty_out (vty, "%% Ambiguous command.\n");
break;
case CMD_ERR_NO_MATCH:
- vty_outln (vty, "%% [%s] Unknown command: %s", protocolname, buf);
+ vty_out (vty, "%% [%s] Unknown command: %s\n", protocolname, buf);
break;
case CMD_ERR_INCOMPLETE:
- vty_outln (vty, "%% Command incomplete.");
+ vty_out (vty, "%% Command incomplete.\n");
break;
}
cmd_free_strvec (vline);
switch (ret)
{
case CMD_ERR_AMBIGUOUS:
- vty_outln (vty, "%% Ambiguous command.");
+ vty_out (vty, "%% Ambiguous command.\n");
vty_prompt (vty);
vty_redraw_line (vty);
break;
if (!matched[0])
{
/* 2016-11-28 equinox -- need to debug, SEGV here */
- vty_outln (vty, "%% CLI BUG: FULL_MATCH with NULL str");
+ vty_out (vty, "%% CLI BUG: FULL_MATCH with NULL str\n");
vty_prompt (vty);
vty_redraw_line (vty);
break;
if (desc_width <= 0)
{
- vty_outln (vty, " %-*s %s", cmd_width, cmd, token->desc);
+ vty_out (vty, " %-*s %s\n", cmd_width, cmd, token->desc);
return;
}
strncpy (buf, p, pos);
buf[pos] = '\0';
- vty_outln (vty, " %-*s %s", cmd_width, cmd, buf);
+ vty_out (vty, " %-*s %s\n", cmd_width, cmd, buf);
cmd = "";
}
- vty_outln (vty, " %-*s %s", cmd_width, cmd, p);
+ vty_out (vty, " %-*s %s\n", cmd_width, cmd, p);
XFREE (MTYPE_TMP, buf);
}
switch (ret)
{
case CMD_ERR_AMBIGUOUS:
- vty_outln (vty, "%% Ambiguous command.");
+ vty_out (vty, "%% Ambiguous command.\n");
goto out;
break;
case CMD_ERR_NO_MATCH:
- vty_outln (vty, "%% There is no matched command.");
+ vty_out (vty, "%% There is no matched command.\n");
goto out;
break;
}
}
if (!token->desc)
- vty_outln (vty, " %-s",
+ vty_out (vty, " %-s\n",
token->text);
else if (desc_width >= strlen (token->desc))
- vty_outln (vty, " %-*s %s", width,
+ vty_out (vty, " %-*s %s\n", width,
token->text,
token->desc);
else
if ((token = token_cr))
{
if (!token->desc)
- vty_outln (vty, " %-s",
+ vty_out (vty, " %-s\n",
token->text);
else if (desc_width >= strlen (token->desc))
- vty_outln (vty, " %-*s %s", width,
+ vty_out (vty, " %-*s %s\n", width,
token->text,
token->desc);
else
vty_out (vty, "SE ");
break;
case TELOPT_ECHO:
- vty_outln (vty, "TELOPT_ECHO ");
+ vty_out (vty, "TELOPT_ECHO \n");
break;
case TELOPT_SGA:
- vty_outln (vty, "TELOPT_SGA ");
+ vty_out (vty, "TELOPT_SGA \n");
break;
case TELOPT_NAWS:
- vty_outln (vty, "TELOPT_NAWS ");
+ vty_out (vty, "TELOPT_NAWS \n");
break;
default:
vty_out (vty, "%x ", buf[i]);
/* Vty is not available if password isn't set. */
if (host.password == NULL && host.password_encrypt == NULL)
{
- vty_outln (vty, "Vty password is not set.");
+ vty_out (vty, "Vty password is not set.\n");
vty->status = VTY_CLOSE;
vty_close (vty);
return NULL;
/* Say hello to the world. */
vty_hello (vty);
if (! no_password_check)
- vty_outln (vty, "%sUser Access Verification%s", VTYNL,
+ vty_out (vty, "%sUser Access Verification%s\n", VTYNL,
VTYNL);
/* Setting up terminal. */
/* Clear command line buffer. */
vty->cp = vty->length = 0;
vty_clear_buf (vty);
- vty_outln (vty, "%% Command is too long.");
+ vty_out (vty, "%% Command is too long.\n");
}
else
{
/* Clear buffer*/
buffer_reset (vty->obuf);
- vty_outln (vty, "%sVty connection is timed out.", VTYNL);
+ vty_out (vty, "%sVty connection is timed out.\n", VTYNL);
/* Close connection. */
vty->status = VTY_CLOSE;
const char *accesslist = (argc == 3) ? argv[idx_word]->arg : NULL;
if (! vty_accesslist_name || (argc == 3 && strcmp(vty_accesslist_name, accesslist)))
{
- vty_outln (vty,"Access-class is not currently applied to vty");
+ vty_out (vty,"Access-class is not currently applied to vty\n");
return CMD_WARNING;
}
if (! vty_ipv6_accesslist_name ||
(argc == 4 && strcmp(vty_ipv6_accesslist_name, accesslist)))
{
- vty_outln (vty,"IPv6 access-class is not currently applied to vty");
+ vty_out (vty,"IPv6 access-class is not currently applied to vty\n");
return CMD_WARNING;
}
static int
vty_config_write (struct vty *vty)
{
- vty_outln (vty, "line vty");
+ vty_out (vty, "line vty\n");
if (vty_accesslist_name)
- vty_outln (vty, " access-class %s",
+ vty_out (vty, " access-class %s\n",
vty_accesslist_name);
if (vty_ipv6_accesslist_name)
- vty_outln (vty, " ipv6 access-class %s",
+ vty_out (vty, " ipv6 access-class %s\n",
vty_ipv6_accesslist_name);
/* exec-timeout */
if (vty_timeout_val != VTY_TIMEOUT_DEFAULT)
- vty_outln (vty, " exec-timeout %ld %ld",
+ vty_out (vty, " exec-timeout %ld %ld\n",
vty_timeout_val / 60,
vty_timeout_val % 60);
/* login */
if (no_password_check)
- vty_outln (vty, " no login");
+ vty_out (vty, " no login\n");
if (do_log_commands)
- vty_outln (vty, "log commands");
+ vty_out (vty, "log commands\n");
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
return CMD_SUCCESS;
}
struct listnode *node;
struct work_queue *wq;
- vty_outln (vty,
- "%c %8s %5s %8s %8s %21s",
+ vty_out (vty,
+ "%c %8s %5s %8s %8s %21s\n",
' ', "List","(ms) ","Q. Runs","Yields","Cycle Counts ");
- vty_outln (vty,
- "%c %8s %5s %8s %8s %7s %6s %8s %6s %s",
+ vty_out (vty,
+ "%c %8s %5s %8s %8s %7s %6s %8s %6s %s\n",
'P',
"Items",
"Hold",
for (ALL_LIST_ELEMENTS_RO (work_queues, node, wq))
{
- vty_outln (vty,"%c %8d %5d %8ld %8ld %7d %6d %8ld %6u %s",
+ vty_out (vty,"%c %8d %5d %8ld %8ld %7d %6d %8ld %6u %s\n",
(CHECK_FLAG (wq->flags, WQ_UNPLUGGED) ? ' ' : 'P'),
listcount (wq->items),
wq->spec.hold,
snprintf(buf, sizeof(buf), "Unknown error %d", ret);
}
- vty_outln (vty, "%% %s", str);
+ vty_out (vty, "%% %s\n", str);
return CMD_WARNING;
}
return CMD_SUCCESS;
}
- vty_outln (vty, "%% Invalid value %s", name);
+ vty_out (vty, "%% Invalid value %s\n", name);
return CMD_WARNING;
}
{
int i;
- vty_outln (vty, "NHRP debugging status:");
+ vty_out (vty, "NHRP debugging status:\n");
for (i = 0; debug_flags_desc[i].str != NULL; i++) {
if (debug_flags_desc[i].key == NHRP_DEBUG_ALL)
if (!(debug_flags_desc[i].key & debug_flags))
continue;
- vty_outln (vty, " NHRP %s debugging is on",
+ vty_out (vty, " NHRP %s debugging is on\n",
debug_flags_desc[i].str);
}
{
#ifndef NO_DEBUG
if (debug_flags == NHRP_DEBUG_ALL) {
- vty_outln (vty, "debug nhrp all");
+ vty_out (vty, "debug nhrp all\n");
} else {
int i;
continue;
if (!(debug_flags & debug_flags_desc[i].key))
continue;
- vty_outln (vty, "debug nhrp %s",
+ vty_out (vty, "debug nhrp %s\n",
debug_flags_desc[i].str);
}
}
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
#endif /* NO_DEBUG */
if (nhrp_event_socket_path) {
- vty_outln (vty, "nhrp event socket %s",
+ vty_out (vty, "nhrp event socket %s\n",
nhrp_event_socket_path);
}
if (netlink_nflog_group) {
- vty_outln (vty, "nhrp nflog-group %d",
+ vty_out (vty, "nhrp nflog-group %d\n",
netlink_nflog_group);
}
return;
if (!ctx->count) {
- vty_outln (vty, "%-8s %-8s %-24s %-24s %-6s %s",
+ vty_out (vty, "%-8s %-8s %-24s %-24s %-6s %s\n",
"Iface",
"Type",
"Protocol",
}
ctx->count++;
- vty_outln(ctx->vty, "%-8s %-8s %-24s %-24s %c%c%c %s",
+ vty_out(ctx->vty, "%-8s %-8s %-24s %-24s %c%c%c %s\n",
c->ifp->name,
nhrp_cache_type_str[c->cur.type],
sockunion2str(&c->remote_addr, buf[0], sizeof buf[0]),
char buf[2][SU_ADDRSTRLEN];
if (!ctx->count) {
- vty_outln (vty, "%-8s %-24s %-16s %-16s",
+ vty_out (vty, "%-8s %-24s %-16s %-16s\n",
"Iface",
"FQDN",
"NBMA",
}
ctx->count++;
- vty_outln (vty, "%-8s %-24s %-16s %-16s",
+ vty_out (vty, "%-8s %-24s %-16s %-16s\n",
n->ifp->name,
n->nbma_fqdn,
(reg && reg->peer) ? sockunion2str(®->peer->vc->remote.nbma,
char buf1[PREFIX_STRLEN], buf2[SU_ADDRSTRLEN];
if (!ctx->count) {
- vty_outln (vty, "%-8s %-24s %-24s %s",
+ vty_out (vty, "%-8s %-24s %-24s %s\n",
"Type",
"Prefix",
"Via",
ctx->count++;
c = s->cache;
- vty_outln(ctx->vty, "%-8s %-24s %-24s %s",
+ vty_out(ctx->vty, "%-8s %-24s %-24s %s\n",
nhrp_cache_type_str[s->type],
prefix2str(s->p, buf1, sizeof buf1),
c ? sockunion2str(&c->remote_addr, buf2, sizeof buf2) : "",
8 * family2addrsize(sockunion_family(&c->remote_addr)));
if (c->cur.peer) {
- vty_outln(ctx->vty,
- "NBMA-Address: %s",
+ vty_out(ctx->vty,
+ "NBMA-Address: %s\n",
sockunion2str(&c->cur.peer->vc->remote.nbma,
buf, sizeof buf));
}
if (sockunion_family(&c->cur.remote_nbma_natoa) != AF_UNSPEC) {
- vty_outln(ctx->vty,
- "NBMA-NAT-OA-Address: %s",
+ vty_out(ctx->vty,
+ "NBMA-NAT-OA-Address: %s\n",
sockunion2str(&c->cur.remote_nbma_natoa, buf, sizeof buf));
}
} else if (argv[3]->text[0] == 's') {
nhrp_shortcut_foreach(ctx.afi, show_ip_nhrp_shortcut, &ctx);
} else {
- vty_outln (vty, "Status: ok%s", VTYNL);
+ vty_out (vty, "Status: ok%s\n", VTYNL);
ctx.count++;
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp))
nhrp_cache_foreach(ifp, show_ip_opennhrp_cache, &ctx);
}
if (!ctx.count) {
- vty_outln (vty, "%% No entries");
+ vty_out (vty, "%% No entries\n");
return CMD_WARNING;
}
struct vty *vty = ctx;
char buf[2][SU_ADDRSTRLEN];
- vty_outln (vty, "%-24s %-24s %c %-4d %-24s",
+ vty_out (vty, "%-24s %-24s %c %-4d %-24s\n",
sockunion2str(&vc->local.nbma, buf[0], sizeof buf[0]),
sockunion2str(&vc->remote.nbma, buf[1], sizeof buf[1]),
notifier_active(&vc->notifier_list) ? 'n' : ' ',
SHOW_STR
"DMVPN information\n")
{
- vty_outln (vty, "%-24s %-24s %-6s %-4s %-24s",
+ vty_out (vty, "%-24s %-24s %-6s %-4s %-24s\n",
"Src",
"Dst",
"Flags",
}
if (!ctx.count) {
- vty_outln (vty, "%% No entries");
+ vty_out (vty, "%% No entries\n");
return CMD_WARNING;
}
- vty_outln (vty, "%% %d entries cleared", ctx.count);
+ vty_out (vty, "%% %d entries cleared\n", ctx.count);
return CMD_SUCCESS;
}
if (!c->map) return;
if (sockunion_family(&c->remote_addr) != ctx->family) return;
- vty_outln (vty, " %s nhrp map %s %s",
+ vty_out (vty, " %s nhrp map %s %s\n",
ctx->aficmd,
sockunion2str(&c->remote_addr, buf[0], sizeof buf[0]),
c->cur.type == NHRP_CACHE_LOCAL ? "local" : sockunion2str(&c->cur.peer->vc->remote.nbma, buf[1], sizeof buf[1]));
int i;
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
- vty_outln (vty, "interface %s", ifp->name);
+ vty_out (vty, "interface %s\n", ifp->name);
if (ifp->desc)
- vty_outln (vty, " description %s", ifp->desc);
+ vty_out (vty, " description %s\n", ifp->desc);
nifp = ifp->info;
if (nifp->ipsec_profile) {
vty_out (vty, VTYNL);
}
if (nifp->source)
- vty_outln (vty, " tunnel source %s",
+ vty_out (vty, " tunnel source %s\n",
nifp->source);
for (afi = 0; afi < AFI_MAX; afi++) {
aficmd = afi_to_cmd(afi);
if (ad->network_id)
- vty_outln (vty, " %s nhrp network-id %u",
+ vty_out (vty, " %s nhrp network-id %u\n",
aficmd,ad->network_id);
if (ad->holdtime != NHRPD_DEFAULT_HOLDTIME)
- vty_outln (vty, " %s nhrp holdtime %u",
+ vty_out (vty, " %s nhrp holdtime %u\n",
aficmd,ad->holdtime);
if (ad->configured_mtu < 0)
- vty_outln (vty, " %s nhrp mtu opennhrp",
+ vty_out (vty, " %s nhrp mtu opennhrp\n",
aficmd);
else if (ad->configured_mtu)
- vty_outln (vty, " %s nhrp mtu %u",
+ vty_out (vty, " %s nhrp mtu %u\n",
aficmd,ad->configured_mtu);
for (i = 0; interface_flags_desc[i].str != NULL; i++) {
if (!(ad->flags & interface_flags_desc[i].key))
continue;
- vty_outln (vty, " %s nhrp %s",
+ vty_out (vty, " %s nhrp %s\n",
aficmd, interface_flags_desc[i].str);
}
nhrp_cache_foreach(ifp, interface_config_write_nhrp_map, &mapctx);
list_for_each_entry(nhs, &ad->nhslist_head, nhslist_entry) {
- vty_outln (vty, " %s nhrp nhs %s nbma %s",
+ vty_out (vty, " %s nhrp nhs %s nbma %s\n",
aficmd,
sockunion_family(&nhs->proto_addr) == AF_UNSPEC ? "dynamic" : sockunion2str(&nhs->proto_addr, buf, sizeof buf),
nhs->nbma_fqdn);
}
}
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
return 0;
result = monotime_since(&oa->ts_spf, NULL);
if (result/TIMER_SECOND_MICRO > 0)
{
- vty_outln (vty, "SPF last executed %ld.%lds ago",
+ vty_out (vty, "SPF last executed %ld.%lds ago\n",
result/TIMER_SECOND_MICRO,
result % TIMER_SECOND_MICRO);
}
else
{
- vty_outln (vty, "SPF last executed %ldus ago",
+ vty_out (vty, "SPF last executed %ldus ago\n",
result);
}
}
else
- vty_outln (vty, "SPF has not been run");
+ vty_out (vty, "SPF has not been run\n");
}
if (!ospf6_area_stub_set (ospf6, area))
{
- vty_outln (vty,"First deconfigure all virtual link through this area");
+ vty_out (vty,"First deconfigure all virtual link through this area\n");
return CMD_WARNING;
}
if (!ospf6_area_stub_set (ospf6, area))
{
- vty_outln (vty,"First deconfigure all virtual link through this area");
+ vty_out (vty,"First deconfigure all virtual link through this area\n");
return CMD_WARNING;
}
bfd_info = (struct bfd_info *)oi->bfd_info;
if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
- vty_outln (vty, " ipv6 ospf6 bfd %d %d %d",
+ vty_out (vty, " ipv6 ospf6 bfd %d %d %d\n",
bfd_info->detect_mult, bfd_info->required_min_rx,
bfd_info->desired_min_tx);
else
- vty_outln (vty, " ipv6 ospf6 bfd");
+ vty_out (vty, " ipv6 ospf6 bfd\n");
}
/*
refbw = strtol (argv[idx_number]->arg, NULL, 10);
if (refbw < 1 || refbw > 4294967)
{
- vty_outln (vty, "reference-bandwidth value is invalid");
+ vty_out (vty, "reference-bandwidth value is invalid\n");
return CMD_WARNING;
}
if (ospf6->spf_delay != OSPF_SPF_DELAY_DEFAULT ||
ospf6->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT ||
ospf6->spf_max_holdtime != OSPF_SPF_MAX_HOLDTIME_DEFAULT)
- vty_outln (vty, " timers throttle spf %d %d %d",
+ vty_out (vty, " timers throttle spf %d %d %d\n",
ospf6->spf_delay, ospf6->spf_holdtime,
ospf6->spf_max_holdtime);
/* Redistribute configuration */
/* XXX */
- vty_outln (vty, " LSA minimum arrival %d msecs",o->lsa_minarrival);
+ vty_out (vty, " LSA minimum arrival %d msecs\n",o->lsa_minarrival);
/* Show SPF parameters */
vty_out(vty, " Initial SPF scheduling delay %d millisec(s)%s"
if (CHECK_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))
{
if (CHECK_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_DETAIL))
- vty_outln (vty, " All adjacency changes are logged");
+ vty_out (vty, " All adjacency changes are logged\n");
else
- vty_outln (vty, " Adjacency changes are logged");
+ vty_out (vty, " Adjacency changes are logged\n");
}
vty_out (vty, VTYNL);
struct ospf6_distance *odistance;
if (ospf6->distance_all)
- vty_outln (vty, " distance %u", ospf6->distance_all);
+ vty_out (vty, " distance %u\n", ospf6->distance_all);
if (ospf6->distance_intra
|| ospf6->distance_inter
{
char buf[PREFIX_STRLEN];
- vty_outln (vty, " distance %u %s %s", odistance->distance,
+ vty_out (vty, " distance %u %s %s\n", odistance->distance,
prefix2str (&rn->p, buf, sizeof (buf)),
odistance->access_list ? odistance->access_list : "");
}
if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))
{
if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_DETAIL))
- vty_outln (vty, " log-adjacency-changes detail");
+ vty_out (vty, " log-adjacency-changes detail\n");
else if (!DFLT_OSPF6_LOG_ADJACENCY_CHANGES)
- vty_outln (vty, " log-adjacency-changes");
+ vty_out (vty, " log-adjacency-changes\n");
}
else if (DFLT_OSPF6_LOG_ADJACENCY_CHANGES)
{
- vty_outln (vty, " no log-adjacency-changes");
+ vty_out (vty, " no log-adjacency-changes\n");
}
if (ospf6->ref_bandwidth != OSPF6_REFERENCE_BANDWIDTH)
/* LSA timers print. */
if (ospf6->lsa_minarrival != OSPF_MIN_LS_ARRIVAL)
- vty_outln (vty, " timers lsa min-arrival %d",ospf6->lsa_minarrival);
+ vty_out (vty, " timers lsa min-arrival %d\n",ospf6->lsa_minarrival);
ospf6_stub_router_config_write (vty);
ospf6_redistribute_config_write (vty);
ret = str2prefix_ipv6 (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
ret = str2prefix_ipv6 (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
rn = route_node_lookup (o->distance_table, (struct prefix *) &p);
if (!rn)
{
- vty_outln (vty, "Cant't find specified prefix");
+ vty_out (vty, "Cant't find specified prefix\n");
return CMD_WARNING;
}
if (vty != NULL)
{
int i;
- vty_outln (vty, " Added using OSPF API: %u octets of opaque data %s",
+ vty_out (vty, " Added using OSPF API: %u octets of opaque data %s\n",
opaquelen,
VALID_OPAQUE_INFO_LEN(lsa->data) ? "" : "(Invalid length?)");
vty_out (vty, " Opaque data: ");
bfd_info = (struct bfd_info *)params->bfd_info;
if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
- vty_outln (vty, " ip ospf bfd %d %d %d",
+ vty_out (vty, " ip ospf bfd %d %d %d\n",
bfd_info->detect_mult, bfd_info->required_min_rx,
bfd_info->desired_min_tx);
else
- vty_outln (vty, " ip ospf bfd");
+ vty_out (vty, " ip ospf bfd\n");
}
/*
int i;
if (ospf->instance)
- vty_outln (vty, "%sOSPF Instance: %d%s", VTYNL, ospf->instance,
+ vty_out (vty, "%sOSPF Instance: %d%s\n", VTYNL, ospf->instance,
VTYNL);
- vty_outln (vty, "OSPF debugging status:");
+ vty_out (vty, "OSPF debugging status:\n");
/* Show debug status for events. */
if (IS_DEBUG_OSPF(event,EVENT))
- vty_outln (vty, " OSPF event debugging is on");
+ vty_out (vty, " OSPF event debugging is on\n");
/* Show debug status for ISM. */
if (IS_DEBUG_OSPF (ism, ISM) == OSPF_DEBUG_ISM)
- vty_outln (vty, " OSPF ISM debugging is on");
+ vty_out (vty, " OSPF ISM debugging is on\n");
else
{
if (IS_DEBUG_OSPF (ism, ISM_STATUS))
- vty_outln (vty, " OSPF ISM status debugging is on");
+ vty_out (vty, " OSPF ISM status debugging is on\n");
if (IS_DEBUG_OSPF (ism, ISM_EVENTS))
- vty_outln (vty, " OSPF ISM event debugging is on");
+ vty_out (vty, " OSPF ISM event debugging is on\n");
if (IS_DEBUG_OSPF (ism, ISM_TIMERS))
- vty_outln (vty, " OSPF ISM timer debugging is on");
+ vty_out (vty, " OSPF ISM timer debugging is on\n");
}
/* Show debug status for NSM. */
if (IS_DEBUG_OSPF (nsm, NSM) == OSPF_DEBUG_NSM)
- vty_outln (vty, " OSPF NSM debugging is on");
+ vty_out (vty, " OSPF NSM debugging is on\n");
else
{
if (IS_DEBUG_OSPF (nsm, NSM_STATUS))
- vty_outln (vty, " OSPF NSM status debugging is on");
+ vty_out (vty, " OSPF NSM status debugging is on\n");
if (IS_DEBUG_OSPF (nsm, NSM_EVENTS))
- vty_outln (vty, " OSPF NSM event debugging is on");
+ vty_out (vty, " OSPF NSM event debugging is on\n");
if (IS_DEBUG_OSPF (nsm, NSM_TIMERS))
- vty_outln (vty, " OSPF NSM timer debugging is on");
+ vty_out (vty, " OSPF NSM timer debugging is on\n");
}
/* Show debug status for OSPF Packets. */
for (i = 0; i < 5; i++)
if (IS_DEBUG_OSPF_PACKET (i, SEND) && IS_DEBUG_OSPF_PACKET (i, RECV))
{
- vty_outln (vty, " OSPF packet %s%s debugging is on",
+ vty_out (vty, " OSPF packet %s%s debugging is on\n",
lookup_msg(ospf_packet_type_str, i + 1, NULL),
IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "");
}
else
{
if (IS_DEBUG_OSPF_PACKET (i, SEND))
- vty_outln (vty, " OSPF packet %s send%s debugging is on",
+ vty_out (vty, " OSPF packet %s send%s debugging is on\n",
lookup_msg(ospf_packet_type_str, i + 1, NULL),
IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "");
if (IS_DEBUG_OSPF_PACKET (i, RECV))
- vty_outln (vty, " OSPF packet %s receive%s debugging is on",
+ vty_out (vty, " OSPF packet %s receive%s debugging is on\n",
lookup_msg(ospf_packet_type_str, i + 1, NULL),
IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "");
}
/* Show debug status for OSPF LSAs. */
if (IS_DEBUG_OSPF (lsa, LSA) == OSPF_DEBUG_LSA)
- vty_outln (vty, " OSPF LSA debugging is on");
+ vty_out (vty, " OSPF LSA debugging is on\n");
else
{
if (IS_DEBUG_OSPF (lsa, LSA_GENERATE))
- vty_outln (vty, " OSPF LSA generation debugging is on");
+ vty_out (vty, " OSPF LSA generation debugging is on\n");
if (IS_DEBUG_OSPF (lsa, LSA_FLOODING))
- vty_outln (vty, " OSPF LSA flooding debugging is on");
+ vty_out (vty, " OSPF LSA flooding debugging is on\n");
if (IS_DEBUG_OSPF (lsa, LSA_INSTALL))
- vty_outln (vty, " OSPF LSA install debugging is on");
+ vty_out (vty, " OSPF LSA install debugging is on\n");
if (IS_DEBUG_OSPF (lsa, LSA_REFRESH))
- vty_outln (vty, " OSPF LSA refresh debugging is on");
+ vty_out (vty, " OSPF LSA refresh debugging is on\n");
}
/* Show debug status for Zebra. */
if (IS_DEBUG_OSPF (zebra, ZEBRA) == OSPF_DEBUG_ZEBRA)
- vty_outln (vty, " OSPF Zebra debugging is on");
+ vty_out (vty, " OSPF Zebra debugging is on\n");
else
{
if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE))
- vty_outln (vty, " OSPF Zebra interface debugging is on");
+ vty_out (vty, " OSPF Zebra interface debugging is on\n");
if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE))
- vty_outln (vty, " OSPF Zebra redistribute debugging is on");
+ vty_out (vty, " OSPF Zebra redistribute debugging is on\n");
}
/* Show debug status for NSSA. */
if (IS_DEBUG_OSPF (nssa, NSSA) == OSPF_DEBUG_NSSA)
- vty_outln (vty, " OSPF NSSA debugging is on");
+ vty_out (vty, " OSPF NSSA debugging is on\n");
vty_out (vty, VTYNL);
/* debug ospf ism (status|events|timers). */
if (IS_CONF_DEBUG_OSPF (ism, ISM) == OSPF_DEBUG_ISM)
- vty_outln (vty, "debug ospf%s ism", str);
+ vty_out (vty, "debug ospf%s ism\n", str);
else
{
if (IS_CONF_DEBUG_OSPF (ism, ISM_STATUS))
- vty_outln (vty, "debug ospf%s ism status", str);
+ vty_out (vty, "debug ospf%s ism status\n", str);
if (IS_CONF_DEBUG_OSPF (ism, ISM_EVENTS))
- vty_outln (vty, "debug ospf%s ism event", str);
+ vty_out (vty, "debug ospf%s ism event\n", str);
if (IS_CONF_DEBUG_OSPF (ism, ISM_TIMERS))
- vty_outln (vty, "debug ospf%s ism timer", str);
+ vty_out (vty, "debug ospf%s ism timer\n", str);
}
/* debug ospf nsm (status|events|timers). */
if (IS_CONF_DEBUG_OSPF (nsm, NSM) == OSPF_DEBUG_NSM)
- vty_outln (vty, "debug ospf%s nsm", str);
+ vty_out (vty, "debug ospf%s nsm\n", str);
else
{
if (IS_CONF_DEBUG_OSPF (nsm, NSM_STATUS))
- vty_outln (vty, "debug ospf%s nsm status", str);
+ vty_out (vty, "debug ospf%s nsm status\n", str);
if (IS_CONF_DEBUG_OSPF (nsm, NSM_EVENTS))
- vty_outln (vty, "debug ospf%s nsm event", str);
+ vty_out (vty, "debug ospf%s nsm event\n", str);
if (IS_CONF_DEBUG_OSPF (nsm, NSM_TIMERS))
- vty_outln (vty, "debug ospf%s nsm timer", str);
+ vty_out (vty, "debug ospf%s nsm timer\n", str);
}
/* debug ospf lsa (generate|flooding|install|refresh). */
if (IS_CONF_DEBUG_OSPF (lsa, LSA) == OSPF_DEBUG_LSA)
- vty_outln (vty, "debug ospf%s lsa", str);
+ vty_out (vty, "debug ospf%s lsa\n", str);
else
{
if (IS_CONF_DEBUG_OSPF (lsa, LSA_GENERATE))
- vty_outln (vty, "debug ospf%s lsa generate", str);
+ vty_out (vty, "debug ospf%s lsa generate\n", str);
if (IS_CONF_DEBUG_OSPF (lsa, LSA_FLOODING))
- vty_outln (vty, "debug ospf%s lsa flooding", str);
+ vty_out (vty, "debug ospf%s lsa flooding\n", str);
if (IS_CONF_DEBUG_OSPF (lsa, LSA_INSTALL))
- vty_outln (vty, "debug ospf%s lsa install", str);
+ vty_out (vty, "debug ospf%s lsa install\n", str);
if (IS_CONF_DEBUG_OSPF (lsa, LSA_REFRESH))
- vty_outln (vty, "debug ospf%s lsa refresh", str);
+ vty_out (vty, "debug ospf%s lsa refresh\n", str);
write = 1;
}
/* debug ospf zebra (interface|redistribute). */
if (IS_CONF_DEBUG_OSPF (zebra, ZEBRA) == OSPF_DEBUG_ZEBRA)
- vty_outln (vty, "debug ospf%s zebra", str);
+ vty_out (vty, "debug ospf%s zebra\n", str);
else
{
if (IS_CONF_DEBUG_OSPF (zebra, ZEBRA_INTERFACE))
- vty_outln (vty, "debug ospf%s zebra interface", str);
+ vty_out (vty, "debug ospf%s zebra interface\n", str);
if (IS_CONF_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE))
- vty_outln (vty, "debug ospf%s zebra redistribute", str);
+ vty_out (vty, "debug ospf%s zebra redistribute\n", str);
write = 1;
}
/* debug ospf event. */
if (IS_CONF_DEBUG_OSPF (event, EVENT) == OSPF_DEBUG_EVENT)
{
- vty_outln (vty, "debug ospf%s event", str);
+ vty_out (vty, "debug ospf%s event\n", str);
write = 1;
}
/* debug ospf nssa. */
if (IS_CONF_DEBUG_OSPF (nssa, NSSA) == OSPF_DEBUG_NSSA)
{
- vty_outln (vty, "debug ospf%s nssa", str);
+ vty_out (vty, "debug ospf%s nssa\n", str);
write = 1;
}
r &= conf_debug_ospf_packet[i] & (OSPF_DEBUG_SEND_RECV|OSPF_DEBUG_DETAIL);
if (r == (OSPF_DEBUG_SEND_RECV|OSPF_DEBUG_DETAIL))
{
- vty_outln (vty, "debug ospf%s packet all detail", str);
+ vty_out (vty, "debug ospf%s packet all detail\n", str);
return 1;
}
r &= conf_debug_ospf_packet[i] & OSPF_DEBUG_SEND_RECV;
if (r == OSPF_DEBUG_SEND_RECV)
{
- vty_outln (vty, "debug ospf%s packet all", str);
+ vty_out (vty, "debug ospf%s packet all\n", str);
for (i = 0; i < 5; i++)
if (conf_debug_ospf_packet[i] & OSPF_DEBUG_DETAIL)
- vty_outln (vty, "debug ospf%s packet %s detail", str,
+ vty_out (vty, "debug ospf%s packet %s detail\n", str,
type_str[i]);
return 1;
}
if (conf_debug_ospf_packet[i] == 0)
continue;
- vty_outln (vty, "debug ospf%s packet %s%s", str,
+ vty_out (vty, "debug ospf%s packet %s%s\n", str,
type_str[i],detail_str[conf_debug_ospf_packet[i]]);
write = 1;
}
struct list *funclist;
if (CHECK_FLAG (ospf->config, OSPF_OPAQUE_CAPABLE))
- vty_outln (vty, " capability opaque");
+ vty_out (vty, " capability opaque\n");
funclist = ospf_opaque_wildcard_funclist;
opaque_lsa_config_write_router_callback (funclist, vty);
/* Switch output functionality by vty address. */
if (vty != NULL)
{
- vty_outln (vty, " Opaque-Type %u (%s)", opaque_type,
+ vty_out (vty, " Opaque-Type %u (%s)\n", opaque_type,
ospf_opaque_type_name(opaque_type));
- vty_outln (vty, " Opaque-ID 0x%x", opaque_id);
+ vty_out (vty, " Opaque-ID 0x%x\n", opaque_id);
- vty_outln (vty, " Opaque-Info: %u octets of data%s",
+ vty_out (vty, " Opaque-Info: %u octets of data%s\n",
ntohs (lsah->length) - OSPF_LSA_HEADER_SIZE,
VALID_OPAQUE_INFO_LEN(lsah) ? "" : "(Invalid length?)");
}
struct ri_tlv_router_cap *top = (struct ri_tlv_router_cap *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Router Capabilities: 0x%x",ntohl(top->value));
+ vty_out (vty, " Router Capabilities: 0x%x\n",ntohl(top->value));
else
zlog_debug (" Router Capabilities: 0x%x", ntohl (top->value));
if (ntohs (top->address.type) == PCE_ADDRESS_TYPE_IPV4)
{
if (vty != NULL)
- vty_outln (vty, " PCE Address: %s",inet_ntoa(top->address.value));
+ vty_out (vty, " PCE Address: %s\n",inet_ntoa(top->address.value));
else
zlog_debug (" PCE Address: %s", inet_ntoa (top->address.value));
}
{
/* TODO: Add support to IPv6 with inet_ntop() */
if (vty != NULL)
- vty_outln (vty, " PCE Address: 0x%x",
+ vty_out (vty, " PCE Address: 0x%x\n",
ntohl(top->address.value.s_addr));
else
zlog_debug (" PCE Address: 0x%x",
(struct ri_pce_subtlv_path_scope *) tlvh;
if (vty != NULL)
- vty_outln (vty, " PCE Path Scope: 0x%x",ntohl(top->value));
+ vty_out (vty, " PCE Path Scope: 0x%x\n",ntohl(top->value));
else
zlog_debug (" PCE Path Scope: 0x%x", ntohl (top->value));
{
tmp.s_addr = top->value;
if (vty != NULL)
- vty_outln (vty, " PCE domain Area: %s",inet_ntoa(tmp));
+ vty_out (vty, " PCE domain Area: %s\n",inet_ntoa(tmp));
else
zlog_debug (" PCE domain Area: %s", inet_ntoa (tmp));
}
else
{
if (vty != NULL)
- vty_outln (vty, " PCE domain AS: %d",ntohl(top->value));
+ vty_out (vty, " PCE domain AS: %d\n",ntohl(top->value));
else
zlog_debug (" PCE domain AS: %d", ntohl (top->value));
}
{
tmp.s_addr = top->value;
if (vty != NULL)
- vty_outln (vty, " PCE neighbor Area: %s",inet_ntoa(tmp));
+ vty_out (vty, " PCE neighbor Area: %s\n",inet_ntoa(tmp));
else
zlog_debug (" PCE neighbor Area: %s", inet_ntoa (tmp));
}
else
{
if (vty != NULL)
- vty_outln (vty, " PCE neighbor AS: %d",ntohl(top->value));
+ vty_out (vty, " PCE neighbor AS: %d\n",ntohl(top->value));
else
zlog_debug (" PCE neighbor AS: %d", ntohl (top->value));
}
struct ri_pce_subtlv_cap_flag *top = (struct ri_pce_subtlv_cap_flag *) tlvh;
if (vty != NULL)
- vty_outln (vty, " PCE Capabilities Flag: 0x%x",ntohl(top->value));
+ vty_out (vty, " PCE Capabilities Flag: 0x%x\n",ntohl(top->value));
else
zlog_debug (" PCE Capabilities Flag: 0x%x", ntohl (top->value));
show_vty_unknown_tlv (struct vty *vty, struct ri_tlv_header *tlvh)
{
if (vty != NULL)
- vty_outln (vty, " Unknown TLV: [type(0x%x), length(0x%x)]",
+ vty_out (vty, " Unknown TLV: [type(0x%x), length(0x%x)]\n",
ntohs (tlvh->type), ntohs(tlvh->length));
else
zlog_debug (" Unknown TLV: [type(0x%x), length(0x%x)]",
if (OspfRI.status == enabled)
{
if (OspfRI.scope == OSPF_OPAQUE_AS_LSA)
- vty_outln (vty, " router-info as");
+ vty_out (vty, " router-info as\n");
else
- vty_outln (vty, " router-info area %s",inet_ntoa(OspfRI.area_id));
+ vty_out (vty, " router-info area %s\n",inet_ntoa(OspfRI.area_id));
if (pce->pce_address.header.type != 0)
- vty_outln (vty, " pce address %s",
+ vty_out (vty, " pce address %s\n",
inet_ntoa(pce->pce_address.address.value));
if (pce->pce_cap_flag.header.type != 0)
- vty_outln (vty, " pce flag 0x%x",ntohl(pce->pce_cap_flag.value));
+ vty_out (vty, " pce flag 0x%x\n",ntohl(pce->pce_cap_flag.value));
for (ALL_LIST_ELEMENTS_RO (pce->pce_domain, node, domain))
{
if (domain->type == PCE_DOMAIN_TYPE_AREA)
{
tmp.s_addr = domain->value;
- vty_outln (vty, " pce domain area %s",inet_ntoa(tmp));
+ vty_out (vty, " pce domain area %s\n",inet_ntoa(tmp));
}
else
{
- vty_outln (vty, " pce domain as %d",ntohl(domain->value));
+ vty_out (vty, " pce domain as %d\n",ntohl(domain->value));
}
}
}
if (neighbor->type == PCE_DOMAIN_TYPE_AREA)
{
tmp.s_addr = neighbor->value;
- vty_outln (vty, " pce neighbor area %s",inet_ntoa(tmp));
+ vty_out (vty, " pce neighbor area %s\n",inet_ntoa(tmp));
}
else
{
- vty_outln (vty, " pce neighbor as %d",
+ vty_out (vty, " pce neighbor as %d\n",
ntohl(neighbor->value));
}
}
}
if (pce->pce_scope.header.type != 0)
- vty_outln (vty, " pce scope 0x%x",
+ vty_out (vty, " pce scope 0x%x\n",
ntohl(OspfRI.pce_info.pce_scope.value));
}
return;
{
if (!inet_aton (area, &OspfRI.area_id))
{
- vty_outln (vty, "%% specified Area ID %s is invalid",
+ vty_out (vty, "%% specified Area ID %s is invalid\n",
area);
return CMD_WARNING;
}
return 1;
if (vty)
- vty_outln (vty, "%% OSPF RI is not turned on");
+ vty_out (vty, "%% OSPF RI is not turned on\n");
return 0;
}
if (!inet_aton (argv[idx_ipv4]->arg, &value))
{
- vty_outln (vty, "Please specify PCE Address by A.B.C.D");
+ vty_out (vty, "Please specify PCE Address by A.B.C.D\n");
return CMD_WARNING;
}
if (sscanf (argv[idx_bitpattern]->arg, "0x%x", &scope) != 1)
{
- vty_outln (vty, "pce_path_scope: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "pce_path_scope: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
{
- vty_outln (vty, "pce_domain: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "pce_domain: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
{
- vty_outln (vty, "no_pce_domain: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "no_pce_domain: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
{
- vty_outln (vty, "pce_neighbor: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "pce_neighbor: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
{
- vty_outln (vty, "no_pce_neighbor: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "no_pce_neighbor: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
if (sscanf (argv[idx_bitpattern]->arg, "0x%x", &cap) != 1)
{
- vty_outln (vty, "pce_cap_flag: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "pce_cap_flag: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
if (OspfRI.status == enabled)
{
- vty_outln (vty, "--- Router Information parameters ---");
+ vty_out (vty, "--- Router Information parameters ---\n");
show_vty_router_cap (vty, &OspfRI.router_cap.header);
}
else
{
if (vty != NULL)
- vty_outln (vty, " Router Information is disabled on this router");
+ vty_out (vty, " Router Information is disabled on this router\n");
}
return CMD_SUCCESS;
}
if (OspfRI.status == enabled)
{
- vty_outln (vty, "--- PCE parameters ---");
+ vty_out (vty, "--- PCE parameters ---\n");
if (pce->pce_address.header.type != 0)
show_vty_pce_subtlv_address (vty, &pce->pce_address.header);
}
else
{
- vty_outln (vty," Router Information is disabled on this router");
+ vty_out (vty," Router Information is disabled on this router\n");
}
return CMD_SUCCESS;
struct te_tlv_router_addr *top = (struct te_tlv_router_addr *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Router-Address: %s",inet_ntoa(top->value));
+ vty_out (vty, " Router-Address: %s\n",inet_ntoa(top->value));
else
zlog_debug (" Router-Address: %s", inet_ntoa (top->value));
struct te_tlv_link *top = (struct te_tlv_link *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Link: %u octets of data",ntohs(top->header.length));
+ vty_out (vty, " Link: %u octets of data\n",ntohs(top->header.length));
else
zlog_debug (" Link: %u octets of data", ntohs (top->header.length));
}
if (vty != NULL)
- vty_outln (vty, " Link-Type: %s (%u)", cp,top->link_type.value);
+ vty_out (vty, " Link-Type: %s (%u)\n", cp,top->link_type.value);
else
zlog_debug (" Link-Type: %s (%u)", cp, top->link_type.value);
top = (struct te_link_subtlv_link_id *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Link-ID: %s", inet_ntoa(top->value));
+ vty_out (vty, " Link-ID: %s\n", inet_ntoa(top->value));
else
zlog_debug (" Link-ID: %s", inet_ntoa (top->value));
n = ntohs (tlvh->length) / sizeof (top->value[0]);
if (vty != NULL)
- vty_outln (vty, " Local Interface IP Address(es): %d", n);
+ vty_out (vty, " Local Interface IP Address(es): %d\n", n);
else
zlog_debug (" Local Interface IP Address(es): %d", n);
for (i = 0; i < n; i++)
{
if (vty != NULL)
- vty_outln (vty, " #%d: %s", i,inet_ntoa(top->value[i]));
+ vty_out (vty, " #%d: %s\n", i,inet_ntoa(top->value[i]));
else
zlog_debug (" #%d: %s", i, inet_ntoa (top->value[i]));
}
top = (struct te_link_subtlv_rmtif_ipaddr *) tlvh;
n = ntohs (tlvh->length) / sizeof (top->value[0]);
if (vty != NULL)
- vty_outln (vty, " Remote Interface IP Address(es): %d", n);
+ vty_out (vty, " Remote Interface IP Address(es): %d\n", n);
else
zlog_debug (" Remote Interface IP Address(es): %d", n);
for (i = 0; i < n; i++)
{
if (vty != NULL)
- vty_outln (vty, " #%d: %s", i,inet_ntoa(top->value[i]));
+ vty_out (vty, " #%d: %s\n", i,inet_ntoa(top->value[i]));
else
zlog_debug (" #%d: %s", i, inet_ntoa (top->value[i]));
}
top = (struct te_link_subtlv_te_metric *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Traffic Engineering Metric: %u",
+ vty_out (vty, " Traffic Engineering Metric: %u\n",
(u_int32_t)ntohl(top->value));
else
zlog_debug (" Traffic Engineering Metric: %u",
fval = ntohf (top->value);
if (vty != NULL)
- vty_outln (vty, " Maximum Bandwidth: %g (Bytes/sec)", fval);
+ vty_out (vty, " Maximum Bandwidth: %g (Bytes/sec)\n", fval);
else
zlog_debug (" Maximum Bandwidth: %g (Bytes/sec)", fval);
fval = ntohf (top->value);
if (vty != NULL)
- vty_outln (vty, " Maximum Reservable Bandwidth: %g (Bytes/sec)",fval);
+ vty_out (vty, " Maximum Reservable Bandwidth: %g (Bytes/sec)\n",fval);
else
zlog_debug (" Maximum Reservable Bandwidth: %g (Bytes/sec)", fval);
top = (struct te_link_subtlv_unrsv_bw *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Unreserved Bandwidth per Class Type in Byte/s:");
+ vty_out (vty, " Unreserved Bandwidth per Class Type in Byte/s:\n");
else
zlog_debug (" Unreserved Bandwidth per Class Type in Byte/s:");
for (i = 0; i < MAX_CLASS_TYPE; i+=2)
fval2 = ntohf (top->value[i+1]);
if (vty != NULL)
- vty_outln (vty, " [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)",
+ vty_out (vty, " [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)\n",
i, fval1, i+1, fval2);
else
zlog_debug (" [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)",
top = (struct te_link_subtlv_rsc_clsclr *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Resource class/color: 0x%x",
+ vty_out (vty, " Resource class/color: 0x%x\n",
(u_int32_t)ntohl(top->value));
else
zlog_debug (" Resource Class/Color: 0x%x",
if (vty != NULL)
{
- vty_outln (vty, " Local TE Router ID: %s",inet_ntoa(top->local));
- vty_outln (vty, " Remote TE Router ID: %s",inet_ntoa(top->remote));
+ vty_out (vty, " Local TE Router ID: %s\n",inet_ntoa(top->local));
+ vty_out (vty, " Remote TE Router ID: %s\n",inet_ntoa(top->remote));
}
else
{
if (vty != NULL)
{
- vty_outln (vty, " Link Local ID: %d",(u_int32_t)ntohl(top->local));
- vty_outln (vty, " Link Remote ID: %d",(u_int32_t)ntohl(top->remote));
+ vty_out (vty, " Link Local ID: %d\n",(u_int32_t)ntohl(top->local));
+ vty_out (vty, " Link Remote ID: %d\n",(u_int32_t)ntohl(top->remote));
}
else
{
top = (struct te_link_subtlv_rip *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Inter-AS TE Remote ASBR IP address: %s",
+ vty_out (vty, " Inter-AS TE Remote ASBR IP address: %s\n",
inet_ntoa(top->value));
else
zlog_debug (" Inter-AS TE Remote ASBR IP address: %s",
top = (struct te_link_subtlv_ras *) tlvh;
if (vty != NULL)
- vty_outln (vty, " Inter-AS TE Remote AS number: %u",ntohl(top->value));
+ vty_out (vty, " Inter-AS TE Remote AS number: %u\n",ntohl(top->value));
else
zlog_debug (" Inter-AS TE Remote AS number: %u", ntohl (top->value));
anomalous = (u_int32_t) ntohl (top->value) & TE_EXT_ANORMAL;
if (vty != NULL)
- vty_outln (vty, " %s Average Link Delay: %d (micro-sec)",
+ vty_out (vty, " %s Average Link Delay: %d (micro-sec)\n",
anomalous ? "Anomalous" : "Normal", delay);
else
zlog_debug (" %s Average Link Delay: %d (micro-sec)",
high = (u_int32_t) ntohl (top->high);
if (vty != NULL)
- vty_outln (vty, " %s Min/Max Link Delay: %d/%d (micro-sec)",
+ vty_out (vty, " %s Min/Max Link Delay: %d/%d (micro-sec)\n",
anomalous ? "Anomalous" : "Normal", low, high);
else
zlog_debug (" %s Min/Max Link Delay: %d/%d (micro-sec)",
jitter = (u_int32_t) ntohl (top->value) & TE_EXT_MASK;
if (vty != NULL)
- vty_outln (vty, " Delay Variation: %d (micro-sec)", jitter);
+ vty_out (vty, " Delay Variation: %d (micro-sec)\n", jitter);
else
zlog_debug (" Delay Variation: %d (micro-sec)", jitter);
anomalous = (u_int32_t) ntohl (top->value) & TE_EXT_ANORMAL;
if (vty != NULL)
- vty_outln (vty, " %s Link Loss: %g (%%)", anomalous ? "Anomalous" : "Normal",
+ vty_out (vty, " %s Link Loss: %g (%%)\n", anomalous ? "Anomalous" : "Normal",
fval);
else
zlog_debug (" %s Link Loss: %g (%%)", anomalous ? "Anomalous" : "Normal",
fval = ntohf (top->value);
if (vty != NULL)
- vty_outln (vty, " Unidirectional Residual Bandwidth: %g (Bytes/sec)",
+ vty_out (vty, " Unidirectional Residual Bandwidth: %g (Bytes/sec)\n",
fval);
else
zlog_debug (" Unidirectional Residual Bandwidth: %g (Bytes/sec)",
fval = ntohf (top->value);
if (vty != NULL)
- vty_outln (vty, " Unidirectional Available Bandwidth: %g (Bytes/sec)",
+ vty_out (vty, " Unidirectional Available Bandwidth: %g (Bytes/sec)\n",
fval);
else
zlog_debug (" Unidirectional Available Bandwidth: %g (Bytes/sec)",
fval = ntohf (top->value);
if (vty != NULL)
- vty_outln (vty, " Unidirectional Utilized Bandwidth: %g (Bytes/sec)",
+ vty_out (vty, " Unidirectional Utilized Bandwidth: %g (Bytes/sec)\n",
fval);
else
zlog_debug (" Unidirectional Utilized Bandwidth: %g (Bytes/sec)",
show_vty_unknown_tlv (struct vty *vty, struct te_tlv_header *tlvh)
{
if (vty != NULL)
- vty_outln (vty, " Unknown TLV: [type(0x%x), length(0x%x)]",
+ vty_out (vty, " Unknown TLV: [type(0x%x), length(0x%x)]\n",
ntohs (tlvh->type), ntohs(tlvh->length));
else
zlog_debug (" Unknown TLV: [type(0x%x), length(0x%x)]",
if (OspfMplsTE.status == enabled)
{
- vty_outln (vty, " mpls-te on");
- vty_outln (vty, " mpls-te router-address %s",
+ vty_out (vty, " mpls-te on\n");
+ vty_out (vty, " mpls-te router-address %s\n",
inet_ntoa(OspfMplsTE.router_addr.value));
}
if (OspfMplsTE.inter_as == AS)
- vty_outln (vty, " mpls-te inter-as as");
+ vty_out (vty, " mpls-te inter-as as\n");
if (OspfMplsTE.inter_as == Area)
- vty_outln (vty, " mpls-te inter-as area %s ",
+ vty_out (vty, " mpls-te inter-as area %s \n",
inet_ntoa(OspfMplsTE.interas_areaid));
return;
if (! inet_aton (argv[idx_ipv4]->arg, &value))
{
- vty_outln (vty, "Please specify Router-Addr by A.B.C.D");
+ vty_out (vty, "Please specify Router-Addr by A.B.C.D\n");
return CMD_WARNING;
}
}
else
{
- vty_outln (vty,"Unknown mode. Please choose between as or area");
+ vty_out (vty,"Unknown mode. Please choose between as or area\n");
return CMD_WARNING;
}
/* Register new callbacks regarding the flooding scope (AS or Area) */
if (ospf_mpls_te_register (mode) < 0)
{
- vty_outln (vty,
- "Internal error: Unable to register Inter-AS functions");
+ vty_out (vty,
+ "Internal error: Unable to register Inter-AS functions\n");
return CMD_WARNING;
}
}
else
{
- vty_outln (vty, "Please change Inter-AS support to disable first before going to mode %s",
+ vty_out (vty, "Please change Inter-AS support to disable first before going to mode %s\n",
mode2text[mode]);
return CMD_WARNING;
}
}
else
{
- vty_outln (vty, "mpls-te has not been turned on");
+ vty_out (vty, "mpls-te has not been turned on\n");
return CMD_WARNING;
}
return CMD_SUCCESS;
{
if (OspfMplsTE.status == enabled)
{
- vty_outln (vty, "--- MPLS-TE router parameters ---");
+ vty_out (vty, "--- MPLS-TE router parameters ---\n");
if (ntohs (OspfMplsTE.router_addr.header.type) != 0)
show_vty_router_addr (vty, &OspfMplsTE.router_addr.header);
else if (vty != NULL)
- vty_outln (vty, " N/A");
+ vty_out (vty, " N/A\n");
}
return CMD_SUCCESS;
}
{
if (IS_INTER_AS (lp->type))
{
- vty_outln (vty, "-- Inter-AS TEv2 link parameters for %s --",
+ vty_out (vty, "-- Inter-AS TEv2 link parameters for %s --\n",
ifp->name);
}
else
{
/* MPLS-TE is not activate on this interface */
/* or this interface is passive and Inter-AS TEv2 is not activate */
- vty_outln (vty, " %s: MPLS-TE is disabled on this interface",
+ vty_out (vty, " %s: MPLS-TE is disabled on this interface\n",
ifp->name);
return;
}
}
else
{
- vty_outln (vty, "-- MPLS-TE link parameters for %s --",
+ vty_out (vty, "-- MPLS-TE link parameters for %s --\n",
ifp->name);
}
show_vty_link_subtlv_ava_bw (vty, &lp->ava_bw.header);
if (TLV_TYPE(lp->use_bw) != 0)
show_vty_link_subtlv_use_bw (vty, &lp->use_bw.header);
- vty_outln (vty, "---------------%s", VTYNL);
+ vty_out (vty, "---------------%s\n", VTYNL);
}
else
{
- vty_outln (vty, " %s: MPLS-TE is disabled on this interface",
+ vty_out (vty, " %s: MPLS-TE is disabled on this interface\n",
ifp->name);
}
else
{
if ((ifp = if_lookup_by_name (argv[idx_interface]->arg, VRF_DEFAULT)) == NULL)
- vty_outln (vty, "No such interface name");
+ vty_out (vty, "No such interface name\n");
else
show_mpls_te_link_sub (vty, ifp);
}
}
else
{
- vty_outln (vty, "%s is %s", ifp->name,
+ vty_out (vty, "%s is %s\n", ifp->name,
((is_up = if_is_operative(ifp)) ? "up" : "down"));
- vty_outln (vty, " ifindex %u, MTU %u bytes, BW %u Mbit %s",
+ vty_out (vty, " ifindex %u, MTU %u bytes, BW %u Mbit %s\n",
ifp->ifindex, ifp->mtu, bandwidth, if_flag_dump(ifp->flags));
}
}
else
{
- vty_outln (vty, " Area %s", ospf_area_desc_string (oi->area));
+ vty_out (vty, " Area %s\n", ospf_area_desc_string (oi->area));
- vty_outln (vty, " MTU mismatch detection: %s",
+ vty_out (vty, " MTU mismatch detection: %s\n",
OSPF_IF_PARAM(oi, mtu_ignore) ? "disabled" : "enabled");
- vty_outln (vty, " Router ID %s, Network Type %s, Cost: %d",
+ vty_out (vty, " Router ID %s, Network Type %s, Cost: %d\n",
inet_ntoa (ospf->router_id), ospf_network_type_str[oi->type],
oi->output_cost);
- vty_outln (vty, " Transmit Delay is %d sec, State %s, Priority %d",
+ vty_out (vty, " Transmit Delay is %d sec, State %s, Priority %d\n",
OSPF_IF_PARAM (oi,transmit_delay), lookup_msg(ospf_ism_state_msg, oi->state, NULL),
PRIORITY (oi));
}
if (DR (oi).s_addr == 0)
{
if (!use_json)
- vty_outln (vty, " No backup designated router on this network");
+ vty_out (vty, " No backup designated router on this network\n");
}
else
{
if (nbr == NULL)
{
if (!use_json)
- vty_outln (vty, " No backup designated router on this network");
+ vty_out (vty, " No backup designated router on this network\n");
}
else
{
{
vty_out (vty, " Backup Designated Router (ID) %s,",
inet_ntoa (nbr->router_id));
- vty_outln (vty, " Interface Address %s",
+ vty_out (vty, " Interface Address %s\n",
inet_ntoa (nbr->address.u.prefix4));
}
}
{
struct router_lsa *rlsa = (struct router_lsa*) lsa->data;
- vty_outln (vty, " LS age: %d", LS_AGE (lsa));
- vty_outln (vty, " Options: 0x%-2x : %s", lsa->data->options,
+ vty_out (vty, " LS age: %d\n", LS_AGE (lsa));
+ vty_out (vty, " Options: 0x%-2x : %s\n", lsa->data->options,
ospf_options_dump(lsa->data->options));
- vty_outln (vty, " LS Flags: 0x%-2x %s",
+ vty_out (vty, " LS Flags: 0x%-2x %s\n",
lsa->flags,
((lsa->flags & OSPF_LSA_LOCAL_XLT) ?
"(Translated from Type-7)" : ""));
vty_out (vty, VTYNL);
}
- vty_outln (vty, " LS Type: %s",
+ vty_out (vty, " LS Type: %s\n",
lookup_msg(ospf_lsa_type_msg, lsa->data->type, NULL));
- vty_outln (vty, " Link State ID: %s %s", inet_ntoa (lsa->data->id),
+ vty_out (vty, " Link State ID: %s %s\n", inet_ntoa (lsa->data->id),
lookup_msg(ospf_link_state_id_type_msg, lsa->data->type, NULL));
- vty_outln (vty, " Advertising Router: %s", inet_ntoa (lsa->data->adv_router));
- vty_outln (vty, " LS Seq Number: %08lx", (u_long)ntohl (lsa->data->ls_seqnum));
- vty_outln (vty, " Checksum: 0x%04x", ntohs (lsa->data->checksum));
- vty_outln (vty, " Length: %d%s", ntohs (lsa->data->length), VTYNL);
+ vty_out (vty, " Advertising Router: %s\n", inet_ntoa (lsa->data->adv_router));
+ vty_out (vty, " LS Seq Number: %08lx\n", (u_long)ntohl (lsa->data->ls_seqnum));
+ vty_out (vty, " Checksum: 0x%04x\n", ntohs (lsa->data->checksum));
+ vty_out (vty, " Length: %d%s\n", ntohs (lsa->data->length), VTYNL);
}
const char *link_type_desc[] =
if (!OSPF_IF_PARAM_CONFIGURED(params, if_area))
{
- vty_outln (vty, "Can't find specified interface area configuration.");
+ vty_out (vty, "Can't find specified interface area configuration.\n");
return CMD_WARNING;
}
ret = str2prefix_ipv4 (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
ret = str2prefix_ipv4 (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
rn = route_node_lookup (ospf->distance_table, (struct prefix *) &p);
if (!rn)
{
- vty_outln (vty, "Can't find specified prefix");
+ vty_out (vty, "Can't find specified prefix\n");
return CMD_WARNING;
}
return;
if (CHECK_FLAG (bfd_info->flags, BFD_FLAG_PARAM_CFG))
- vty_outln (vty, " ip pim bfd %d %d %d",
+ vty_out (vty, " ip pim bfd %d %d %d\n",
bfd_info->detect_mult, bfd_info->required_min_rx,
bfd_info->desired_min_tx);
else
- vty_outln (vty, " ip pim bfd");
+ vty_out (vty, " ip pim bfd\n");
}
/*
now = pim_time_monotonic_sec();
- vty_outln (vty,
- "Interface Address Source Group State Winner Uptime Timer");
+ vty_out (vty,
+ "Interface Address Source Group State Winner Uptime Timer\n");
for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
char ch_src_str[INET_ADDRSTRLEN];
pim_time_timer_to_mmss(timer, sizeof(timer),
ch->t_ifassert_timer);
- vty_outln (vty, "%-9s %-15s %-15s %-15s %-6s %-15s %-8s %-5s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %-6s %-15s %-8s %-5s\n",
ch->interface->name,
inet_ntoa(ifaddr),
ch_src_str,
"eATD: Evaluate AssertTrackingDesired%s",
VTYNL, VTYNL, VTYNL, VTYNL);
- vty_outln (vty,
- "Interface Address Source Group CA eCA ATD eATD");
+ vty_out (vty,
+ "Interface Address Source Group CA eCA ATD eATD\n");
for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
pim_ifp = ch->interface->info;
ch_src_str, sizeof(ch_src_str));
pim_inet4_dump("<ch_grp?>", ch->sg.grp,
ch_grp_str, sizeof(ch_grp_str));
- vty_outln (vty, "%-9s %-15s %-15s %-15s %-3s %-3s %-3s %-4s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %-3s %-3s %-3s %-4s\n",
ch->interface->name,
inet_ntoa(ifaddr),
ch_src_str,
struct pim_ifchannel *ch;
struct in_addr ifaddr;
- vty_outln (vty,
- "Interface Address Source Group RPT Pref Metric Address ");
+ vty_out (vty,
+ "Interface Address Source Group RPT Pref Metric Address \n");
for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
pim_ifp = ch->interface->info;
pim_inet4_dump("<addr?>", am.ip_address,
addr_str, sizeof(addr_str));
- vty_outln (vty, "%-9s %-15s %-15s %-15s %-3s %4u %6u %-15s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %-3s %4u %6u %-15s\n",
ch->interface->name,
inet_ntoa(ifaddr),
ch_src_str,
struct pim_ifchannel *ch;
struct in_addr ifaddr;
- vty_outln (vty,
- "Interface Address Source Group RPT Pref Metric Address ");
+ vty_out (vty,
+ "Interface Address Source Group RPT Pref Metric Address \n");
for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
pim_ifp = ch->interface->info;
else
snprintf(metr_str, sizeof(metr_str), "%6u", am->route_metric);
- vty_outln (vty, "%-9s %-15s %-15s %-15s %-3s %-4s %-6s %-15s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %-3s %-4s %-6s %-15s\n",
ch->interface->name,
inet_ntoa(ifaddr),
ch_src_str,
} /* scan interface channels */
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
} else {
- vty_outln (vty,
- "Interface Address Source Group Membership");
+ vty_out (vty,
+ "Interface Address Source Group Membership\n");
/*
* Example of the json data we are traversing
vty_out(vty, "%-15s ", if_field_key);
json_object_object_get_ex(if_field_val, "localMembership", &json_tmp);
- vty_outln (vty, "%-10s", json_object_get_string(json_tmp));
+ vty_out (vty, "%-10s\n", json_object_get_string(json_tmp));
}
}
}
static void pim_print_ifp_flags(struct vty *vty, struct interface *ifp, int mloop)
{
- vty_outln (vty, "Flags");
- vty_outln (vty, "-----");
- vty_outln (vty, "All Multicast : %s",
+ vty_out (vty, "Flags\n");
+ vty_out (vty, "-----\n");
+ vty_out (vty, "All Multicast : %s\n",
(ifp->flags & IFF_ALLMULTI) ? "yes" : "no");
- vty_outln (vty, "Broadcast : %s",
+ vty_out (vty, "Broadcast : %s\n",
if_is_broadcast(ifp) ? "yes" : "no");
- vty_outln (vty, "Deleted : %s",
+ vty_out (vty, "Deleted : %s\n",
PIM_IF_IS_DELETED(ifp) ? "yes" : "no");
- vty_outln (vty, "Interface Index : %d", ifp->ifindex);
- vty_outln (vty, "Multicast : %s",
+ vty_out (vty, "Interface Index : %d\n", ifp->ifindex);
+ vty_out (vty, "Multicast : %s\n",
if_is_multicast(ifp) ? "yes" : "no");
- vty_outln (vty, "Multicast Loop : %d", mloop);
- vty_outln (vty, "Promiscuous : %s",
+ 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);
if (uj)
json = json_object_new_object();
else
- vty_outln (vty,
- "Interface State Address V Querier Query Timer Uptime");
+ vty_out (vty,
+ "Interface State Address V Querier Query Timer Uptime\n");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
struct pim_interface *pim_ifp;
json_object_object_add(json, ifp->name, json_row);
} else {
- vty_outln (vty, "%-9s %5s %15s %d %7s %11s %8s",
+ vty_out (vty, "%-9s %5s %15s %d %7s %11s %8s\n",
ifp->name,
if_is_up(ifp) ? "up" : "down",
inet_ntoa(igmp->ifaddr),
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
json_object_object_add(json, ifp->name, json_row);
} else {
- vty_outln (vty, "Interface : %s", ifp->name);
- vty_outln (vty, "State : %s", if_is_up(ifp) ? "up" : "down");
- vty_outln (vty, "Address : %s",
+ vty_out (vty, "Interface : %s\n", ifp->name);
+ vty_out (vty, "State : %s\n", if_is_up(ifp) ? "up" : "down");
+ vty_out (vty, "Address : %s\n",
inet_ntoa(pim_ifp->primary_address));
- vty_outln (vty, "Uptime : %s", uptime);
- vty_outln (vty, "Version : %d", pim_ifp->igmp_version);
+ 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_outln (vty, "Querier");
- vty_outln (vty, "-------");
- vty_outln (vty, "Querier : %s",
+ vty_out (vty, "Querier\n");
+ vty_out (vty, "-------\n");
+ vty_out (vty, "Querier : %s\n",
igmp->t_igmp_query_timer ? "local" : "other");
- vty_outln (vty, "Start Count : %d", igmp->startup_query_count);
- vty_outln (vty, "Query Timer : %s", query_hhmmss);
- vty_outln (vty, "Other Timer : %s", other_hhmmss);
+ 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_outln (vty, "Timers");
- vty_outln (vty, "------");
- vty_outln (vty, "Group Membership Interval : %lis",
+ vty_out (vty, "Timers\n");
+ vty_out (vty, "------\n");
+ vty_out (vty, "Group Membership Interval : %lis\n",
gmi_msec / 1000);
- vty_outln (vty, "Last Member Query Time : %lis",
+ vty_out (vty, "Last Member Query Time : %lis\n",
lmqt_msec / 1000);
- vty_outln (vty, "Older Host Present Interval : %lis",
+ vty_out (vty, "Older Host Present Interval : %lis\n",
ohpi_msec / 1000);
- vty_outln (vty, "Other Querier Present Interval : %lis",
+ vty_out (vty, "Other Querier Present Interval : %lis\n",
oqpi_msec / 1000);
- vty_outln (vty, "Query Interval : %ds",
+ vty_out (vty, "Query Interval : %ds\n",
igmp->querier_query_interval);
- vty_outln (vty, "Query Response Interval : %lis",
+ vty_out (vty, "Query Response Interval : %lis\n",
qri_msec / 1000);
- vty_outln (vty, "Robustness Variable : %d",
+ vty_out (vty, "Robustness Variable : %d\n",
igmp->querier_robustness_variable);
- vty_outln (vty, "Startup Query Interval : %ds", sqi);
+ vty_out (vty, "Startup Query Interval : %ds\n", sqi);
vty_out (vty, VTYNL);
vty_out (vty, VTYNL);
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else {
if (!found_ifname)
- vty_outln (vty, "%% No such interface");
+ vty_out (vty, "%% No such interface\n");
}
}
now = pim_time_monotonic_sec();
- vty_outln (vty,
- "Interface Address Source Group Socket Uptime ");
+ vty_out (vty,
+ "Interface Address Source Group Socket Uptime \n");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
struct pim_interface *pim_ifp;
pim_inet4_dump("<grp?>", ij->group_addr, group_str, sizeof(group_str));
pim_inet4_dump("<src?>", ij->source_addr, source_str, sizeof(source_str));
- vty_outln (vty, "%-9s %-15s %-15s %-15s %6d %8s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %6d %8s\n",
ifp->name,
pri_addr_str,
source_str,
json_object_object_add(json, ifp->name, json_row);
} else {
- vty_outln (vty, "Interface : %s", ifp->name);
- vty_outln (vty, "State : %s", if_is_up(ifp) ? "up" : "down");
+ vty_out (vty, "Interface : %s\n", ifp->name);
+ vty_out (vty, "State : %s\n", if_is_up(ifp) ? "up" : "down");
if (pim_ifp->update_source.s_addr != INADDR_ANY) {
- vty_outln (vty, "Use Source : %s", inet_ntoa(pim_ifp->update_source));
+ vty_out (vty, "Use Source : %s\n", inet_ntoa(pim_ifp->update_source));
}
if (pim_ifp->sec_addr_list) {
char pbuf[PREFIX2STR_BUFFER];
- vty_outln (vty, "Address : %s (primary)",
+ vty_out (vty, "Address : %s (primary)\n",
inet_ntoa(ifaddr));
for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, sec_node, sec_addr)) {
- vty_outln (vty, " %s",
+ vty_out (vty, " %s\n",
prefix2str(&sec_addr->addr, pbuf, sizeof(pbuf)));
}
} else {
- vty_outln (vty, "Address : %s", inet_ntoa(ifaddr));
+ vty_out (vty, "Address : %s\n", inet_ntoa(ifaddr));
}
vty_out (vty, VTYNL);
for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode, neigh)) {
if (print_header) {
- vty_outln (vty, "PIM Neighbors");
- vty_outln (vty, "-------------");
+ vty_out (vty, "PIM Neighbors\n");
+ vty_out (vty, "-------------\n");
print_header = 0;
}
pim_inet4_dump("<src?>", neigh->source_addr, neigh_src_str, sizeof(neigh_src_str));
pim_time_uptime(uptime, sizeof(uptime), now - neigh->creation);
pim_time_timer_to_hhmmss(expire, sizeof(expire), neigh->t_expire_timer);
- vty_outln (vty, "%-15s : up for %s, holdtime expires in %s", neigh_src_str, uptime,
+ vty_out (vty, "%-15s : up for %s, holdtime expires in %s\n", neigh_src_str, uptime,
expire);
}
vty_out (vty, VTYNL);
}
- vty_outln (vty, "Designated Router");
- vty_outln (vty, "-----------------");
- vty_outln (vty, "Address : %s", dr_str);
- vty_outln (vty, "Priority : %d", pim_ifp->pim_dr_priority);
- vty_outln (vty, "Uptime : %s", dr_uptime);
- vty_outln (vty, "Elections : %d", pim_ifp->pim_dr_election_count);
- vty_outln (vty, "Changes : %d", pim_ifp->pim_dr_election_changes);
+ vty_out (vty, "Designated Router\n");
+ vty_out (vty, "-----------------\n");
+ vty_out (vty, "Address : %s\n", dr_str);
+ vty_out (vty, "Priority : %d\n", pim_ifp->pim_dr_priority);
+ 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);
if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR) {
if (print_header) {
- vty_outln (vty, "FHR - First Hop Router");
- vty_outln (vty, "----------------------");
+ vty_out (vty, "FHR - First Hop Router\n");
+ vty_out (vty, "----------------------\n");
print_header = 0;
}
pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
pim_time_uptime(uptime, sizeof(uptime), now - up->state_transition);
- vty_outln (vty, "%s : %s is a source, uptime is %s", grp_str, src_str,
+ vty_out (vty, "%s : %s is a source, uptime is %s\n", grp_str, src_str,
uptime);
}
}
vty_out (vty, VTYNL);
}
- vty_outln (vty, "Hellos");
- vty_outln (vty, "------");
- vty_outln (vty, "Period : %d", pim_ifp->pim_hello_period);
- vty_outln (vty, "Timer : %s", hello_timer);
- vty_outln (vty, "StatStart : %s", stat_uptime);
- vty_outln (vty, "Receive : %d", pim_ifp->pim_ifstat_hello_recv);
- vty_outln (vty, "Receive Failed : %d",
+ vty_out (vty, "Hellos\n");
+ vty_out (vty, "------\n");
+ vty_out (vty, "Period : %d\n", pim_ifp->pim_hello_period);
+ vty_out (vty, "Timer : %s\n", hello_timer);
+ vty_out (vty, "StatStart : %s\n", stat_uptime);
+ vty_out (vty, "Receive : %d\n", pim_ifp->pim_ifstat_hello_recv);
+ vty_out (vty, "Receive Failed : %d\n",
pim_ifp->pim_ifstat_hello_recvfail);
- vty_outln (vty, "Send : %d", pim_ifp->pim_ifstat_hello_sent);
- vty_outln (vty, "Send Failed : %d",
+ vty_out (vty, "Send : %d\n", pim_ifp->pim_ifstat_hello_sent);
+ vty_out (vty, "Send Failed : %d\n",
pim_ifp->pim_ifstat_hello_sendfail);
- vty_outln (vty, "Generation ID : %08x", pim_ifp->pim_generation_id);
+ vty_out (vty, "Generation ID : %08x\n", pim_ifp->pim_generation_id);
vty_out (vty, VTYNL);
vty_out (vty, VTYNL);
pim_print_ifp_flags(vty, ifp, mloop);
- vty_outln (vty, "Join Prune Interval");
- vty_outln (vty, "-------------------");
- vty_outln (vty, "LAN Delay : %s",
+ vty_out (vty, "Join Prune Interval\n");
+ vty_out (vty, "-------------------\n");
+ vty_out (vty, "LAN Delay : %s\n",
pim_if_lan_delay_enabled(ifp) ? "yes" : "no");
- vty_outln (vty, "Effective Propagation Delay : %d msec",
+ vty_out (vty, "Effective Propagation Delay : %d msec\n",
pim_if_effective_propagation_delay_msec(ifp));
- vty_outln (vty, "Effective Override Interval : %d msec",
+ vty_out (vty, "Effective Override Interval : %d msec\n",
pim_if_effective_override_interval_msec(ifp));
- vty_outln (vty, "Join Prune Override Interval : %d msec",
+ 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_outln (vty, "LAN Prune Delay");
- vty_outln (vty, "---------------");
- vty_outln (vty, "Propagation Delay : %d msec",
+ vty_out (vty, "LAN Prune Delay\n");
+ vty_out (vty, "---------------\n");
+ vty_out (vty, "Propagation Delay : %d msec\n",
pim_ifp->pim_propagation_delay_msec);
- vty_outln (vty, "Propagation Delay (Highest) : %d msec",
+ vty_out (vty, "Propagation Delay (Highest) : %d msec\n",
pim_ifp->pim_neighbors_highest_propagation_delay_msec);
- vty_outln (vty, "Override Interval : %d msec",
+ vty_out (vty, "Override Interval : %d msec\n",
pim_ifp->pim_override_interval_msec);
- vty_outln (vty, "Override Interval (Highest) : %d 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);
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else {
if (!found_ifname)
- vty_outln (vty, "%% No such interface");
+ vty_out (vty, "%% No such interface\n");
}
}
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
} else {
- vty_outln (vty,
- "Interface State Address PIM Nbrs PIM DR FHR IfChannels");
+ vty_out (vty,
+ "Interface State Address PIM Nbrs PIM DR FHR IfChannels\n");
json_object_object_foreach(json, key, val) {
vty_out(vty, "%-9s ", key);
vty_out(vty, "%3d ", json_object_get_int(json_tmp));
json_object_object_get_ex(val, "pimIfChannels", &json_tmp);
- vty_outln (vty, "%9d", json_object_get_int(json_tmp));
+ vty_out (vty, "%9d\n", json_object_get_int(json_tmp));
}
}
else
{
vty_out (vty, VTYNL);
- vty_outln (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s", "Interface",
+ vty_out (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n", "Interface",
" HELLO", " JOIN", " PRUNE", " REGISTER",
" REGISTER-STOP", " ASSERT");
- vty_outln (vty,
- "%-10s%-18s%-17s%-17s%-17s%-17s%-17s",
+ vty_out (vty,
+ "%-10s%-18s%-17s%-17s%-17s%-17s%-17s\n",
"", " Rx/Tx", " Rx/Tx", " Rx/Tx", " Rx/Tx",
" Rx/Tx", " Rx/Tx");
- vty_outln (vty,
- "---------------------------------------------------------------------------------------------------------------");
+ vty_out (vty,
+ "---------------------------------------------------------------------------------------------------------------\n");
}
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
}
else
{
- vty_outln (vty,
- "%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u ",
+ vty_out (vty,
+ "%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u \n",
ifp->name, pim_ifp->pim_ifstat_hello_recv,
pim_ifp->pim_ifstat_hello_sent, pim_ifp->pim_ifstat_join_recv,
pim_ifp->pim_ifstat_join_send, pim_ifp->pim_ifstat_prune_recv,
}
if (uj)
{
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free (json);
}
else
{
vty_out (vty, VTYNL);
- vty_outln (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s", "Interface",
+ vty_out (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n", "Interface",
" HELLO", " JOIN", " PRUNE", " REGISTER",
" REGISTER-STOP", " ASSERT");
- vty_outln (vty,
- "%-10s%-18s%-17s%-17s%-17s%-17s%-17s",
+ vty_out (vty,
+ "%-10s%-18s%-17s%-17s%-17s%-17s%-17s\n",
"", " Rx/Tx", " Rx/Tx", " Rx/Tx", " Rx/Tx",
" Rx/Tx", " Rx/Tx");
- vty_outln (vty,
- "---------------------------------------------------------------------------------------------------------------");
+ vty_out (vty,
+ "---------------------------------------------------------------------------------------------------------------\n");
}
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
}
else
{
- vty_outln (vty,
- "%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u ",
+ vty_out (vty,
+ "%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u \n",
ifp->name, pim_ifp->pim_ifstat_hello_recv,
pim_ifp->pim_ifstat_hello_sent, pim_ifp->pim_ifstat_join_recv,
pim_ifp->pim_ifstat_join_send, pim_ifp->pim_ifstat_prune_recv,
}
if (uj)
{
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free (json);
}
else
{
if (!found_ifname)
- vty_outln (vty, "%% No such interface");
+ vty_out (vty, "%% No such interface\n");
}
}
if (uj)
json = json_object_new_object();
else
- vty_outln (vty,
- "Interface Address Source Group State Uptime Expire Prune");
+ vty_out (vty,
+ "Interface Address Source Group State Uptime Expire Prune\n");
for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
else
json_object_object_add(json_grp, ch_src_str, json_row);
} else {
- vty_outln (vty, "%-9s %-15s %-15s %-15s %-6s %8s %-6s %5s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %-6s %8s %-6s %5s\n",
ch->interface->name,
inet_ntoa(ifaddr),
ch_src_str,
} /* scan interface channels */
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
json_object_object_add(json_ifp, neigh_src_str, json_row);
} else {
- vty_outln (vty, "Interface : %s", ifp->name);
- vty_outln (vty, "Neighbor : %s", neigh_src_str);
- vty_outln (vty, " Uptime : %s", uptime);
- vty_outln (vty, " Holdtime : %s", expire);
- vty_outln (vty, " DR Priority : %d",
+ vty_out (vty, "Interface : %s\n", ifp->name);
+ vty_out (vty, "Neighbor : %s\n", neigh_src_str);
+ vty_out (vty, " Uptime : %s\n", uptime);
+ vty_out (vty, " Holdtime : %s\n", expire);
+ vty_out (vty, " DR Priority : %d\n",
neigh->dr_priority);
- vty_outln (vty, " Generation ID : %08x",
+ vty_out (vty, " Generation ID : %08x\n",
neigh->generation_id);
- vty_outln (vty, " Override Interval (msec) : %d",
+ vty_out (vty, " Override Interval (msec) : %d\n",
neigh->override_interval_msec);
- vty_outln (vty, " Propagation Delay (msec) : %d",
+ vty_out (vty, " Propagation Delay (msec) : %d\n",
neigh->propagation_delay_msec);
- vty_outln (vty, " Hello Option - Address List : %s",
+ vty_out (vty, " Hello Option - Address List : %s\n",
option_address_list ? "yes" : "no");
- vty_outln (vty, " Hello Option - DR Priority : %s",
+ vty_out (vty, " Hello Option - DR Priority : %s\n",
option_dr_priority ? "yes" : "no");
- vty_outln (vty, " Hello Option - Generation ID : %s",
+ vty_out (vty, " Hello Option - Generation ID : %s\n",
option_generation_id ? "yes" : "no");
- vty_outln (vty, " Hello Option - Holdtime : %s",
+ vty_out (vty, " Hello Option - Holdtime : %s\n",
option_holdtime ? "yes" : "no");
- vty_outln (vty, " Hello Option - LAN Prune Delay : %s",
+ vty_out (vty, " Hello Option - LAN Prune Delay : %s\n",
option_lan_prune_delay ? "yes" : "no");
- vty_outln (vty, " Hello Option - T-bit : %s",
+ 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);
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else {
{
if (!found_neighbor)
- vty_outln (vty, "%% No such interface or neighbor");
+ vty_out (vty, "%% No such interface or neighbor\n");
}
}
}
json = json_object_new_object();
} else {
vty_out(vty, "Codes: J -> Pim Join, I -> IGMP Report, S -> Source, * -> Inherited from (*,G)");
- vty_outln (vty, "%sInstalled Source Group IIF OIL",
+ vty_out (vty, "%sInstalled Source Group IIF OIL\n",
VTYNL);
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else {
if (uj) {
json = json_object_new_object();
} else {
- vty_outln (vty, "Interface Neighbor Uptime Holdtime DR Pri");
+ vty_out (vty, "Interface Neighbor Uptime Holdtime DR Pri\n");
}
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
json_object_object_add(json_ifp_rows, neigh_src_str, json_row);
} else {
- vty_outln (vty, "%-9s %15s %8s %8s %6d",
+ vty_out (vty, "%-9s %15s %8s %8s %6d\n",
ifp->name,
neigh_src_str,
uptime,
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
struct listnode *node;
struct interface *ifp;
- vty_outln (vty,
- "Interface Address Neighbor Secondary ");
+ vty_out (vty,
+ "Interface Address Neighbor Secondary \n");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
struct pim_interface *pim_ifp;
prefix2str(p, neigh_sec_str, sizeof(neigh_sec_str));
- vty_outln (vty, "%-9s %-15s %-15s %-15s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s\n",
ifp->name,
inet_ntoa(ifaddr),
neigh_src_str,
if (uj)
json = json_object_new_object();
else
- vty_outln (vty,
- "Iif Source Group State Uptime JoinTimer RSTimer KATimer RefCnt");
+ vty_out (vty,
+ "Iif Source Group State Uptime JoinTimer RSTimer KATimer RefCnt\n");
for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
char src_str[INET_ADDRSTRLEN];
json_object_int_add(json_row, "sptBit", up->sptbit);
json_object_object_add(json_group, src_str, json_row);
} else {
- vty_outln (vty, "%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d",
+ vty_out (vty, "%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d\n",
up->rpf.source_nexthop.interface->name,
src_str,
grp_str,
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
if (uj)
json = json_object_new_object();
else
- vty_outln (vty,
- "Interface Source Group LostAssert Joins PimInclude JoinDesired EvalJD");
+ vty_out (vty,
+ "Interface Source Group LostAssert Joins PimInclude JoinDesired EvalJD\n");
/* scan per-interface (S,G) state */
for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, chnode, ch)) {
json_object_object_add(json_group, src_str, json_row);
} else {
- vty_outln (vty, "%-9s %-15s %-15s %-10s %-5s %-10s %-11s %-6s",
+ vty_out (vty, "%-9s %-15s %-15s %-10s %-5s %-10s %-11s %-6s\n",
ch->interface->name,
src_str,
grp_str,
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
if (uj)
json = json_object_new_object();
else
- vty_outln (vty,
- "Source Group RpfIface RibNextHop RpfAddress ");
+ vty_out (vty,
+ "Source Group RpfIface RibNextHop RpfAddress \n");
for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
char src_str[INET_ADDRSTRLEN];
json_object_string_add(json_row, "rpfAddress", rpf_addr_str);
json_object_object_add(json_group, src_str, json_row);
} else {
- vty_outln (vty, "%-15s %-15s %-8s %-15s %-15s",
+ vty_out (vty, "%-15s %-15s %-8s %-15s %-15s\n",
src_str,
grp_str,
rpf_ifname,
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
} else {
show_rpf_refresh_stats(vty, now, json);
vty_out (vty, VTYNL);
- vty_outln (vty,
- "Source Group RpfIface RpfAddress RibNextHop Metric Pref");
+ vty_out (vty,
+ "Source Group RpfIface RpfAddress RibNextHop Metric Pref\n");
}
for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, up_node, up)) {
json_object_object_add(json_group, src_str, json_row);
} else {
- vty_outln (vty, "%-15s %-15s %-8s %-15s %-15s %6d %4d",
+ vty_out (vty, "%-15s %-15s %-8s %-15s %-15s %6d %4d\n",
src_str,
grp_str,
rpf_ifname,
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
if (pimg && !pimg->rpf_hash)
{
- vty_outln (vty, "no nexthop cache ");
+ vty_out (vty, "no nexthop cache \n");
return;
}
- vty_outln (vty, "Number of registered addresses: %lu ",
+ vty_out (vty, "Number of registered addresses: %lu \n",
pimg->rpf_hash->count);
- vty_outln (vty, "Address Interface Nexthop");
- vty_outln (vty, "-------------------------------------------");
+ vty_out (vty, "Address Interface Nexthop\n");
+ vty_out (vty, "-------------------------------------------\n");
hash_walk (pimg->rpf_hash, pim_print_pnc_cache_walkcb, vty);
if (uj)
json = json_object_new_object();
else
- vty_outln (vty,
- "Interface Address Group Mode Timer Srcs V Uptime ");
+ vty_out (vty,
+ "Interface Address Group Mode Timer Srcs V Uptime \n");
/* scan interfaces */
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
json_object_object_add(json_iface, group_str, json_row);
} else {
- vty_outln (vty, "%-9s %-15s %-15s %4s %8s %4d %d %8s",
+ vty_out (vty, "%-9s %-15s %-15s %4s %8s %4d %d %8s\n",
ifp->name,
ifaddr_str,
group_str,
} /* scan interfaces */
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
struct listnode *ifnode;
struct interface *ifp;
- vty_outln (vty,
- "Interface Address Group RetTimer Counter RetSrcs");
+ vty_out (vty,
+ "Interface Address Group RetTimer Counter RetSrcs\n");
/* scan interfaces */
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
}
}
- vty_outln (vty, "%-9s %-15s %-15s %-8s %7d %7d",
+ vty_out (vty, "%-9s %-15s %-15s %-8s %7d %7d\n",
ifp->name,
ifaddr_str,
group_str,
now = pim_time_monotonic_sec();
- vty_outln (vty,
- "Interface Address Group Source Timer Fwd Uptime ");
+ vty_out (vty,
+ "Interface Address Group Source Timer Fwd Uptime \n");
/* scan interfaces */
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
pim_time_uptime(uptime, sizeof(uptime), now - src->source_creation);
- vty_outln (vty, "%-9s %-15s %-15s %-15s %5s %3s %8s",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %5s %3s %8s\n",
ifp->name,
ifaddr_str,
group_str,
struct listnode *ifnode;
struct interface *ifp;
- vty_outln (vty,
- "Interface Address Group Source Counter");
+ vty_out (vty,
+ "Interface Address Group Source Counter\n");
/* scan interfaces */
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
pim_inet4_dump("<source?>", src->source_addr, source_str, sizeof(source_str));
- vty_outln (vty, "%-9s %-15s %-15s %-15s %7d",
+ vty_out (vty, "%-9s %-15s %-15s %-15s %7d\n",
ifp->name,
ifaddr_str,
group_str,
result = inet_pton (AF_INET, addr_str, &src_addr);
if (result <= 0)
{
- vty_outln (vty, "Bad unicast address %s: errno=%d: %s",
+ vty_out (vty, "Bad unicast address %s: errno=%d: %s\n",
addr_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
if (pim_is_group_224_4 (src_addr))
{
- vty_outln (vty, "Invalid argument. Expected Valid Source Address.");
+ vty_out (vty, "Invalid argument. Expected Valid Source Address.\n");
return CMD_WARNING;
}
result = inet_pton (AF_INET, addr_str1, &grp_addr);
if (result <= 0)
{
- vty_outln (vty, "Bad unicast address %s: errno=%d: %s",
+ vty_out (vty, "Bad unicast address %s: errno=%d: %s\n",
addr_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
if (!pim_is_group_224_4 (grp_addr))
{
- vty_outln (vty,
- "Invalid argument. Expected Valid Multicast Group Address.");
+ vty_out (vty,
+ "Invalid argument. Expected Valid Multicast Group Address.\n");
return CMD_WARNING;
}
pim_addr_dump ("<grp?>", &grp, grp_str, sizeof (grp_str));
pim_addr_dump ("<nexthop?>", &nexthop.mrib_nexthop_addr,
nexthop_addr_str, sizeof (nexthop_addr_str));
- vty_outln (vty, "Group %s --- Nexthop %s Interface %s ", grp_str,
+ vty_out (vty, "Group %s --- Nexthop %s Interface %s \n", grp_str,
nexthop_addr_str, nexthop.interface->name);
return CMD_SUCCESS;
vty_out (vty, VTYNL);
- vty_outln (vty,
- "Interface Address ifi Vif PktsIn PktsOut BytesIn BytesOut");
+ vty_out (vty,
+ "Interface Address ifi Vif PktsIn PktsOut BytesIn BytesOut\n");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
struct pim_interface *pim_ifp;
ifaddr = pim_ifp->primary_address;
- vty_outln (vty, "%-9s %-15s %3d %3d %7lu %7lu %10lu %10lu",
+ vty_out (vty, "%-9s %-15s %3d %3d %7lu %7lu %10lu %10lu\n",
ifp->name,
inet_ntoa(ifaddr),
ifp->ifindex,
char uptime[10];
- vty_outln (vty, "Mroute socket descriptor: %d",
+ vty_out (vty, "Mroute socket descriptor: %d\n",
qpim_mroute_socket_fd);
pim_time_uptime(uptime, sizeof(uptime), now - qpim_mroute_socket_creation);
- vty_outln (vty, "Mroute socket uptime: %s",
+ vty_out (vty, "Mroute socket uptime: %s\n",
uptime);
vty_out (vty, VTYNL);
pim_zlookup_show_ip_multicast (vty);
vty_out (vty, VTYNL);
- vty_outln (vty, "Maximum highest VifIndex: %d",
+ vty_out (vty, "Maximum highest VifIndex: %d\n",
PIM_MAX_USABLE_VIFS);
vty_out (vty, VTYNL);
- vty_outln (vty, "Upstream Join Timer: %d secs",
+ vty_out (vty, "Upstream Join Timer: %d secs\n",
qpim_t_periodic);
- vty_outln (vty, "Join/Prune Holdtime: %d secs",
+ vty_out (vty, "Join/Prune Holdtime: %d secs\n",
PIM_JP_HOLDTIME);
- vty_outln (vty, "PIM ECMP: %s",
+ vty_out (vty, "PIM ECMP: %s\n",
qpim_ecmp_enable ? "Enable" : "Disable");
- vty_outln (vty, "PIM ECMP Rebalance: %s",
+ vty_out (vty, "PIM ECMP Rebalance: %s\n",
qpim_ecmp_rebalance_enable ? "Enable" : "Disable");
vty_out (vty, VTYNL);
if (uj) {
json = json_object_new_object();
} else {
- vty_outln (vty,
- "Source Group Proto Input Output TTL Uptime");
+ vty_out (vty,
+ "Source Group Proto Input Output TTL Uptime\n");
}
now = pim_time_monotonic_sec();
strcpy(proto, "STAR");
}
- vty_outln (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s",
+ vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s\n",
src_str,
grp_str,
proto,
}
if (!uj && !found_oif) {
- vty_outln (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s",
+ vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s\n",
src_str,
grp_str,
"none",
}
json_object_object_add(json_oil, out_ifname, json_ifp_out);
} else {
- vty_outln (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s",
+ vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s\n",
src_str,
grp_str,
proto,
}
if (!uj && !found_oif) {
- vty_outln (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s",
+ vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d %8s\n",
src_str,
grp_str,
proto,
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
vty_out (vty, VTYNL);
- vty_outln (vty,
- "Source Group LastUsed Packets Bytes WrongIf ");
+ vty_out (vty,
+ "Source Group LastUsed Packets Bytes WrongIf \n");
/* Print PIM and IGMP route counts */
for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, source_str, sizeof(source_str));
- vty_outln (vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld",
+ vty_out (vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld\n",
source_str,
group_str,
c_oil->cc.lastused/100,
pim_inet4_dump("<group?>", s_route->c_oil.oil.mfcc_mcastgrp, group_str, sizeof(group_str));
pim_inet4_dump("<source?>", s_route->c_oil.oil.mfcc_origin, source_str, sizeof(source_str));
- vty_outln (vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld",
+ vty_out (vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld\n",
source_str,
group_str,
s_route->c_oil.cc.lastused,
addr_str = argv[idx_ipv4]->arg;
result = inet_pton(AF_INET, addr_str, &addr);
if (result <= 0) {
- vty_outln (vty, "Bad unicast address %s: errno=%d: %s",
+ vty_out (vty, "Bad unicast address %s: errno=%d: %s\n",
addr_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
if (pim_nexthop_lookup(&nexthop, addr, 0)) {
- vty_outln (vty, "Failure querying RIB nexthop for unicast address %s",
+ vty_out (vty, "Failure querying RIB nexthop for unicast address %s\n",
addr_str);
return CMD_WARNING;
}
- vty_outln (vty,
- "Address NextHop Interface Metric Preference");
+ vty_out (vty,
+ "Address NextHop Interface Metric Preference\n");
pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr,
nexthop_addr_str, sizeof(nexthop_addr_str));
- vty_outln (vty, "%-15s %-15s %-9s %6d %10d",
+ vty_out (vty, "%-15s %-15s %-9s %6d %10d\n",
addr_str,
nexthop_addr_str,
nexthop.interface ? nexthop.interface->name : "<ifname?>",
struct ssmpingd_sock *ss;
time_t now;
- vty_outln (vty,
- "Source Socket Address Port Uptime Requests");
+ vty_out (vty,
+ "Source Socket Address Port Uptime Requests\n");
if (!qpim_ssmpingd_list)
return;
pim_inet4_dump("<src?>", ss->source_addr, source_str, sizeof(source_str));
if (pim_socket_getsockname(ss->sock_fd, (struct sockaddr *) &bind_addr, &len)) {
- vty_outln (vty, "%% Failure reading socket name for ssmpingd source %s on fd=%d",
+ vty_out (vty, "%% Failure reading socket name for ssmpingd source %s on fd=%d\n",
source_str, ss->sock_fd);
}
pim_inet4_dump("<addr?>", bind_addr.sin_addr, bind_addr_str, sizeof(bind_addr_str));
pim_time_uptime(ss_uptime, sizeof(ss_uptime), now - ss->creation);
- vty_outln (vty, "%-15s %6d %-15s %5d %8s %8lld",
+ vty_out (vty, "%-15s %6d %-15s %5d %8s %8lld\n",
source_str,
ss->sock_fd,
bind_addr_str,
if (result == PIM_MALLOC_FAIL)
{
- vty_outln (vty, "%% Out of memory");
+ vty_out (vty, "%% Out of memory\n");
return CMD_WARNING;
}
if (result == PIM_GROUP_BAD_ADDRESS)
{
- vty_outln (vty, "%% Bad group address specified: %s", group);
+ vty_out (vty, "%% Bad group address specified: %s\n", group);
return CMD_WARNING;
}
if (result == PIM_RP_BAD_ADDRESS)
{
- vty_outln (vty, "%% Bad RP address specified: %s", rp);
+ vty_out (vty, "%% Bad RP address specified: %s\n", rp);
return CMD_WARNING;
}
if (result == PIM_RP_NO_PATH)
{
- vty_outln (vty, "%% No Path to RP address specified: %s", rp);
+ vty_out (vty, "%% No Path to RP address specified: %s\n", rp);
return CMD_WARNING;
}
if (result == PIM_GROUP_OVERLAP)
{
- vty_outln (vty, "%% Group range specified cannot overlap");
+ vty_out (vty, "%% Group range specified cannot overlap\n");
return CMD_WARNING;
}
if (result == PIM_GROUP_PFXLIST_OVERLAP)
{
- vty_outln (vty,
- "%% This group is already covered by a RP prefix-list");
+ vty_out (vty,
+ "%% This group is already covered by a RP prefix-list\n");
return CMD_WARNING;
}
if (result == PIM_RP_PFXLIST_IN_USE)
{
- vty_outln (vty,
- "%% The same prefix-list cannot be applied to multiple RPs");
+ vty_out (vty,
+ "%% The same prefix-list cannot be applied to multiple RPs\n");
return CMD_WARNING;
}
if (result == PIM_GROUP_BAD_ADDRESS)
{
- vty_outln (vty, "%% Bad group address specified: %s", group);
+ vty_out (vty, "%% Bad group address specified: %s\n", group);
return CMD_WARNING;
}
if (result == PIM_RP_BAD_ADDRESS)
{
- vty_outln (vty, "%% Bad RP address specified: %s", rp);
+ vty_out (vty, "%% Bad RP address specified: %s\n", rp);
return CMD_WARNING;
}
if (result == PIM_RP_NOT_FOUND)
{
- vty_outln (vty, "%% Unable to find specified RP");
+ vty_out (vty, "%% Unable to find specified RP\n");
return CMD_WARNING;
}
switch (result)
{
case PIM_SSM_ERR_NO_VRF:
- vty_outln (vty, "%% VRF doesn't exist");
+ vty_out (vty, "%% VRF doesn't exist\n");
break;
case PIM_SSM_ERR_DUP:
- vty_outln (vty, "%% duplicate config");
+ vty_out (vty, "%% duplicate config\n");
break;
default:
- vty_outln (vty, "%% ssm range config failed");
+ vty_out (vty, "%% ssm range config failed\n");
}
return CMD_WARNING;
if (ssm->plist_name && !strcmp(ssm->plist_name, argv[0]->arg))
return pim_ssm_cmd_worker (vty, NULL);
- vty_outln (vty, "%% pim ssm prefix-list %s doesn't exist",
+ vty_out (vty, "%% pim ssm prefix-list %s doesn't exist\n",
argv[0]->arg);
return CMD_WARNING;
json_object *json;
json = json_object_new_object();
json_object_string_add(json, "ssmGroups", range_str);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
else
- vty_outln (vty, "SSM group range : %s", range_str);
+ vty_out (vty, "SSM group range : %s\n", range_str);
}
DEFUN (show_ip_pim_ssm_range,
json_object *json;
json = json_object_new_object();
json_object_string_add(json, "groupType", type_str);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
else
- vty_outln (vty, "Group type : %s", type_str);
+ vty_out (vty, "Group type : %s\n", type_str);
}
DEFUN (show_ip_pim_group_type,
IP_STR
"Enable IP multicast forwarding\n")
{
- vty_outln (vty,
- "Command is Disabled and will be removed in a future version");
+ vty_out (vty,
+ "Command is Disabled and will be removed in a future version\n");
return CMD_SUCCESS;
}
result = inet_pton(AF_INET, source_str, &source_addr);
if (result <= 0) {
- vty_outln (vty, "%% Bad source address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
source_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
result = pim_ssmpingd_start(source_addr);
if (result) {
- vty_outln (vty, "%% Failure starting ssmpingd for source %s: %d",
+ vty_out (vty, "%% Failure starting ssmpingd for source %s: %d\n",
source_str, result);
return CMD_WARNING;
}
result = inet_pton(AF_INET, source_str, &source_addr);
if (result <= 0) {
- vty_outln (vty, "%% Bad source address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
source_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
result = pim_ssmpingd_stop(source_addr);
if (result) {
- vty_outln (vty, "%% Failure stopping ssmpingd for source %s: %d",
+ vty_out (vty, "%% Failure stopping ssmpingd for source %s: %d\n",
source_str, result);
return CMD_WARNING;
}
pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */);
if (!pim_ifp)
{
- vty_outln (vty, "Could not enable IGMP on interface %s",
+ vty_out (vty, "Could not enable IGMP on interface %s\n",
ifp->name);
return CMD_WARNING;
}
group_str = argv[idx_ipv4]->arg;
result = inet_pton(AF_INET, group_str, &group_addr);
if (result <= 0) {
- vty_outln (vty, "Bad group address %s: errno=%d: %s",
+ vty_out (vty, "Bad group address %s: errno=%d: %s\n",
group_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
source_str = argv[idx_ipv4_2]->arg;
result = inet_pton(AF_INET, source_str, &source_addr);
if (result <= 0) {
- vty_outln (vty, "Bad source address %s: errno=%d: %s",
+ vty_out (vty, "Bad source address %s: errno=%d: %s\n",
source_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
result = pim_if_igmp_join_add(ifp, group_addr, source_addr);
if (result) {
- vty_outln (vty, "%% Failure joining IGMP group %s source %s on interface %s: %d",
+ vty_out (vty, "%% Failure joining IGMP group %s source %s on interface %s: %d\n",
group_str, source_str, ifp->name, result);
return CMD_WARNING;
}
group_str = argv[idx_ipv4]->arg;
result = inet_pton(AF_INET, group_str, &group_addr);
if (result <= 0) {
- vty_outln (vty, "Bad group address %s: errno=%d: %s",
+ vty_out (vty, "Bad group address %s: errno=%d: %s\n",
group_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
source_str = argv[idx_ipv4_2]->arg;
result = inet_pton(AF_INET, source_str, &source_addr);
if (result <= 0) {
- vty_outln (vty, "Bad source address %s: errno=%d: %s",
+ vty_out (vty, "Bad source address %s: errno=%d: %s\n",
source_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
result = pim_if_igmp_join_del(ifp, group_addr, source_addr);
if (result) {
- vty_outln (vty, "%% Failure leaving IGMP group %s source %s on interface %s: %d",
+ vty_out (vty, "%% Failure leaving IGMP group %s source %s on interface %s: %d\n",
group_str, source_str, ifp->name, result);
return CMD_WARNING;
}
already, but we verify them anyway for extra safety.
*/
if (query_interval < IGMP_QUERY_INTERVAL_MIN) {
- vty_outln (vty, "General query interval %d lower than minimum %d",
+ vty_out (vty, "General query interval %d lower than minimum %d\n",
query_interval,
IGMP_QUERY_INTERVAL_MIN);
return CMD_WARNING;
}
if (query_interval > IGMP_QUERY_INTERVAL_MAX) {
- vty_outln (vty, "General query interval %d higher than maximum %d",
+ vty_out (vty, "General query interval %d higher than maximum %d\n",
query_interval,
IGMP_QUERY_INTERVAL_MAX);
return CMD_WARNING;
}
if (query_interval_dsec <= pim_ifp->igmp_query_max_response_time_dsec) {
- vty_outln (vty,
- "Can't set general query interval %d dsec <= query max response time %d dsec.",
+ vty_out (vty,
+ "Can't set general query interval %d dsec <= query max response time %d dsec.\n",
query_interval_dsec,pim_ifp->igmp_query_max_response_time_dsec);
return CMD_WARNING;
}
default_query_interval_dsec = IGMP_GENERAL_QUERY_INTERVAL * 10;
if (default_query_interval_dsec <= pim_ifp->igmp_query_max_response_time_dsec) {
- vty_outln (vty,
- "Can't set default general query interval %d dsec <= query max response time %d dsec.",
+ vty_out (vty,
+ "Can't set default general query interval %d dsec <= query max response time %d dsec.\n",
default_query_interval_dsec,
pim_ifp->igmp_query_max_response_time_dsec);
return CMD_WARNING;
query_max_response_time = atoi(argv[3]->arg);
if (query_max_response_time >= pim_ifp->igmp_default_query_interval * 10) {
- vty_outln (vty,
- "Can't set query max response time %d sec >= general query interval %d sec",
+ vty_out (vty,
+ "Can't set query max response time %d sec >= general query interval %d sec\n",
query_max_response_time,pim_ifp->igmp_default_query_interval);
return CMD_WARNING;
}
default_query_interval_dsec = 10 * pim_ifp->igmp_default_query_interval;
if (query_max_response_time_dsec >= default_query_interval_dsec) {
- vty_outln (vty,
- "Can't set query max response time %d dsec >= general query interval %d dsec",
+ vty_out (vty,
+ "Can't set query max response time %d dsec >= general query interval %d dsec\n",
query_max_response_time_dsec,default_query_interval_dsec);
return CMD_WARNING;
}
uint32_t old_dr_prio;
if (!pim_ifp) {
- vty_outln (vty, "Please enable PIM on interface, first");
+ vty_out (vty, "Please enable PIM on interface, first\n");
return CMD_WARNING;
}
struct pim_interface *pim_ifp = ifp->info;
if (!pim_ifp) {
- vty_outln (vty, "Pim not enabled on this interface");
+ vty_out (vty, "Pim not enabled on this interface\n");
return CMD_WARNING;
}
VTY_DECLVAR_CONTEXT(interface, ifp);
if (!pim_cmd_interface_add(ifp)) {
- vty_outln (vty, "Could not enable PIM SM on interface");
+ vty_out (vty, "Could not enable PIM SM on interface\n");
return CMD_WARNING;
}
{
VTY_DECLVAR_CONTEXT(interface, ifp);
if (!pim_cmd_interface_add(ifp)) {
- vty_outln (vty, "Could not enable PIM SM on interface");
+ vty_out (vty, "Could not enable PIM SM on interface\n");
return CMD_WARNING;
}
{
VTY_DECLVAR_CONTEXT(interface, ifp);
if (!pim_cmd_interface_delete(ifp)) {
- vty_outln (vty, "Unable to delete interface information");
+ vty_out (vty, "Unable to delete interface information\n");
return CMD_WARNING;
}
{
VTY_DECLVAR_CONTEXT(interface, ifp);
if (!pim_cmd_interface_delete(ifp)) {
- vty_outln (vty, "Unable to delete interface information");
+ vty_out (vty, "Unable to delete interface information\n");
return CMD_WARNING;
}
oifname = argv[idx_interface]->arg;
oif = if_lookup_by_name(oifname, VRF_DEFAULT);
if (!oif) {
- vty_outln (vty, "No such interface name %s",
+ vty_out (vty, "No such interface name %s\n",
oifname);
return CMD_WARNING;
}
grp_str = argv[idx_ipv4]->arg;
result = inet_pton(AF_INET, grp_str, &grp_addr);
if (result <= 0) {
- vty_outln (vty, "Bad group address %s: errno=%d: %s",
+ vty_out (vty, "Bad group address %s: errno=%d: %s\n",
grp_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
src_addr.s_addr = INADDR_ANY;
if (pim_static_add(iif, oif, grp_addr, src_addr)) {
- vty_outln (vty, "Failed to add route");
+ vty_out (vty, "Failed to add route\n");
return CMD_WARNING;
}
oifname = argv[idx_interface]->arg;
oif = if_lookup_by_name(oifname, VRF_DEFAULT);
if (!oif) {
- vty_outln (vty, "No such interface name %s",
+ vty_out (vty, "No such interface name %s\n",
oifname);
return CMD_WARNING;
}
grp_str = argv[idx_ipv4]->arg;
result = inet_pton(AF_INET, grp_str, &grp_addr);
if (result <= 0) {
- vty_outln (vty, "Bad group address %s: errno=%d: %s",
+ vty_out (vty, "Bad group address %s: errno=%d: %s\n",
grp_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
src_str = argv[idx_ipv4_2]->arg;
result = inet_pton(AF_INET, src_str, &src_addr);
if (result <= 0) {
- vty_outln (vty, "Bad source address %s: errno=%d: %s",
+ vty_out (vty, "Bad source address %s: errno=%d: %s\n",
src_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
if (pim_static_add(iif, oif, grp_addr, src_addr)) {
- vty_outln (vty, "Failed to add route");
+ vty_out (vty, "Failed to add route\n");
return CMD_WARNING;
}
oifname = argv[idx_interface]->arg;
oif = if_lookup_by_name(oifname, VRF_DEFAULT);
if (!oif) {
- vty_outln (vty, "No such interface name %s",
+ vty_out (vty, "No such interface name %s\n",
oifname);
return CMD_WARNING;
}
grp_str = argv[idx_ipv4]->arg;
result = inet_pton(AF_INET, grp_str, &grp_addr);
if (result <= 0) {
- vty_outln (vty, "Bad group address %s: errno=%d: %s",
+ vty_out (vty, "Bad group address %s: errno=%d: %s\n",
grp_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
src_addr.s_addr = INADDR_ANY;
if (pim_static_del(iif, oif, grp_addr, src_addr)) {
- vty_outln (vty, "Failed to remove route");
+ vty_out (vty, "Failed to remove route\n");
return CMD_WARNING;
}
oifname = argv[idx_interface]->arg;
oif = if_lookup_by_name(oifname, VRF_DEFAULT);
if (!oif) {
- vty_outln (vty, "No such interface name %s",
+ vty_out (vty, "No such interface name %s\n",
oifname);
return CMD_WARNING;
}
grp_str = argv[idx_ipv4]->arg;
result = inet_pton(AF_INET, grp_str, &grp_addr);
if (result <= 0) {
- vty_outln (vty, "Bad group address %s: errno=%d: %s",
+ vty_out (vty, "Bad group address %s: errno=%d: %s\n",
grp_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
src_str = argv[idx_ipv4_2]->arg;
result = inet_pton(AF_INET, src_str, &src_addr);
if (result <= 0) {
- vty_outln (vty, "Bad source address %s: errno=%d: %s",
+ vty_out (vty, "Bad source address %s: errno=%d: %s\n",
src_str, errno, safe_strerror(errno));
return CMD_WARNING;
}
if (pim_static_del(iif, oif, grp_addr, src_addr)) {
- vty_outln (vty, "Failed to remove route");
+ vty_out (vty, "Failed to remove route\n");
return CMD_WARNING;
}
{
if (!pim_cmd_interface_add(ifp))
{
- vty_outln (vty, "Could not enable PIM SM on interface");
+ vty_out (vty, "Could not enable PIM SM on interface\n");
return CMD_WARNING;
}
}
struct pim_interface *pim_ifp = ifp->info;
if (!pim_ifp) {
- vty_outln (vty, "Pim not enabled on this interface");
+ vty_out (vty, "Pim not enabled on this interface\n");
return CMD_WARNING;
}
if (argv_find (argv, argc, "hello", &idx))
{
PIM_DO_DEBUG_PIM_HELLO;
- vty_outln (vty, "PIM Hello debugging is on");
+ vty_out (vty, "PIM Hello debugging is on\n");
}
else if (argv_find (argv, argc ,"joins", &idx))
{
PIM_DO_DEBUG_PIM_J_P;
- vty_outln (vty, "PIM Join/Prune debugging is on");
+ vty_out (vty, "PIM Join/Prune debugging is on\n");
}
else if (argv_find (argv, argc, "register", &idx))
{
PIM_DO_DEBUG_PIM_REG;
- vty_outln (vty, "PIM Register debugging is on");
+ vty_out (vty, "PIM Register debugging is on\n");
}
else
{
PIM_DO_DEBUG_PIM_PACKETS;
- vty_outln (vty, "PIM Packet debugging is on ");
+ vty_out (vty, "PIM Packet debugging is on \n");
}
return CMD_SUCCESS;
}
if (argv_find (argv, argc,"hello",&idx))
{
PIM_DONT_DEBUG_PIM_HELLO;
- vty_outln (vty, "PIM Hello debugging is off ");
+ vty_out (vty, "PIM Hello debugging is off \n");
}
else if (argv_find (argv, argc, "joins", &idx))
{
PIM_DONT_DEBUG_PIM_J_P;
- vty_outln (vty, "PIM Join/Prune debugging is off ");
+ vty_out (vty, "PIM Join/Prune debugging is off \n");
}
else if (argv_find (argv, argc, "register", &idx))
{
PIM_DONT_DEBUG_PIM_REG;
- vty_outln (vty, "PIM Register debugging is off");
+ vty_out (vty, "PIM Register debugging is off\n");
}
else
PIM_DONT_DEBUG_PIM_PACKETS;
result = inet_pton(AF_INET, source, &source_addr);
if (result <= 0) {
- vty_outln (vty, "%% Bad source address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
source, errno, safe_strerror(errno));
return CMD_WARNING;
}
case PIM_SUCCESS:
break;
case PIM_IFACE_NOT_FOUND:
- vty_outln (vty, "Pim not enabled on this interface");
+ vty_out (vty, "Pim not enabled on this interface\n");
break;
case PIM_UPDATE_SOURCE_DUP:
- vty_outln (vty, "%% Source already set to %s", source);
+ vty_out (vty, "%% Source already set to %s\n", source);
break;
default:
- vty_outln (vty, "%% Source set failed");
+ vty_out (vty, "%% Source set failed\n");
}
return result?CMD_WARNING:CMD_SUCCESS;
result = inet_pton(AF_INET, peer, &peer_addr);
if (result <= 0) {
- vty_outln (vty, "%% Bad peer address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad peer address %s: errno=%d: %s\n",
peer, errno, safe_strerror(errno));
return CMD_WARNING;
}
result = inet_pton(AF_INET, local, &local_addr);
if (result <= 0) {
- vty_outln (vty, "%% Bad source address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
local, errno, safe_strerror(errno));
return CMD_WARNING;
}
case PIM_MSDP_ERR_NONE:
break;
case PIM_MSDP_ERR_OOM:
- vty_outln (vty, "%% Out of memory");
+ vty_out (vty, "%% Out of memory\n");
break;
case PIM_MSDP_ERR_PEER_EXISTS:
- vty_outln (vty, "%% Peer exists");
+ vty_out (vty, "%% Peer exists\n");
break;
case PIM_MSDP_ERR_MAX_MESH_GROUPS:
- vty_outln (vty, "%% Only one mesh-group allowed currently");
+ vty_out (vty, "%% Only one mesh-group allowed currently\n");
break;
default:
- vty_outln (vty, "%% peer add failed");
+ vty_out (vty, "%% peer add failed\n");
}
return result?CMD_WARNING:CMD_SUCCESS;
result = inet_pton(AF_INET, peer, &peer_addr);
if (result <= 0) {
- vty_outln (vty, "%% Bad peer address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad peer address %s: errno=%d: %s\n",
peer, errno, safe_strerror(errno));
return CMD_WARNING;
}
case PIM_MSDP_ERR_NONE:
break;
case PIM_MSDP_ERR_NO_PEER:
- vty_outln (vty, "%% Peer does not exist");
+ vty_out (vty, "%% Peer does not exist\n");
break;
default:
- vty_outln (vty, "%% peer del failed");
+ vty_out (vty, "%% peer del failed\n");
}
return result?CMD_WARNING:CMD_SUCCESS;
result = inet_pton(AF_INET, mbr, &mbr_ip);
if (result <= 0) {
- vty_outln (vty, "%% Bad member address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad member address %s: errno=%d: %s\n",
mbr, errno, safe_strerror(errno));
return CMD_WARNING;
}
case PIM_MSDP_ERR_NONE:
break;
case PIM_MSDP_ERR_OOM:
- vty_outln (vty, "%% Out of memory");
+ vty_out (vty, "%% Out of memory\n");
break;
case PIM_MSDP_ERR_MG_MBR_EXISTS:
- vty_outln (vty, "%% mesh-group member exists");
+ vty_out (vty, "%% mesh-group member exists\n");
break;
case PIM_MSDP_ERR_MAX_MESH_GROUPS:
- vty_outln (vty, "%% Only one mesh-group allowed currently");
+ vty_out (vty, "%% Only one mesh-group allowed currently\n");
break;
default:
- vty_outln (vty, "%% member add failed");
+ vty_out (vty, "%% member add failed\n");
}
return result?CMD_WARNING:CMD_SUCCESS;
result = inet_pton(AF_INET, mbr, &mbr_ip);
if (result <= 0) {
- vty_outln (vty, "%% Bad member address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad member address %s: errno=%d: %s\n",
mbr, errno, safe_strerror(errno));
return CMD_WARNING;
}
case PIM_MSDP_ERR_NONE:
break;
case PIM_MSDP_ERR_NO_MG:
- vty_outln (vty, "%% mesh-group does not exist");
+ vty_out (vty, "%% mesh-group does not exist\n");
break;
case PIM_MSDP_ERR_NO_MG_MBR:
- vty_outln (vty, "%% mesh-group member does not exist");
+ vty_out (vty, "%% mesh-group member does not exist\n");
break;
default:
- vty_outln (vty, "%% mesh-group member del failed");
+ vty_out (vty, "%% mesh-group member del failed\n");
}
return result?CMD_WARNING:CMD_SUCCESS;
result = inet_pton(AF_INET, src, &src_ip);
if (result <= 0) {
- vty_outln (vty, "%% Bad source address %s: errno=%d: %s",
+ vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
src, errno, safe_strerror(errno));
return CMD_WARNING;
}
case PIM_MSDP_ERR_NONE:
break;
case PIM_MSDP_ERR_OOM:
- vty_outln (vty, "%% Out of memory");
+ vty_out (vty, "%% Out of memory\n");
break;
case PIM_MSDP_ERR_MAX_MESH_GROUPS:
- vty_outln (vty, "%% Only one mesh-group allowed currently");
+ vty_out (vty, "%% Only one mesh-group allowed currently\n");
break;
default:
- vty_outln (vty, "%% source add failed");
+ vty_out (vty, "%% source add failed\n");
}
return result?CMD_WARNING:CMD_SUCCESS;
case PIM_MSDP_ERR_NONE:
break;
case PIM_MSDP_ERR_NO_MG:
- vty_outln (vty, "%% mesh-group does not exist");
+ vty_out (vty, "%% mesh-group does not exist\n");
break;
default:
- vty_outln (vty, "%% mesh-group source del failed");
+ vty_out (vty, "%% mesh-group source del failed\n");
}
return result?CMD_WARNING:CMD_SUCCESS;
case PIM_MSDP_ERR_NONE:
break;
case PIM_MSDP_ERR_NO_MG:
- vty_outln (vty, "%% mesh-group does not exist");
+ vty_out (vty, "%% mesh-group does not exist\n");
break;
default:
- vty_outln (vty, "%% mesh-group source del failed");
+ vty_out (vty, "%% mesh-group source del failed\n");
}
return result ? CMD_WARNING : CMD_SUCCESS;
{
json_object *json;
json = json_object_new_object();
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
json_object_string_add(json_mg_row, "name", mg->mesh_group_name);
json_object_string_add(json_mg_row, "source", src_str);
} else {
- vty_outln (vty, "Mesh group : %s", mg->mesh_group_name);
- vty_outln (vty, " Source : %s", src_str);
- vty_outln (vty, " Member State");
+ vty_out (vty, "Mesh group : %s\n", mg->mesh_group_name);
+ vty_out (vty, " Source : %s\n", src_str);
+ vty_out (vty, " Member State\n");
}
for (ALL_LIST_ELEMENTS_RO(mg->mbr_list, mbrnode, mbr)) {
}
json_object_object_add(json_members, mbr_str, json_row);
} else {
- vty_outln (vty, " %-15s %11s",
+ vty_out (vty, " %-15s %11s\n",
mbr_str, state_str);
}
}
if (uj) {
json_object_object_add(json, mg->mesh_group_name, json_mg_row);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
if (uj) {
json = json_object_new_object();
} else {
- vty_outln (vty,
- "Peer Local State Uptime SaCnt");
+ vty_out (vty,
+ "Peer Local State Uptime SaCnt\n");
}
for (ALL_LIST_ELEMENTS_RO(msdp->peer_list, mpnode, mp)) {
json_object_int_add(json_row, "saCount", mp->sa_cnt);
json_object_object_add(json, peer_str, json_row);
} else {
- vty_outln (vty, "%-15s %15s %11s %8s %6d",
+ vty_out (vty, "%-15s %15s %11s %8s %6d\n",
peer_str, local_str, state_str,
timebuf, mp->sa_cnt);
}
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
json_object_int_add(json_row, "saRcvd", mp->sa_rx_cnt);
json_object_object_add(json, peer_str, json_row);
} else {
- vty_outln (vty, "Peer : %s", peer_str);
- vty_outln (vty, " Local : %s", local_str);
- vty_outln (vty, " Mesh Group : %s", mp->mesh_group_name);
- vty_outln (vty, " State : %s", state_str);
- vty_outln (vty, " Uptime : %s", timebuf);
-
- vty_outln (vty, " Keepalive Timer : %s", katimer);
- vty_outln (vty, " Conn Retry Timer : %s", crtimer);
- vty_outln (vty, " Hold Timer : %s", holdtimer);
- vty_outln (vty, " Last Reset : %s", mp->last_reset);
- vty_outln (vty, " Conn Attempts : %d", mp->conn_attempts);
- vty_outln (vty, " Established Changes : %d", mp->est_flaps);
- vty_outln (vty, " SA Count : %d", mp->sa_cnt);
- vty_outln (vty, " Statistics :");
- vty_outln (vty, " Sent Rcvd");
- vty_outln (vty, " Keepalives : %10d %10d",
+ vty_out (vty, "Peer : %s\n", peer_str);
+ vty_out (vty, " Local : %s\n", local_str);
+ vty_out (vty, " Mesh Group : %s\n", mp->mesh_group_name);
+ vty_out (vty, " State : %s\n", state_str);
+ vty_out (vty, " Uptime : %s\n", timebuf);
+
+ vty_out (vty, " Keepalive Timer : %s\n", katimer);
+ vty_out (vty, " Conn Retry Timer : %s\n", crtimer);
+ vty_out (vty, " Hold Timer : %s\n", holdtimer);
+ vty_out (vty, " Last Reset : %s\n", mp->last_reset);
+ vty_out (vty, " Conn Attempts : %d\n", mp->conn_attempts);
+ vty_out (vty, " Established Changes : %d\n", mp->est_flaps);
+ vty_out (vty, " SA Count : %d\n", mp->sa_cnt);
+ vty_out (vty, " Statistics :\n");
+ vty_out (vty, " Sent Rcvd\n");
+ vty_out (vty, " Keepalives : %10d %10d\n",
mp->ka_tx_cnt, mp->ka_rx_cnt);
- vty_outln (vty, " SAs : %10d %10d",
+ vty_out (vty, " SAs : %10d %10d\n",
mp->sa_tx_cnt, mp->sa_rx_cnt);
vty_out (vty, VTYNL);
}
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
if (uj) {
json = json_object_new_object();
} else {
- vty_outln (vty,
- "Source Group RP Local SPT Uptime");
+ vty_out (vty,
+ "Source Group RP Local SPT Uptime\n");
}
for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
json_object_string_add(json_row, "upTime", timebuf);
json_object_object_add(json_group, src_str, json_row);
} else {
- vty_outln (vty, "%-15s %15s %15s %5c %3c %8s",
+ vty_out (vty, "%-15s %15s %15s %5c %3c %8s\n",
src_str, grp_str, rp_str, local_str[0], spt_str[0], timebuf);
}
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
json_object_string_add(json_row, "stateTimer", statetimer);
json_object_object_add(json_group, src_str, json_row);
} else {
- vty_outln (vty, "SA : %s", sa->sg_str);
- vty_outln (vty, " RP : %s", rp_str);
- vty_outln (vty, " Peer : %s", peer_str);
- vty_outln (vty, " Local : %s", local_str);
- vty_outln (vty, " SPT Setup : %s", spt_str);
- vty_outln (vty, " Uptime : %s", timebuf);
- vty_outln (vty, " State Timer : %s", statetimer);
+ vty_out (vty, "SA : %s\n", sa->sg_str);
+ vty_out (vty, " RP : %s\n", rp_str);
+ vty_out (vty, " Peer : %s\n", peer_str);
+ vty_out (vty, " Local : %s\n", local_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);
}
}
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
}
if (uj) {
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
if (mg->src_ip.s_addr != INADDR_ANY) {
pim_inet4_dump("<src?>", mg->src_ip, src_str, sizeof(src_str));
- vty_outln (vty, "ip msdp mesh-group %s source %s",
+ vty_out (vty, "ip msdp mesh-group %s source %s\n",
mg->mesh_group_name, src_str);
++count;
}
for (ALL_LIST_ELEMENTS_RO(mg->mbr_list, mbrnode, mbr)) {
pim_inet4_dump("<mbr?>", mbr->mbr_ip, mbr_str, sizeof(mbr_str));
- vty_outln (vty, "ip msdp mesh-group %s member %s",
+ vty_out (vty, "ip msdp mesh-group %s member %s\n",
mg->mesh_group_name, mbr_str);
++count;
}
continue;
if (rp_info->plist)
- vty_outln (vty, "ip pim rp %s prefix-list %s",
+ vty_out (vty, "ip pim rp %s prefix-list %s\n",
inet_ntop(AF_INET, &rp_info->rp.rpf_addr.u.prefix4, rp_buffer, 32),
rp_info->plist);
else
- vty_outln (vty, "ip pim rp %s %s",
+ vty_out (vty, "ip pim rp %s %s\n",
inet_ntop(AF_INET, &rp_info->rp.rpf_addr.u.prefix4, rp_buffer, 32),
prefix2str(&rp_info->group, group_buffer, 32));
count++;
if (uj)
json = json_object_new_object();
else
- vty_outln (vty,
- "RP address group/prefix-list OIF I am RP");
+ vty_out (vty,
+ "RP address group/prefix-list OIF I am RP\n");
for (ALL_LIST_ELEMENTS_RO (qpim_rp_list, node, rp_info))
{
vty_out (vty, "%-10s ", "(Unknown)");
if (rp_info->i_am_rp)
- vty_outln (vty, "yes");
+ vty_out (vty, "yes\n");
else
- vty_outln (vty, "no");
+ vty_out (vty, "no\n");
}
prev_rp_info = rp_info;
if (prev_rp_info && json_rp_rows)
json_object_object_add(json, inet_ntoa (prev_rp_info->rp.rpf_addr.u.prefix4), json_rp_rows);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
{
struct interface *oifp = pim_if_find_by_vif_index (i);
if (sroute->source.s_addr == 0)
- vty_outln (vty, " ip mroute %s %s", oifp->name, gbuf);
+ vty_out (vty, " ip mroute %s %s\n", oifp->name, gbuf);
else
- vty_outln (vty, " ip mroute %s %s %s", oifp->name, gbuf,
+ vty_out (vty, " ip mroute %s %s %s\n", oifp->name, gbuf,
sbuf);
count ++;
}
int writes = 0;
if (PIM_DEBUG_MSDP_EVENTS) {
- vty_outln (vty, "debug msdp events");
+ vty_out (vty, "debug msdp events\n");
++writes;
}
if (PIM_DEBUG_MSDP_PACKETS) {
- vty_outln (vty, "debug msdp packets");
+ vty_out (vty, "debug msdp packets\n");
++writes;
}
if (PIM_DEBUG_MSDP_INTERNAL) {
- vty_outln (vty, "debug msdp internal");
+ vty_out (vty, "debug msdp internal\n");
++writes;
}
if (PIM_DEBUG_IGMP_EVENTS) {
- vty_outln (vty, "debug igmp events");
+ vty_out (vty, "debug igmp events\n");
++writes;
}
if (PIM_DEBUG_IGMP_PACKETS) {
- vty_outln (vty, "debug igmp packets");
+ vty_out (vty, "debug igmp packets\n");
++writes;
}
if (PIM_DEBUG_IGMP_TRACE) {
- vty_outln (vty, "debug igmp trace");
+ vty_out (vty, "debug igmp trace\n");
++writes;
}
if (PIM_DEBUG_IGMP_TRACE_DETAIL) {
- vty_outln (vty, "debug igmp trace detail");
+ vty_out (vty, "debug igmp trace detail\n");
++writes;
}
if (PIM_DEBUG_MROUTE) {
- vty_outln (vty, "debug mroute");
+ vty_out (vty, "debug mroute\n");
++writes;
}
if (PIM_DEBUG_MROUTE_DETAIL) {
- vty_outln (vty, "debug mroute detail");
+ vty_out (vty, "debug mroute detail\n");
++writes;
}
if (PIM_DEBUG_PIM_EVENTS) {
- vty_outln (vty, "debug pim events");
+ vty_out (vty, "debug pim events\n");
++writes;
}
if (PIM_DEBUG_PIM_PACKETS) {
- vty_outln (vty, "debug pim packets");
+ vty_out (vty, "debug pim packets\n");
++writes;
}
if (PIM_DEBUG_PIM_PACKETDUMP_SEND) {
- vty_outln (vty, "debug pim packet-dump send");
+ vty_out (vty, "debug pim packet-dump send\n");
++writes;
}
if (PIM_DEBUG_PIM_PACKETDUMP_RECV) {
- vty_outln (vty, "debug pim packet-dump receive");
+ vty_out (vty, "debug pim packet-dump receive\n");
++writes;
}
if (PIM_DEBUG_PIM_TRACE) {
- vty_outln (vty, "debug pim trace");
+ vty_out (vty, "debug pim trace\n");
++writes;
}
if (PIM_DEBUG_PIM_TRACE_DETAIL) {
- vty_outln (vty, "debug pim trace detail");
+ vty_out (vty, "debug pim trace detail\n");
++writes;
}
if (PIM_DEBUG_ZEBRA) {
- vty_outln (vty, "debug pim zebra");
+ vty_out (vty, "debug pim zebra\n");
++writes;
}
if (PIM_DEBUG_SSMPINGD) {
- vty_outln (vty, "debug ssmpingd");
+ vty_out (vty, "debug ssmpingd\n");
++writes;
}
if (PIM_DEBUG_PIM_HELLO) {
- vty_outln (vty, "debug pim packets hello");
+ vty_out (vty, "debug pim packets hello\n");
++writes;
}
if (PIM_DEBUG_PIM_J_P) {
- vty_outln (vty, "debug pim packets joins");
+ vty_out (vty, "debug pim packets joins\n");
++writes;
}
if (PIM_DEBUG_PIM_REG) {
- vty_outln (vty, "debug pim packets register");
+ vty_out (vty, "debug pim packets register\n");
++writes;
}
if (PIM_DEBUG_STATIC) {
- vty_outln (vty, "debug pim static");
+ vty_out (vty, "debug pim static\n");
++writes;
}
if (!pimg->send_v6_secondary)
{
- vty_outln (vty, "no ip pim send-v6-secondary");
+ vty_out (vty, "no ip pim send-v6-secondary\n");
++writes;
}
if (qpim_register_suppress_time != PIM_REGISTER_SUPPRESSION_TIME_DEFAULT)
{
- vty_outln (vty, "ip pim register-suppress-time %d",
+ vty_out (vty, "ip pim register-suppress-time %d\n",
qpim_register_suppress_time);
++writes;
}
if (qpim_t_periodic != PIM_DEFAULT_T_PERIODIC)
{
- vty_outln (vty, "ip pim join-prune-interval %d",
+ vty_out (vty, "ip pim join-prune-interval %d\n",
qpim_t_periodic);
++writes;
}
if (qpim_keep_alive_time != PIM_KEEPALIVE_PERIOD)
{
- vty_outln (vty, "ip pim keep-alive-timer %d",
+ vty_out (vty, "ip pim keep-alive-timer %d\n",
qpim_keep_alive_time);
++writes;
}
if (qpim_packet_process != PIM_DEFAULT_PACKET_PROCESS)
{
- vty_outln (vty, "ip pim packets %d",
+ vty_out (vty, "ip pim packets %d\n",
qpim_packet_process);
++writes;
}
if (ssm->plist_name)
{
- vty_outln (vty, "ip pim ssm prefix-list %s",
+ vty_out (vty, "ip pim ssm prefix-list %s\n",
ssm->plist_name);
++writes;
}
if (pimg->spt.switchover == PIM_SPT_INFINITY)
{
if (pimg->spt.plist)
- vty_outln (vty, "ip pim spt-switchover infinity-and-beyond prefix-list %s",
+ vty_out (vty, "ip pim spt-switchover infinity-and-beyond prefix-list %s\n",
pimg->spt.plist);
else
- vty_outln (vty,"ip pim spt-switchover infinity-and-beyond");
+ vty_out (vty,"ip pim spt-switchover infinity-and-beyond\n");
++writes;
}
if (qpim_ecmp_rebalance_enable)
{
- vty_outln (vty, "ip pim ecmp rebalance");
+ vty_out (vty, "ip pim ecmp rebalance\n");
++writes;
}
else if (qpim_ecmp_enable)
{
- vty_outln (vty, "ip pim ecmp");
+ vty_out (vty, "ip pim ecmp\n");
++writes;
}
if (qpim_ssmpingd_list) {
struct listnode *node;
struct ssmpingd_sock *ss;
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
++writes;
for (ALL_LIST_ELEMENTS_RO(qpim_ssmpingd_list, node, ss)) {
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", ss->source_addr, source_str, sizeof(source_str));
- vty_outln (vty, "ip ssmpingd %s", source_str);
+ vty_out (vty, "ip ssmpingd %s\n", source_str);
++writes;
}
}
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
/* IF name */
- vty_outln (vty, "interface %s", ifp->name);
+ vty_out (vty, "interface %s\n", ifp->name);
++writes;
if (ifp->info) {
struct pim_interface *pim_ifp = ifp->info;
if (PIM_IF_TEST_PIM(pim_ifp->options)) {
- vty_outln (vty, " ip pim sm");
+ vty_out (vty, " ip pim sm\n");
++writes;
}
/* IF ip pim drpriority */
if (pim_ifp->pim_dr_priority != PIM_DEFAULT_DR_PRIORITY) {
- vty_outln (vty, " ip pim drpriority %u",pim_ifp->pim_dr_priority);
+ vty_out (vty, " ip pim drpriority %u\n",pim_ifp->pim_dr_priority);
++writes;
}
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", pim_ifp->update_source, src_str,
sizeof(src_str));
- vty_outln (vty, " ip pim use-source %s", src_str);
+ vty_out (vty, " ip pim use-source %s\n", src_str);
++writes;
}
/* IF ip igmp */
if (PIM_IF_TEST_IGMP(pim_ifp->options)) {
- vty_outln (vty, " ip igmp");
+ vty_out (vty, " ip igmp\n");
++writes;
}
/* ip igmp version */
if (pim_ifp->igmp_version != IGMP_DEFAULT_VERSION)
{
- vty_outln (vty, " ip igmp version %d",
+ vty_out (vty, " ip igmp version %d\n",
pim_ifp->igmp_version);
++writes;
}
/* IF ip igmp query-interval */
if (pim_ifp->igmp_default_query_interval != IGMP_GENERAL_QUERY_INTERVAL)
{
- vty_outln (vty, " ip igmp query-interval %d",
+ vty_out (vty, " ip igmp query-interval %d\n",
pim_ifp->igmp_default_query_interval);
++writes;
}
/* IF ip igmp query-max-response-time */
if (pim_ifp->igmp_query_max_response_time_dsec != IGMP_QUERY_MAX_RESPONSE_TIME_DSEC)
{
- vty_outln (vty, " ip igmp query-max-response-time %d",
+ vty_out (vty, " ip igmp query-max-response-time %d\n",
pim_ifp->igmp_query_max_response_time_dsec);
++writes;
}
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<grp?>", ij->group_addr, group_str, sizeof(group_str));
inet_ntop(AF_INET, &ij->source_addr, source_str, sizeof(source_str));
- vty_outln (vty, " ip igmp join %s %s",
+ vty_out (vty, " ip igmp join %s %s\n",
group_str,source_str);
++writes;
}
writes += pim_static_write_mroute (vty, ifp);
}
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
++writes;
/* PIM BFD write */
pim_bfd_write_config (vty, ifp);
vty_out(vty, "Zclient update socket: ");
if (zclient) {
- vty_outln (vty, "%d failures=%d", zclient->sock,
+ vty_out (vty, "%d failures=%d\n", zclient->sock,
zclient->fail);
}
else {
- vty_outln (vty, "<null zclient>");
+ vty_out (vty, "<null zclient>\n");
}
}
{
vty_out(vty, "Zclient lookup socket: ");
if (zlookup) {
- vty_outln (vty, "%d failures=%d", zlookup->sock,
+ vty_out (vty, "%d failures=%d\n", zlookup->sock,
zlookup->fail);
}
else {
- vty_outln (vty, "<null zclient>");
+ vty_out (vty, "<null zclient>\n");
}
}
continue;
_fail = 0;$argblocks
if (_fail)
- vty_outln (vty, "%% invalid input for %s: %s",
+ vty_out (vty, "%% invalid input for %s: %s\\n",
argv[_i]->varname, argv[_i]->arg);
_failcnt += _fail;
}
DEBUG_STR
RIP_STR)
{
- vty_outln (vty, "RIP debugging status:");
+ vty_out (vty, "RIP debugging status:\n");
if (IS_RIP_DEBUG_EVENT)
- vty_outln (vty, " RIP event debugging is on");
+ vty_out (vty, " RIP event debugging is on\n");
if (IS_RIP_DEBUG_PACKET)
{
if (IS_RIP_DEBUG_SEND && IS_RIP_DEBUG_RECV)
{
- vty_outln (vty," RIP packet debugging is on");
+ vty_out (vty," RIP packet debugging is on\n");
}
else
{
if (IS_RIP_DEBUG_SEND)
- vty_outln (vty," RIP packet send debugging is on");
+ vty_out (vty," RIP packet send debugging is on\n");
else
- vty_outln (vty," RIP packet receive debugging is on");
+ vty_out (vty," RIP packet receive debugging is on\n");
}
}
if (IS_RIP_DEBUG_ZEBRA)
- vty_outln (vty, " RIP zebra debugging is on");
+ vty_out (vty, " RIP zebra debugging is on\n");
return CMD_SUCCESS;
}
if (IS_RIP_DEBUG_EVENT)
{
- vty_outln (vty, "debug rip events");
+ vty_out (vty, "debug rip events\n");
write++;
}
if (IS_RIP_DEBUG_PACKET)
{
if (IS_RIP_DEBUG_SEND && IS_RIP_DEBUG_RECV)
{
- vty_outln (vty,"debug rip packet");
+ vty_out (vty,"debug rip packet\n");
write++;
}
else
{
if (IS_RIP_DEBUG_SEND)
- vty_outln (vty,"debug rip packet send");
+ vty_out (vty,"debug rip packet send\n");
else
- vty_outln (vty,"debug rip packet recv");
+ vty_out (vty,"debug rip packet recv\n");
write++;
}
}
if (IS_RIP_DEBUG_ZEBRA)
{
- vty_outln (vty, "debug rip zebra");
+ vty_out (vty, "debug rip zebra\n");
write++;
}
return write;
if (ret < 0)
{
- vty_outln (vty, "There is a same network configuration %s",
+ vty_out (vty, "There is a same network configuration %s\n",
argv[idx_ipv4_word]->arg);
return CMD_WARNING;
}
if (ret < 0)
{
- vty_outln (vty, "Can't find network configuration %s",
+ vty_out (vty, "Can't find network configuration %s\n",
argv[idx_ipv4_word]->arg);
return CMD_WARNING;
}
if (ret <= 0)
{
- vty_outln (vty, "Please specify address by A.B.C.D");
+ vty_out (vty, "Please specify address by A.B.C.D\n");
return CMD_WARNING;
}
if (ret <= 0)
{
- vty_outln (vty, "Please specify address by A.B.C.D");
+ vty_out (vty, "Please specify address by A.B.C.D\n");
return CMD_WARNING;
}
{
if (auth_type != RIP_AUTH_MD5)
{
- vty_outln (vty, "auth length argument only valid for md5");
+ vty_out (vty, "auth length argument only valid for md5\n");
return CMD_WARNING;
}
if (strmatch ("rfc", authlen))
if (strlen (argv[idx_line]->arg) > 16)
{
- vty_outln (vty,
- "%% RIPv2 authentication string must be shorter than 16");
+ vty_out (vty,
+ "%% RIPv2 authentication string must be shorter than 16\n");
return CMD_WARNING;
}
if (ri->key_chain)
{
- vty_outln (vty, "%% key-chain configuration exists");
+ vty_out (vty, "%% key-chain configuration exists\n");
return CMD_WARNING;
}
if (ri->auth_str)
{
- vty_outln (vty,"%% authentication string configuration exists");
+ vty_out (vty,"%% authentication string configuration exists\n");
return CMD_WARNING;
}
(!ri->key_chain) )
continue;
- vty_outln (vty, "interface %s",ifp->name);
+ vty_out (vty, "interface %s\n",ifp->name);
if (ifp->desc)
- vty_outln (vty, " description %s",ifp->desc);
+ vty_out (vty, " description %s\n",ifp->desc);
/* Split horizon. */
if (ri->split_horizon != ri->split_horizon_default)
{
switch (ri->split_horizon) {
case RIP_SPLIT_HORIZON:
- vty_outln (vty, " ip rip split-horizon");
+ vty_out (vty, " ip rip split-horizon\n");
break;
case RIP_SPLIT_HORIZON_POISONED_REVERSE:
- vty_outln (vty," ip rip split-horizon poisoned-reverse");
+ vty_out (vty," ip rip split-horizon poisoned-reverse\n");
break;
case RIP_NO_SPLIT_HORIZON:
default:
- vty_outln (vty, " no ip rip split-horizon");
+ vty_out (vty, " no ip rip split-horizon\n");
break;
}
}
/* RIP version setting. */
if (ri->ri_send != RI_RIP_UNSPEC)
- vty_outln (vty, " ip rip send version %s",
+ vty_out (vty, " ip rip send version %s\n",
lookup_msg(ri_version_msg, ri->ri_send, NULL));
if (ri->ri_receive != RI_RIP_UNSPEC)
- vty_outln (vty, " ip rip receive version %s ",
+ vty_out (vty, " ip rip receive version %s \n",
lookup_msg(ri_version_msg, ri->ri_receive, NULL));
if (ri->v2_broadcast)
- vty_outln (vty, " ip rip v2-broadcast");
+ vty_out (vty, " ip rip v2-broadcast\n");
/* RIP authentication. */
if (ri->auth_type == RIP_AUTH_SIMPLE_PASSWORD)
- vty_outln (vty, " ip rip authentication mode text");
+ vty_out (vty, " ip rip authentication mode text\n");
if (ri->auth_type == RIP_AUTH_MD5)
{
}
if (ri->auth_str)
- vty_outln (vty, " ip rip authentication string %s",
+ vty_out (vty, " ip rip authentication string %s\n",
ri->auth_str);
if (ri->key_chain)
- vty_outln (vty, " ip rip authentication key-chain %s",
+ vty_out (vty, " ip rip authentication key-chain %s\n",
ri->key_chain);
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
return 0;
}
/* Network type RIP enable interface statement. */
for (node = route_top (rip_enable_network); node; node = route_next (node))
if (node->info)
- vty_outln (vty, "%s%s/%d",
+ vty_out (vty, "%s%s/%d\n",
config_mode ? " network " : " ",
inet_ntoa (node->p.u.prefix4),
node->p.prefixlen);
/* Interface name RIP enable statement. */
for (i = 0; i < vector_active (rip_enable_interface); i++)
if ((ifname = vector_slot (rip_enable_interface, i)) != NULL)
- vty_outln (vty, "%s%s",
+ vty_out (vty, "%s%s\n",
config_mode ? " network " : " ",
ifname);
/* RIP neighbors listing. */
for (node = route_top (rip->neighbor); node; node = route_next (node))
if (node->info)
- vty_outln (vty, "%s%s",
+ vty_out (vty, "%s%s\n",
config_mode ? " neighbor " : " ",
inet_ntoa(node->p.u.prefix4));
/* RIP passive interface listing. */
if (config_mode) {
if (passive_default)
- vty_outln (vty, " passive-interface default");
+ vty_out (vty, " passive-interface default\n");
for (i = 0; i < vector_active (Vrip_passive_nondefault); i++)
if ((ifname = vector_slot (Vrip_passive_nondefault, i)) != NULL)
- vty_outln (vty, " %spassive-interface %s",
+ vty_out (vty, " %spassive-interface %s\n",
(passive_default ? "no " : ""), ifname);
}
direct = RIP_OFFSET_LIST_OUT;
else
{
- vty_outln (vty, "Invalid direction: %s", direct_str);
+ vty_out (vty, "Invalid direction: %s\n", direct_str);
return CMD_WARNING;
}
metric = atoi (metric_str);
if (metric < 0 || metric > 16)
{
- vty_outln (vty, "Invalid metric: %s", metric_str);
+ vty_out (vty, "Invalid metric: %s\n", metric_str);
return CMD_WARNING;
}
direct = RIP_OFFSET_LIST_OUT;
else
{
- vty_outln (vty, "Invalid direction: %s", direct_str);
+ vty_out (vty, "Invalid direction: %s\n", direct_str);
return CMD_WARNING;
}
metric = atoi (metric_str);
if (metric < 0 || metric > 16)
{
- vty_outln (vty, "Invalid metric: %s", metric_str);
+ vty_out (vty, "Invalid metric: %s\n", metric_str);
return CMD_WARNING;
}
}
else
{
- vty_outln (vty, "Can't find offset-list");
+ vty_out (vty, "Can't find offset-list\n");
return CMD_WARNING;
}
return CMD_SUCCESS;
if (! offset->ifname)
{
if (offset->direct[RIP_OFFSET_LIST_IN].alist_name)
- vty_outln (vty, " offset-list %s in %d",
+ vty_out (vty, " offset-list %s in %d\n",
offset->direct[RIP_OFFSET_LIST_IN].alist_name,
offset->direct[RIP_OFFSET_LIST_IN].metric);
if (offset->direct[RIP_OFFSET_LIST_OUT].alist_name)
- vty_outln (vty, " offset-list %s out %d",
+ vty_out (vty, " offset-list %s out %d\n",
offset->direct[RIP_OFFSET_LIST_OUT].alist_name,
offset->direct[RIP_OFFSET_LIST_OUT].metric);
}
else
{
if (offset->direct[RIP_OFFSET_LIST_IN].alist_name)
- vty_outln (vty, " offset-list %s in %d %s",
+ vty_out (vty, " offset-list %s in %d %s\n",
offset->direct[RIP_OFFSET_LIST_IN].alist_name,
offset->direct[RIP_OFFSET_LIST_IN].metric,
offset->ifname);
if (offset->direct[RIP_OFFSET_LIST_OUT].alist_name)
- vty_outln (vty, " offset-list %s out %d %s",
+ vty_out (vty, " offset-list %s out %d %s\n",
offset->direct[RIP_OFFSET_LIST_OUT].alist_name,
offset->direct[RIP_OFFSET_LIST_OUT].metric,
offset->ifname);
for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer))
{
- vty_outln (vty, " %-16s %9d %9d %9d %s", inet_ntoa (peer->addr),
+ vty_out (vty, " %-16s %9d %9d %9d %s\n", inet_ntoa (peer->addr),
peer->recv_badpackets, peer->recv_badroutes,
ZEBRA_RIP_DISTANCE_DEFAULT,
rip_peer_uptime(peer, timebuf, RIP_UPTIME_LEN));
}
}
- vty_outln (vty, "Invalid type %s",argv[1]->arg);
+ vty_out (vty, "Invalid type %s\n",argv[1]->arg);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s",argv[2]->arg);
+ vty_out (vty, "Invalid type %s\n",argv[2]->arg);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
}
}
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
{
if (! zclient->enable)
{
- vty_outln (vty, "no router zebra");
+ vty_out (vty, "no router zebra\n");
return 1;
}
else if (! vrf_bitmap_check (zclient->redist[AFI_IP][ZEBRA_ROUTE_RIP], VRF_DEFAULT))
{
- vty_outln (vty, "router zebra");
- vty_outln (vty, " no redistribute rip");
+ vty_out (vty, "router zebra\n");
+ vty_out (vty, " no redistribute rip\n");
return 1;
}
return 0;
if (rip->route_map[i].metric_config)
{
if (rip->route_map[i].name)
- vty_outln (vty, " redistribute %s metric %d route-map %s",
+ vty_out (vty, " redistribute %s metric %d route-map %s\n",
zebra_route_string(i), rip->route_map[i].metric,
rip->route_map[i].name);
else
- vty_outln (vty, " redistribute %s metric %d",
+ vty_out (vty, " redistribute %s metric %d\n",
zebra_route_string(i),rip->route_map[i].metric);
}
else
{
if (rip->route_map[i].name)
- vty_outln (vty, " redistribute %s route-map %s",
+ vty_out (vty, " redistribute %s route-map %s\n",
zebra_route_string(i),rip->route_map[i].name);
else
- vty_outln (vty, " redistribute %s",zebra_route_string(i));
+ vty_out (vty, " redistribute %s\n",zebra_route_string(i));
}
}
else
version = atoi (argv[idx_number]->arg);
if (version != RIPv1 && version != RIPv2)
{
- vty_outln (vty, "invalid rip version %d",version);
+ vty_out (vty, "invalid rip version %d\n",version);
return CMD_WARNING;
}
rip->version_send = version;
ret = str2prefix_ipv4 (argv[idx_ipv4_prefixlen]->arg, &p);
if (ret < 0)
{
- vty_outln (vty, "Malformed address");
+ vty_out (vty, "Malformed address\n");
return CMD_WARNING;
}
apply_mask_ipv4 (&p);
if (node->info)
{
- vty_outln (vty, "There is already same static route.");
+ vty_out (vty, "There is already same static route.\n");
route_unlock_node (node);
return CMD_WARNING;
}
ret = str2prefix_ipv4 (argv[idx_ipv4_prefixlen]->arg, &p);
if (ret < 0)
{
- vty_outln (vty, "Malformed address");
+ vty_out (vty, "Malformed address\n");
return CMD_WARNING;
}
apply_mask_ipv4 (&p);
node = route_node_lookup (rip->route, (struct prefix *) &p);
if (! node)
{
- vty_outln (vty, "Can't find route %s.",argv[idx_ipv4_prefixlen]->arg);
+ vty_out (vty, "Can't find route %s.\n",argv[idx_ipv4_prefixlen]->arg);
return CMD_WARNING;
}
update = strtoul (argv[idx_number]->arg, &endptr, 10);
if (update > RIP_TIMER_MAX || update < RIP_TIMER_MIN || *endptr != '\0')
{
- vty_outln (vty, "update timer value error");
+ vty_out (vty, "update timer value error\n");
return CMD_WARNING;
}
timeout = strtoul (argv[idx_number_2]->arg, &endptr, 10);
if (timeout > RIP_TIMER_MAX || timeout < RIP_TIMER_MIN || *endptr != '\0')
{
- vty_outln (vty, "timeout timer value error");
+ vty_out (vty, "timeout timer value error\n");
return CMD_WARNING;
}
garbage = strtoul (argv[idx_number_3]->arg, &endptr, 10);
if (garbage > RIP_TIMER_MAX || garbage < RIP_TIMER_MIN || *endptr != '\0')
{
- vty_outln (vty, "garbage timer value error");
+ vty_out (vty, "garbage timer value error\n");
return CMD_WARNING;
}
ret = str2prefix_ipv4 (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
ret = str2prefix_ipv4 (ip_str, &p);
if (ret == 0)
{
- vty_outln (vty, "Malformed prefix");
+ vty_out (vty, "Malformed prefix\n");
return CMD_WARNING;
}
rn = route_node_lookup (rip_distance_table, (struct prefix *)&p);
if (! rn)
{
- vty_outln (vty, "Can't find specified prefix");
+ vty_out (vty, "Can't find specified prefix\n");
return CMD_WARNING;
}
int header = 1;
char buf[BUFSIZ];
- vty_outln (vty, " Distance: (default is %d)",
+ vty_out (vty, " Distance: (default is %d)\n",
rip->distance ? rip->distance : ZEBRA_RIP_DISTANCE_DEFAULT);
for (rn = route_top (rip_distance_table); rn; rn = route_next (rn))
{
if (header)
{
- vty_outln (vty," Address Distance List");
+ vty_out (vty," Address Distance List\n");
header = 0;
}
sprintf (buf, "%s/%d", inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen);
- vty_outln (vty, " %-20s %4d %s",
+ vty_out (vty, " %-20s %4d %s\n",
buf, rdistance->distance,
rdistance->access_list ? rdistance->access_list : "");
}
{
if (rip->ecmp)
{
- vty_outln (vty, "ECMP is already enabled.");
+ vty_out (vty, "ECMP is already enabled.\n");
return CMD_WARNING;
}
{
if (!rip->ecmp)
{
- vty_outln (vty, "ECMP is already disabled.");
+ vty_out (vty, "ECMP is already disabled.\n");
return CMD_WARNING;
}
vty_outln (vty, "Routing Protocol is \"rip\"");
vty_out (vty, " Sending updates every %ld seconds with +/-50%%,",
rip->update_time);
- vty_outln (vty, " next due in %lu seconds",
+ vty_out (vty, " next due in %lu seconds\n",
thread_timer_remain_second(rip->t_update));
vty_out (vty, " Timeout after %ld seconds,", rip->timeout_time);
- vty_outln (vty, " garbage collect after %ld seconds",rip->garbage_time);
+ vty_out (vty, " garbage collect after %ld seconds\n",rip->garbage_time);
/* Filtering status show. */
config_show_distribute (vty);
/* Default metric information. */
- vty_outln (vty, " Default redistribution metric is %d",
+ vty_out (vty, " Default redistribution metric is %d\n",
rip->default_metric);
/* Redistribute information. */
vty_out (vty, " Default version control: send version %s,",
lookup_msg(ri_version_msg,rip->version_send, NULL));
if (rip->version_recv == RI_RIP_VERSION_1_AND_2)
- vty_outln (vty, " receive any version ");
+ vty_out (vty, " receive any version \n");
else
- vty_outln (vty, " receive version %s ",
+ vty_out (vty, " receive version %s \n",
lookup_msg(ri_version_msg,rip->version_recv, NULL));
- vty_outln (vty, " Interface Send Recv Key-chain");
+ vty_out (vty, " Interface Send Recv Key-chain\n");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
{
else
receive_version = lookup_msg(ri_version_msg, ri->ri_receive, NULL);
- vty_outln (vty, " %-17s%-3s %-3s %s", ifp->name,
+ vty_out (vty, " %-17s%-3s %-3s %s\n", ifp->name,
send_version,
receive_version,
ri->key_chain ? ri->key_chain : "");
}
}
- vty_outln (vty, " Routing for Networks:");
+ vty_out (vty, " Routing for Networks:\n");
config_write_rip_network (vty, 0);
{
{
if (!found_passive)
{
- vty_outln (vty, " Passive Interface(s):");
+ vty_out (vty, " Passive Interface(s):\n");
found_passive = 1;
}
- vty_outln (vty, " %s", ifp->name);
+ vty_out (vty, " %s\n", ifp->name);
}
}
}
- vty_outln (vty, " Routing Information Sources:");
- vty_outln (vty,
- " Gateway BadPackets BadRoutes Distance Last Update");
+ vty_out (vty, " Routing Information Sources:\n");
+ vty_out (vty,
+ " Gateway BadPackets BadRoutes Distance Last Update\n");
rip_peer_display (vty);
rip_distance_show (vty);
if (rip)
{
/* Router RIP statement. */
- vty_outln (vty, "router rip");
+ vty_out (vty, "router rip\n");
write++;
/* RIP version statement. Default is RIP version 2. */
if (rip->version_send != RI_RIP_VERSION_2
|| rip->version_recv != RI_RIP_VERSION_1_AND_2)
- vty_outln (vty, " version %d",rip->version_send);
+ vty_out (vty, " version %d\n",rip->version_send);
/* RIP timer configuration. */
if (rip->update_time != RIP_UPDATE_TIMER_DEFAULT
|| rip->timeout_time != RIP_TIMEOUT_TIMER_DEFAULT
|| rip->garbage_time != RIP_GARBAGE_TIMER_DEFAULT)
- vty_outln (vty, " timers basic %lu %lu %lu",
+ vty_out (vty, " timers basic %lu %lu %lu\n",
rip->update_time,
rip->timeout_time,
rip->garbage_time);
if (rip->default_information)
{
if (rip->default_information_route_map)
- vty_outln (vty, " default-information originate route-map %s",
+ vty_out (vty, " default-information originate route-map %s\n",
rip->default_information_route_map);
else
- vty_outln (vty," default-information originate");
+ vty_out (vty," default-information originate\n");
}
/* Redistribute configuration. */
/* RIP default metric configuration */
if (rip->default_metric != RIP_DEFAULT_METRIC_DEFAULT)
- vty_outln (vty, " default-metric %d",
+ vty_out (vty, " default-metric %d\n",
rip->default_metric);
/* Distribute configuration. */
/* Distance configuration. */
if (rip->distance)
- vty_outln (vty, " distance %d", rip->distance);
+ vty_out (vty, " distance %d\n", rip->distance);
/* RIP source IP prefix distance configuration. */
for (rn = route_top (rip_distance_table); rn; rn = route_next (rn))
if ((rdistance = rn->info) != NULL)
- vty_outln (vty, " distance %d %s/%d %s", rdistance->distance,
+ vty_out (vty, " distance %d %s/%d %s\n", rdistance->distance,
inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen,
rdistance->access_list ? rdistance->access_list : "");
/* ECMP configuration. */
if (rip->ecmp)
- vty_outln (vty, " allow-ecmp");
+ vty_out (vty, " allow-ecmp\n");
/* RIP static route configuration. */
for (rn = route_top (rip->route); rn; rn = route_next (rn))
if (rn->info)
- vty_outln (vty, " route %s/%d",
+ vty_out (vty, " route %s/%d\n",
inet_ntoa (rn->p.u.prefix4),
rn->p.prefixlen);
DEBUG_STR
"RIPng configuration\n")
{
- vty_outln (vty, "RIPng debugging status:");
+ vty_out (vty, "RIPng debugging status:\n");
if (IS_RIPNG_DEBUG_EVENT)
- vty_outln (vty, " RIPng event debugging is on");
+ vty_out (vty, " RIPng event debugging is on\n");
if (IS_RIPNG_DEBUG_PACKET)
{
if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
{
- vty_outln (vty," RIPng packet debugging is on");
+ vty_out (vty," RIPng packet debugging is on\n");
}
else
{
if (IS_RIPNG_DEBUG_SEND)
- vty_outln (vty," RIPng packet send debugging is on");
+ vty_out (vty," RIPng packet send debugging is on\n");
else
- vty_outln (vty," RIPng packet receive debugging is on");
+ vty_out (vty," RIPng packet receive debugging is on\n");
}
}
if (IS_RIPNG_DEBUG_ZEBRA)
- vty_outln (vty, " RIPng zebra debugging is on");
+ vty_out (vty, " RIPng zebra debugging is on\n");
return CMD_SUCCESS;
}
if (IS_RIPNG_DEBUG_EVENT)
{
- vty_outln (vty, "debug ripng events");
+ vty_out (vty, "debug ripng events\n");
write++;
}
if (IS_RIPNG_DEBUG_PACKET)
{
if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
{
- vty_outln (vty,"debug ripng packet");
+ vty_out (vty,"debug ripng packet\n");
write++;
}
else
{
if (IS_RIPNG_DEBUG_SEND)
- vty_outln (vty,"debug ripng packet send");
+ vty_out (vty,"debug ripng packet send\n");
else
- vty_outln (vty,"debug ripng packet recv");
+ vty_out (vty,"debug ripng packet recv\n");
write++;
}
}
if (IS_RIPNG_DEBUG_ZEBRA)
{
- vty_outln (vty, "debug ripng zebra");
+ vty_out (vty, "debug ripng zebra\n");
write++;
}
return write;
if (node->info)
{
struct prefix *p = &node->p;
- vty_outln (vty, "%s%s/%d",
+ vty_out (vty, "%s%s/%d\n",
config_mode ? " network " : " ",
inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ),
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_outln (vty, "%s%s",
+ vty_out (vty, "%s%s\n",
config_mode ? " network " : " ",
ifname);
if (config_mode)
for (i = 0; i < vector_active (Vripng_passive_interface); i++)
if ((ifname = vector_slot (Vripng_passive_interface, i)) != NULL)
- vty_outln (vty, " passive-interface %s", ifname);
+ vty_out (vty, " passive-interface %s\n", ifname);
return 0;
}
if (ret < 0)
{
- vty_outln (vty, "There is same network configuration %s",
+ vty_out (vty, "There is same network configuration %s\n",
argv[idx_if_or_addr]->arg);
return CMD_WARNING;
}
if (ret < 0)
{
- vty_outln (vty, "can't find network %s",argv[idx_if_or_addr]->arg);
+ vty_out (vty, "can't find network %s\n",argv[idx_if_or_addr]->arg);
return CMD_WARNING;
}
(ri->split_horizon == ri->split_horizon_default))
continue;
- vty_outln (vty, "interface %s",ifp->name);
+ vty_out (vty, "interface %s\n",ifp->name);
if (ifp->desc)
- vty_outln (vty, " description %s",ifp->desc);
+ vty_out (vty, " description %s\n",ifp->desc);
/* Split horizon. */
if (ri->split_horizon != ri->split_horizon_default)
{
switch (ri->split_horizon) {
case RIPNG_SPLIT_HORIZON:
- vty_outln (vty, " ipv6 ripng split-horizon");
+ vty_out (vty, " ipv6 ripng split-horizon\n");
break;
case RIPNG_SPLIT_HORIZON_POISONED_REVERSE:
- vty_outln (vty," ipv6 ripng split-horizon poisoned-reverse");
+ vty_out (vty," ipv6 ripng split-horizon poisoned-reverse\n");
break;
case RIPNG_NO_SPLIT_HORIZON:
default:
- vty_outln (vty, " no ipv6 ripng split-horizon");
+ vty_out (vty, " no ipv6 ripng split-horizon\n");
break;
}
}
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
write++;
}
direct = RIPNG_OFFSET_LIST_OUT;
else
{
- vty_outln (vty, "Invalid direction: %s", direct_str);
+ vty_out (vty, "Invalid direction: %s\n", direct_str);
return CMD_WARNING;
}
metric = atoi (metric_str);
if (metric < 0 || metric > 16)
{
- vty_outln (vty, "Invalid metric: %s", metric_str);
+ vty_out (vty, "Invalid metric: %s\n", metric_str);
return CMD_WARNING;
}
direct = RIPNG_OFFSET_LIST_OUT;
else
{
- vty_outln (vty, "Invalid direction: %s", direct_str);
+ vty_out (vty, "Invalid direction: %s\n", direct_str);
return CMD_WARNING;
}
metric = atoi (metric_str);
if (metric < 0 || metric > 16)
{
- vty_outln (vty, "Invalid metric: %s", metric_str);
+ vty_out (vty, "Invalid metric: %s\n", metric_str);
return CMD_WARNING;
}
}
else
{
- vty_outln (vty, "Can't find offset-list");
+ vty_out (vty, "Can't find offset-list\n");
return CMD_WARNING;
}
return CMD_SUCCESS;
if (! offset->ifname)
{
if (offset->direct[RIPNG_OFFSET_LIST_IN].alist_name)
- vty_outln (vty, " offset-list %s in %d",
+ vty_out (vty, " offset-list %s in %d\n",
offset->direct[RIPNG_OFFSET_LIST_IN].alist_name,
offset->direct[RIPNG_OFFSET_LIST_IN].metric);
if (offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name)
- vty_outln (vty, " offset-list %s out %d",
+ vty_out (vty, " offset-list %s out %d\n",
offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name,
offset->direct[RIPNG_OFFSET_LIST_OUT].metric);
}
else
{
if (offset->direct[RIPNG_OFFSET_LIST_IN].alist_name)
- vty_outln (vty, " offset-list %s in %d %s",
+ vty_out (vty, " offset-list %s in %d %s\n",
offset->direct[RIPNG_OFFSET_LIST_IN].alist_name,
offset->direct[RIPNG_OFFSET_LIST_IN].metric,
offset->ifname);
if (offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name)
- vty_outln (vty, " offset-list %s out %d %s",
+ vty_out (vty, " offset-list %s out %d %s\n",
offset->direct[RIPNG_OFFSET_LIST_OUT].alist_name,
offset->direct[RIPNG_OFFSET_LIST_OUT].metric,
offset->ifname);
for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer))
{
- vty_outln (vty, " %s %s%14s %10d %10d %10d %s", inet6_ntoa (peer->addr),
+ vty_out (vty, " %s %s%14s %10d %10d %10d %s\n", inet6_ntoa (peer->addr),
VTYNL, " ",
peer->recv_badpackets, peer->recv_badroutes,
ZEBRA_RIPNG_DISTANCE_DEFAULT,
if (type < 0)
{
- vty_outln (vty, "Invalid type %s", proto);
+ vty_out (vty, "Invalid type %s\n", proto);
return CMD_WARNING;
}
if (type < 0)
{
- vty_outln (vty, "Invalid type %s", proto);
+ vty_out (vty, "Invalid type %s\n", proto);
return CMD_WARNING;
}
if (type < 0)
{
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
if (type < 0)
{
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
if (type < 0)
{
- vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text);
+ vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
return CMD_WARNING;
}
if (ripng->route_map[i].metric_config)
{
if (ripng->route_map[i].name)
- vty_outln (vty, " redistribute %s metric %d route-map %s",
+ vty_out (vty, " redistribute %s metric %d route-map %s\n",
zebra_route_string(i), ripng->route_map[i].metric,
ripng->route_map[i].name);
else
- vty_outln (vty, " redistribute %s metric %d",
+ vty_out (vty, " redistribute %s metric %d\n",
zebra_route_string(i),ripng->route_map[i].metric);
}
else
{
if (ripng->route_map[i].name)
- vty_outln (vty, " redistribute %s route-map %s",
+ vty_out (vty, " redistribute %s route-map %s\n",
zebra_route_string(i),ripng->route_map[i].name);
else
- vty_outln (vty, " redistribute %s",zebra_route_string(i));
+ vty_out (vty, " redistribute %s\n",zebra_route_string(i));
}
}
else
{
if (! zclient->enable)
{
- vty_outln (vty, "no router zebra");
+ vty_out (vty, "no router zebra\n");
return 1;
}
else if (! vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG], VRF_DEFAULT))
{
- vty_outln (vty, "router zebra");
- vty_outln (vty, " no redistribute ripng");
+ vty_out (vty, "router zebra\n");
+ vty_out (vty, " no redistribute ripng\n");
return 1;
}
return 0;
vty_outln (vty, "Routing Protocol is \"RIPng\"");
vty_out (vty, " Sending updates every %ld seconds with +/-50%%,",
ripng->update_time);
- vty_outln (vty, " next due in %lu seconds",
+ vty_out (vty, " next due in %lu seconds\n",
thread_timer_remain_second(ripng->t_update));
vty_out (vty, " Timeout after %ld seconds,", ripng->timeout_time);
- vty_outln (vty, " garbage collect after %ld seconds",ripng->garbage_time);
+ vty_out (vty, " garbage collect after %ld seconds\n",ripng->garbage_time);
/* Filtering status show. */
config_show_distribute (vty);
/* Default metric information. */
- vty_outln (vty, " Default redistribution metric is %d",
+ vty_out (vty, " Default redistribution metric is %d\n",
ripng->default_metric);
/* Redistribute information. */
vty_out (vty, VTYNL);
vty_out (vty, " Default version control: send version %d,", ripng->version);
- vty_outln (vty, " receive version %d ",ripng->version);
+ vty_out (vty, " receive version %d \n",ripng->version);
- vty_outln (vty, " Interface Send Recv");
+ vty_out (vty, " Interface Send Recv\n");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
{
if (ri->enable_network || ri->enable_interface)
{
- vty_outln (vty, " %-17s%-3d %-3d", ifp->name,
+ vty_out (vty, " %-17s%-3d %-3d\n", ifp->name,
ripng->version,
ripng->version);
}
}
- vty_outln (vty, " Routing for Networks:");
+ vty_out (vty, " Routing for Networks:\n");
ripng_network_write (vty, 0);
- vty_outln (vty, " Routing Information Sources:");
- vty_outln (vty,
- " Gateway BadPackets BadRoutes Distance Last Update");
+ vty_out (vty, " Routing Information Sources:\n");
+ vty_out (vty,
+ " Gateway BadPackets BadRoutes Distance Last Update\n");
ripng_peer_display (vty);
return CMD_SUCCESS;
ret = str2prefix_ipv6 (argv[idx_ipv6addr]->arg, (struct prefix_ipv6 *)&p);
if (ret <= 0)
{
- vty_outln (vty, "Malformed address");
+ vty_out (vty, "Malformed address\n");
return CMD_WARNING;
}
apply_mask_ipv6 (&p);
rp = route_node_get (ripng->route, (struct prefix *) &p);
if (rp->info)
{
- vty_outln (vty, "There is already same static route.");
+ vty_out (vty, "There is already same static route.\n");
route_unlock_node (rp);
return CMD_WARNING;
}
ret = str2prefix_ipv6 (argv[idx_ipv6addr]->arg, (struct prefix_ipv6 *)&p);
if (ret <= 0)
{
- vty_outln (vty, "Malformed address");
+ vty_out (vty, "Malformed address\n");
return CMD_WARNING;
}
apply_mask_ipv6 (&p);
rp = route_node_lookup (ripng->route, (struct prefix *) &p);
if (! rp)
{
- vty_outln (vty, "Can't find static route.");
+ vty_out (vty, "Can't find static route.\n");
return CMD_WARNING;
}
ret = str2prefix_ipv6 (argv[idx_ipv6_prefixlen]->arg, (struct prefix_ipv6 *)&p);
if (ret <= 0)
{
- vty_outln (vty, "Malformed address");
+ vty_out (vty, "Malformed address\n");
return CMD_WARNING;
}
node = route_node_get (ripng->aggregate, &p);
if (node->info)
{
- vty_outln (vty, "There is already same aggregate route.");
+ vty_out (vty, "There is already same aggregate route.\n");
route_unlock_node (node);
return CMD_WARNING;
}
ret = str2prefix_ipv6 (argv[idx_ipv6_prefixlen]->arg, (struct prefix_ipv6 *) &p);
if (ret <= 0)
{
- vty_outln (vty, "Malformed address");
+ vty_out (vty, "Malformed address\n");
return CMD_WARNING;
}
rn = route_node_lookup (ripng->aggregate, &p);
if (! rn)
{
- vty_outln (vty, "Can't find aggregate route.");
+ vty_out (vty, "Can't find aggregate route.\n");
return CMD_WARNING;
}
route_unlock_node (rn);
{
if (ripng->ecmp)
{
- vty_outln (vty, "ECMP is already enabled.");
+ vty_out (vty, "ECMP is already enabled.\n");
return CMD_WARNING;
}
{
if (!ripng->ecmp)
{
- vty_outln (vty, "ECMP is already disabled.");
+ vty_out (vty, "ECMP is already disabled.\n");
return CMD_WARNING;
}
{
/* RIPng router. */
- vty_outln (vty, "router ripng");
+ vty_out (vty, "router ripng\n");
if (ripng->default_information)
- vty_outln (vty, " default-information originate");
+ vty_out (vty, " default-information originate\n");
ripng_network_write (vty, 1);
/* RIPng default metric configuration */
if (ripng->default_metric != RIPNG_DEFAULT_METRIC_DEFAULT)
- vty_outln (vty, " default-metric %d",
+ vty_out (vty, " default-metric %d\n",
ripng->default_metric);
ripng_redistribute_write (vty, 1);
/* RIPng aggregate routes. */
for (rp = route_top (ripng->aggregate); rp; rp = route_next (rp))
if (rp->info != NULL)
- vty_outln (vty, " aggregate-address %s/%d",
+ vty_out (vty, " aggregate-address %s/%d\n",
inet6_ntoa (rp->p.u.prefix6),
rp->p.prefixlen);
/* ECMP configuration. */
if (ripng->ecmp)
- vty_outln (vty, " allow-ecmp");
+ vty_out (vty, " allow-ecmp\n");
/* RIPng static routes. */
for (rp = route_top (ripng->route); rp; rp = route_next (rp))
if (rp->info != NULL)
- vty_outln (vty, " route %s/%d", inet6_ntoa (rp->p.u.prefix6),
+ vty_out (vty, " route %s/%d\n", inet6_ntoa (rp->p.u.prefix6),
rp->p.prefixlen);
/* RIPng timers configuration. */
ripng->timeout_time != RIPNG_TIMEOUT_TIMER_DEFAULT ||
ripng->garbage_time != RIPNG_GARBAGE_TIMER_DEFAULT)
{
- vty_outln (vty, " timers basic %ld %ld %ld",
+ vty_out (vty, " timers basic %ld %ld %ld\n",
ripng->update_time,
ripng->timeout_time,
ripng->garbage_time);
int argc, struct cmd_token *argv[])
{
int i;
- vty_outln (vty, "%s with %d args.", descr, argc);
+ vty_out (vty, "%s with %d args.\n", descr, argc);
for (i = 0; i < argc; i++)
{
- vty_outln (vty, "[%02d] %s@%s: %s", i, argv[i]->text, argv[i]->varname, argv[i]->arg);
+ vty_out (vty, "[%02d] %s@%s: %s\n", i, argv[i]->text, argv[i]->varname, argv[i]->arg);
}
return CMD_SUCCESS;
"1\n2\n3\n4\n5\n")
{
char buf[256];
- vty_outln(vty, "def: %s", self->string);
- vty_outln(vty, "num: %ld", magic);
- vty_outln(vty, "ipv4: %s", prefix2str(ipv4net, buf, sizeof(buf)));
- vty_outln(vty, "ipv6: %s", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf)));
+ vty_out(vty, "def: %s\n", self->string);
+ vty_out(vty, "num: %ld\n", magic);
+ vty_out(vty, "ipv4: %s\n", prefix2str(ipv4net, buf, sizeof(buf)));
+ vty_out(vty, "ipv6: %s\n", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf)));
return CMD_SUCCESS;
}
char *str;
if (!argc)
{
- vty_outln (vty, "%% string argument required");
+ vty_out (vty, "%% string argument required\n");
return CMD_WARNING;
}
if (!argc)
{
- vty_outln (vty, "%% string argument required");
+ vty_out (vty, "%% string argument required\n");
return CMD_WARNING;
}
char *str;
if (!argc)
{
- vty_outln (vty, "%% string argument required");
+ vty_out (vty, "%% string argument required\n");
return CMD_WARNING;
}
else
fp = stdout;
- vty_outln (vty, "Building configuration...");
- vty_outln (vty, "%sCurrent configuration:",VTYNL);
- vty_outln (vty, "!");
+ vty_out (vty, "Building configuration...\n");
+ vty_out (vty, "%sCurrent configuration:\n",VTYNL);
+ vty_out (vty, "!\n");
for (i = 0; i < array_size(vtysh_client); i++)
if ((argc < 3 ) || (strmatch (vtysh_client[i].name, argv[2]->text)))
fp = NULL;
}
- vty_outln (vty, "end");
+ vty_out (vty, "end\n");
return CMD_SUCCESS;
}
lines = strtol (argv[idx_number]->arg, &endptr, 10);
if (lines < 0 || lines > 512 || *endptr != '\0')
{
- vty_outln (vty, "length is malformed");
+ vty_out (vty, "length is malformed\n");
return CMD_WARNING;
}
sigset_t oldmask, sigmask;
if (integrated_write_pid != -1) {
- vty_outln (vty,"%% configuration write already in progress.");
+ vty_out (vty,"%% configuration write already in progress.\n");
return CMD_WARNING;
}
child = fork();
if (child == -1) {
- vty_outln (vty, "%% configuration write fork() failed: %s.",
+ vty_out (vty, "%% configuration write fork() failed: %s.\n",
safe_strerror(errno));
sigprocmask(SIG_SETMASK, &oldmask, NULL);
return CMD_WARNING;
if (rtadv->AdvSendAdvertisements)
{
- vty_outln (vty, " ND advertised reachable time is %d milliseconds",
+ vty_out (vty, " ND advertised reachable time is %d milliseconds\n",
rtadv->AdvReachableTime);
- vty_outln (vty, " ND advertised retransmit interval is %d milliseconds",
+ vty_out (vty, " ND advertised retransmit interval is %d milliseconds\n",
rtadv->AdvRetransTimer);
- vty_outln (vty, " ND router advertisements sent: %d rcvd: %d",
+ vty_out (vty, " ND router advertisements sent: %d rcvd: %d\n",
zif->ra_sent, zif->ra_rcvd);
interval = rtadv->MaxRtrAdvInterval;
if (interval % 1000)
vty_outln (vty, " ND router advertisements are sent every "
"%d seconds",interval / 1000);
if (rtadv->AdvDefaultLifetime != -1)
- vty_outln (vty, " ND router advertisements live for %d seconds",
+ vty_out (vty, " ND router advertisements live for %d seconds\n",
rtadv->AdvDefaultLifetime);
else
- vty_outln (vty,
- " ND router advertisements lifetime tracks ra-interval");
+ vty_out (vty,
+ " ND router advertisements lifetime tracks ra-interval\n");
vty_outln (vty, " ND router advertisement default router preference is "
"%s",rtadv_pref_strs[rtadv->DefaultPreference]);
if (rtadv->AdvManagedFlag)
- vty_outln (vty," Hosts use DHCP to obtain routable addresses.");
+ vty_out (vty," Hosts use DHCP to obtain routable addresses.\n");
else
- vty_outln (vty," Hosts use stateless autoconfig for addresses.");
+ vty_out (vty," Hosts use stateless autoconfig for addresses.\n");
if (rtadv->AdvHomeAgentFlag)
{
vty_outln (vty,
" ND router advertisements with " "Home Agent flag bit set.");
if (rtadv->HomeAgentLifetime != -1)
- vty_outln (vty, " Home Agent lifetime is %u seconds",
+ vty_out (vty, " Home Agent lifetime is %u seconds\n",
rtadv->HomeAgentLifetime);
else
- vty_outln (vty," Home Agent lifetime tracks ra-lifetime");
- vty_outln (vty, " Home Agent preference is %u",
+ vty_out (vty," Home Agent lifetime tracks ra-lifetime\n");
+ vty_out (vty, " Home Agent preference is %u\n",
rtadv->HomeAgentPreference);
}
if (rtadv->AdvIntervalOption)
- vty_outln (vty,
- " ND router advertisements with Adv. Interval option.");
+ vty_out (vty,
+ " ND router advertisements with Adv. Interval option.\n");
}
}
#endif /* HAVE_RTADV */
if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION)) {
if (if_is_running(ifp))
- vty_outln (vty, "is up");
+ vty_out (vty, "is up\n");
else
- vty_outln (vty, "is down");
+ vty_out (vty, "is down\n");
} else {
- vty_outln (vty, "detection is disabled");
+ vty_out (vty, "detection is disabled\n");
}
} else {
- vty_outln (vty, "down");
+ vty_out (vty, "down\n");
}
- vty_outln (vty, " Link ups: %5u last: %s", zebra_if->up_count,
+ vty_out (vty, " Link ups: %5u last: %s\n", zebra_if->up_count,
zebra_if->up_last[0] ? zebra_if->up_last : "(never)");
- vty_outln (vty, " Link downs: %5u last: %s", zebra_if->down_count,
+ vty_out (vty, " Link downs: %5u last: %s\n", zebra_if->down_count,
zebra_if->down_last[0] ? zebra_if->down_last : "(never)");
zebra_ptm_show_status(vty, ifp);
vrf = vrf_lookup_by_id (ifp->vrf_id);
- vty_outln (vty, " vrf: %s", vrf->name);
+ vty_out (vty, " vrf: %s\n", vrf->name);
if (ifp->desc)
- vty_outln (vty, " Description: %s",ifp->desc);
+ vty_out (vty, " Description: %s\n",ifp->desc);
if (ifp->ifindex == IFINDEX_INTERNAL)
{
- vty_outln (vty, " pseudo interface");
+ vty_out (vty, " pseudo interface\n");
return;
}
else if (! CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
{
- vty_outln (vty, " index %d inactive interface",
+ vty_out (vty, " index %d inactive interface\n",
ifp->ifindex);
return;
}
ifp->ifindex, ifp->metric, ifp->mtu, ifp->speed);
if (ifp->mtu6 != ifp->mtu)
vty_out (vty, "mtu6 %d ", ifp->mtu6);
- vty_outln (vty, "%s flags: %s", VTYNL,
+ vty_out (vty, "%s flags: %s\n", VTYNL,
if_flag_dump(ifp->flags));
/* Hardware address. */
- vty_outln (vty, " Type: %s", if_link_type_str(ifp->ll_type));
+ vty_out (vty, " Type: %s\n", if_link_type_str(ifp->ll_type));
if (ifp->hw_addr_len != 0)
{
int i;
{
int i;
struct if_link_params *iflp = ifp->link_params;
- vty_outln (vty, " Traffic Engineering Link Parameters:");
+ vty_out (vty, " Traffic Engineering Link Parameters:\n");
if (IS_PARAM_SET(iflp, LP_TE_METRIC))
- vty_outln (vty, " TE metric %u",iflp->te_metric);
+ vty_out (vty, " TE metric %u\n",iflp->te_metric);
if (IS_PARAM_SET(iflp, LP_MAX_BW))
- vty_outln (vty, " Maximum Bandwidth %g (Byte/s)", iflp->max_bw);
+ vty_out (vty, " Maximum Bandwidth %g (Byte/s)\n", iflp->max_bw);
if (IS_PARAM_SET(iflp, LP_MAX_RSV_BW))
- vty_outln (vty, " Maximum Reservable Bandwidth %g (Byte/s)",
+ vty_out (vty, " Maximum Reservable Bandwidth %g (Byte/s)\n",
iflp->max_rsv_bw);
if (IS_PARAM_SET(iflp, LP_UNRSV_BW)) {
- vty_outln (vty, " Unreserved Bandwidth per Class Type in Byte/s:");
+ vty_out (vty, " Unreserved Bandwidth per Class Type in Byte/s:\n");
for (i = 0; i < MAX_CLASS_TYPE; i+=2)
- vty_outln (vty, " [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)",
+ vty_out (vty, " [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)\n",
i, iflp->unrsv_bw[i], i+1, iflp->unrsv_bw[i + 1]);
}
if (IS_PARAM_SET(iflp, LP_ADM_GRP))
- vty_outln (vty, " Administrative Group:%u", iflp->admin_grp);
+ vty_out (vty, " Administrative Group:%u\n", iflp->admin_grp);
if (IS_PARAM_SET(iflp, LP_DELAY))
{
vty_out(vty, " Link Delay Average: %u (micro-sec.)", iflp->av_delay);
vty_out (vty, VTYNL);
}
if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
- vty_outln (vty, " Link Delay Variation %u (micro-sec.)",
+ vty_out (vty, " Link Delay Variation %u (micro-sec.)\n",
iflp->delay_var);
if (IS_PARAM_SET(iflp, LP_PKT_LOSS))
- vty_outln (vty, " Link Packet Loss %g (in %%)", iflp->pkt_loss);
+ vty_out (vty, " Link Packet Loss %g (in %%)\n", iflp->pkt_loss);
if (IS_PARAM_SET(iflp, LP_AVA_BW))
- vty_outln (vty, " Available Bandwidth %g (Byte/s)", iflp->ava_bw);
+ vty_out (vty, " Available Bandwidth %g (Byte/s)\n", iflp->ava_bw);
if (IS_PARAM_SET(iflp, LP_RES_BW))
- vty_outln (vty, " Residual Bandwidth %g (Byte/s)", iflp->res_bw);
+ vty_out (vty, " Residual Bandwidth %g (Byte/s)\n", iflp->res_bw);
if (IS_PARAM_SET(iflp, LP_USE_BW))
- vty_outln (vty, " Utilized Bandwidth %g (Byte/s)", iflp->use_bw);
+ vty_out (vty, " Utilized Bandwidth %g (Byte/s)\n", iflp->use_bw);
if (IS_PARAM_SET(iflp, LP_RMT_AS))
- vty_outln (vty, " Neighbor ASBR IP: %s AS: %u ", inet_ntoa(iflp->rmt_ip),
+ vty_out (vty, " Neighbor ASBR IP: %s AS: %u \n", inet_ntoa(iflp->rmt_ip),
iflp->rmt_as);
}
nd_dump_vty (vty, ifp);
#endif /* HAVE_RTADV */
if (listhead(ifp->nbr_connected))
- vty_outln (vty, " Neighbor address(s):");
+ vty_out (vty, " Neighbor address(s):\n");
for (ALL_LIST_ELEMENTS_RO (ifp->nbr_connected, node, nbr_connected))
nbr_connected_dump_vty (vty, nbr_connected);
ifp->stats.rx_over_errors, ifp->stats.rx_crc_errors,
ifp->stats.rx_frame_errors);
- vty_outln (vty, " %lu fifo, %lu missed", ifp->stats.rx_fifo_errors,
+ vty_out (vty, " %lu fifo, %lu missed\n", ifp->stats.rx_fifo_errors,
ifp->stats.rx_missed_errors);
- vty_outln (vty, " %lu output packets, %lu bytes, %lu dropped",
+ vty_out (vty, " %lu output packets, %lu bytes, %lu dropped\n",
ifp->stats.tx_packets, ifp->stats.tx_bytes,
ifp->stats.tx_dropped);
ifp->stats.tx_carrier_errors, ifp->stats.tx_fifo_errors,
ifp->stats.tx_heartbeat_errors);
- vty_outln (vty, " %lu window, %lu collisions",
+ vty_out (vty, " %lu window, %lu collisions\n",
ifp->stats.tx_window_errors, ifp->stats.collisions);
#endif /* HAVE_PROC_NET_DEV */
(unsigned long long)ifp->stats.ifi_iqdrops,
(unsigned long long)ifp->stats.ifi_imcasts);
- vty_outln (vty, " input errors %llu",
+ vty_out (vty, " input errors %llu\n",
(unsigned long long)ifp->stats.ifi_ierrors);
vty_outln (vty, " output packets %llu, bytes %llu,"
(unsigned long long)ifp->stats.ifi_obytes,
(unsigned long long)ifp->stats.ifi_omcasts);
- vty_outln (vty, " output errors %llu",
+ vty_out (vty, " output errors %llu\n",
(unsigned long long)ifp->stats.ifi_oerrors);
- vty_outln (vty, " collisions %llu",
+ vty_out (vty, " collisions %llu\n",
(unsigned long long)ifp->stats.ifi_collisions);
#else
/* Statistics print out using sysctl (). */
ifp->stats.ifi_ipackets, ifp->stats.ifi_ibytes,
ifp->stats.ifi_iqdrops,ifp->stats.ifi_imcasts);
- vty_outln (vty, " input errors %lu",
+ vty_out (vty, " input errors %lu\n",
ifp->stats.ifi_ierrors);
- vty_outln (vty, " output packets %lu, bytes %lu, multicast packets %lu",
+ vty_out (vty, " output packets %lu, bytes %lu, multicast packets %lu\n",
ifp->stats.ifi_opackets, ifp->stats.ifi_obytes,
ifp->stats.ifi_omcasts);
- vty_outln (vty, " output errors %lu",
+ vty_out (vty, " output errors %lu\n",
ifp->stats.ifi_oerrors);
- vty_outln (vty, " collisions %lu",
+ vty_out (vty, " collisions %lu\n",
ifp->stats.ifi_collisions);
#endif /* __bsdi__ || __NetBSD__ */
#endif /* HAVE_NET_RT_IFLIST */
ifp = if_lookup_by_name (argv[idx_ifname]->arg, vrf_id);
if (ifp == NULL)
{
- vty_outln (vty, "%% Can't find interface %s",argv[idx_ifname]->arg);
+ vty_out (vty, "%% Can't find interface %s\n",argv[idx_ifname]->arg);
return CMD_WARNING;
}
if_dump_vty (vty, ifp);
if (!found)
{
- vty_outln (vty, "%% Can't find interface %s", argv[idx_ifname]->arg);
+ vty_out (vty, "%% Can't find interface %s\n", argv[idx_ifname]->arg);
return CMD_WARNING;
}
struct listnode *node;
struct interface *ifp;
- vty_outln (vty, "Interface Status Protocol Description");
+ vty_out (vty, "Interface Status Protocol Description\n");
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (vrf_id), node, ifp))
{
int len;
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
if (!list_isempty (vrf->iflist))
{
- vty_outln (vty, "%s\tVRF %u%s", VTYNL, vrf->vrf_id,
+ vty_out (vty, "%s\tVRF %u%s\n", VTYNL, vrf->vrf_id,
VTYNL);
if_show_description (vty, vrf->vrf_id);
}
ret = if_set_flags (ifp, IFF_MULTICAST);
if (ret < 0)
{
- vty_outln (vty, "Can't set multicast flag");
+ vty_out (vty, "Can't set multicast flag\n");
return CMD_WARNING;
}
if_refresh (ifp);
ret = if_unset_flags (ifp, IFF_MULTICAST);
if (ret < 0)
{
- vty_outln (vty, "Can't unset multicast flag");
+ vty_out (vty, "Can't unset multicast flag\n");
return CMD_WARNING;
}
if_refresh (ifp);
ret = if_unset_flags (ifp, IFF_UP);
if (ret < 0)
{
- vty_outln (vty, "Can't shutdown interface");
+ vty_out (vty, "Can't shutdown interface\n");
return CMD_WARNING;
}
if_refresh (ifp);
ret = if_set_flags (ifp, IFF_UP | IFF_RUNNING);
if (ret < 0)
{
- vty_outln (vty, "Can't up interface");
+ vty_out (vty, "Can't up interface\n");
return CMD_WARNING;
}
if_refresh (ifp);
/* bandwidth range is <1-100000> */
if (bandwidth < 1 || bandwidth > 100000)
{
- vty_outln (vty, "Bandwidth is invalid");
+ vty_out (vty, "Bandwidth is invalid\n");
return CMD_WARNING;
}
if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
{
- vty_outln (vty, "link_params_maxbw: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "link_params_maxbw: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
|| (bw <= iflp->res_bw)
|| (bw <= iflp->use_bw))
{
- vty_outln (vty,
- "Maximum Bandwidth could not be lower than others bandwidth");
+ vty_out (vty,
+ "Maximum Bandwidth could not be lower than others bandwidth\n");
return CMD_WARNING;
}
if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
{
- vty_outln (vty, "link_params_max_rsv_bw: fscanf: %s",
+ vty_out (vty, "link_params_max_rsv_bw: fscanf: %s\n",
safe_strerror(errno));
return CMD_WARNING;
}
/* Check that bandwidth is not greater than maximum bandwidth parameter */
if (bw > iflp->max_bw)
{
- vty_outln (vty,
- "Maximum Reservable Bandwidth could not be greater than Maximum Bandwidth (%g)",
+ vty_out (vty,
+ "Maximum Reservable Bandwidth could not be greater than Maximum Bandwidth (%g)\n",
iflp->max_bw);
return CMD_WARNING;
}
/* We don't have to consider about range check here. */
if (sscanf (argv[idx_number]->arg, "%d", &priority) != 1)
{
- vty_outln (vty, "link_params_unrsv_bw: fscanf: %s",
+ vty_out (vty, "link_params_unrsv_bw: fscanf: %s\n",
safe_strerror(errno));
return CMD_WARNING;
}
if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
{
- vty_outln (vty, "link_params_unrsv_bw: fscanf: %s",
+ vty_out (vty, "link_params_unrsv_bw: fscanf: %s\n",
safe_strerror(errno));
return CMD_WARNING;
}
/* Check that bandwidth is not greater than maximum bandwidth parameter */
if (bw > iflp->max_bw)
{
- vty_outln (vty,
- "UnReserved Bandwidth could not be greater than Maximum Bandwidth (%g)",
+ vty_out (vty,
+ "UnReserved Bandwidth could not be greater than Maximum Bandwidth (%g)\n",
iflp->max_bw);
return CMD_WARNING;
}
if (sscanf (argv[idx_bitpattern]->arg, "0x%lx", &value) != 1)
{
- vty_outln (vty, "link_params_admin_grp: fscanf: %s",
+ vty_out (vty, "link_params_admin_grp: fscanf: %s\n",
safe_strerror(errno));
return CMD_WARNING;
}
if (!inet_aton (argv[idx_ipv4]->arg, &addr))
{
- vty_outln (vty, "Please specify Router-Addr by A.B.C.D");
+ vty_out (vty, "Please specify Router-Addr by A.B.C.D\n");
return CMD_WARNING;
}
if (IS_PARAM_SET(iflp, LP_MM_DELAY)
&& (delay <= iflp->min_delay || delay >= iflp->max_delay))
{
- vty_outln (vty, "Average delay should be comprise between Min (%d) and Max (%d) delay",
+ vty_out (vty, "Average delay should be comprise between Min (%d) and Max (%d) delay\n",
iflp->min_delay, iflp->max_delay);
return CMD_WARNING;
}
/* Check new delays value coherency */
if (delay <= low || delay >= high)
{
- vty_outln (vty, "Average delay should be comprise between Min (%d) and Max (%d) delay",
+ vty_out (vty, "Average delay should be comprise between Min (%d) and Max (%d) delay\n",
low, high);
return CMD_WARNING;
}
if (sscanf (argv[idx_percentage]->arg, "%g", &fval) != 1)
{
- vty_outln (vty, "link_params_pkt_loss: fscanf: %s",
+ vty_out (vty, "link_params_pkt_loss: fscanf: %s\n",
safe_strerror(errno));
return CMD_WARNING;
}
if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
{
- vty_outln (vty, "link_params_res_bw: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "link_params_res_bw: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
/* Check that bandwidth is not greater than maximum bandwidth parameter */
if (bw > iflp->max_bw)
{
- vty_outln (vty,
- "Residual Bandwidth could not be greater than Maximum Bandwidth (%g)",
+ vty_out (vty,
+ "Residual Bandwidth could not be greater than Maximum Bandwidth (%g)\n",
iflp->max_bw);
return CMD_WARNING;
}
if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
{
- vty_outln (vty, "link_params_ava_bw: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "link_params_ava_bw: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
/* Check that bandwidth is not greater than maximum bandwidth parameter */
if (bw > iflp->max_bw)
{
- vty_outln (vty,
- "Available Bandwidth could not be greater than Maximum Bandwidth (%g)",
+ vty_out (vty,
+ "Available Bandwidth could not be greater than Maximum Bandwidth (%g)\n",
iflp->max_bw);
return CMD_WARNING;
}
if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
{
- vty_outln (vty, "link_params_use_bw: fscanf: %s",safe_strerror(errno));
+ vty_out (vty, "link_params_use_bw: fscanf: %s\n",safe_strerror(errno));
return CMD_WARNING;
}
/* Check that bandwidth is not greater than maximum bandwidth parameter */
if (bw > iflp->max_bw)
{
- vty_outln (vty,
- "Utilised Bandwidth could not be greater than Maximum Bandwidth (%g)",
+ vty_out (vty,
+ "Utilised Bandwidth could not be greater than Maximum Bandwidth (%g)\n",
iflp->max_bw);
return CMD_WARNING;
}
ret = str2prefix_ipv4 (addr_str, &cp);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address ");
+ vty_out (vty, "%% Malformed address \n");
return CMD_WARNING;
}
if (ipv4_martian(&cp.prefix))
{
- vty_outln (vty, "%% Invalid address");
+ vty_out (vty, "%% Invalid address\n");
return CMD_WARNING;
}
ret = if_set_prefix (ifp, ifc);
if (ret < 0)
{
- vty_outln (vty, "%% Can't set interface IP address: %s.",
+ vty_out (vty, "%% Can't set interface IP address: %s.\n",
safe_strerror(errno));
return CMD_WARNING;
}
ret = str2prefix_ipv4 (addr_str, &cp);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address ");
+ vty_out (vty, "%% Malformed address \n");
return CMD_WARNING;
}
ifc = connected_check (ifp, (struct prefix *) &cp);
if (! ifc)
{
- vty_outln (vty, "%% Can't find address");
+ vty_out (vty, "%% Can't find address\n");
return CMD_WARNING;
}
ret = if_unset_prefix (ifp, ifc);
if (ret < 0)
{
- vty_outln (vty, "%% Can't unset interface IP address: %s.",
+ vty_out (vty, "%% Can't unset interface IP address: %s.\n",
safe_strerror(errno));
return CMD_WARNING;
}
ret = str2prefix_ipv6 (addr_str, &cp);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address ");
+ vty_out (vty, "%% Malformed address \n");
return CMD_WARNING;
}
if (ipv6_martian(&cp.prefix))
{
- vty_outln (vty, "%% Invalid address");
+ vty_out (vty, "%% Invalid address\n");
return CMD_WARNING;
}
if (ret < 0)
{
- vty_outln (vty, "%% Can't set interface IP address: %s.",
+ vty_out (vty, "%% Can't set interface IP address: %s.\n",
safe_strerror(errno));
return CMD_WARNING;
}
ret = str2prefix_ipv6 (addr_str, &cp);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address ");
+ vty_out (vty, "%% Malformed address \n");
return CMD_WARNING;
}
ifc = connected_check (ifp, (struct prefix *) &cp);
if (! ifc)
{
- vty_outln (vty, "%% Can't find address");
+ vty_out (vty, "%% Can't find address\n");
return CMD_WARNING;
}
ret = if_prefix_delete_ipv6 (ifp, ifc);
if (ret < 0)
{
- vty_outln (vty, "%% Can't unset interface IP address: %s.",
+ vty_out (vty, "%% Can't unset interface IP address: %s.\n",
safe_strerror(errno));
return CMD_WARNING;
}
struct if_link_params *iflp = ifp->link_params;
- vty_outln (vty, " link-params");
- vty_outln (vty, " enable");
+ vty_out (vty, " link-params\n");
+ vty_out (vty, " enable\n");
if (IS_PARAM_SET(iflp, LP_TE_METRIC) && iflp->te_metric != ifp->metric)
- vty_outln (vty, " metric %u",iflp->te_metric);
+ vty_out (vty, " metric %u\n",iflp->te_metric);
if (IS_PARAM_SET(iflp, LP_MAX_BW) && iflp->max_bw != iflp->default_bw)
- vty_outln (vty, " max-bw %g", iflp->max_bw);
+ vty_out (vty, " max-bw %g\n", iflp->max_bw);
if (IS_PARAM_SET(iflp, LP_MAX_RSV_BW) && iflp->max_rsv_bw != iflp->default_bw)
- vty_outln (vty, " max-rsv-bw %g", iflp->max_rsv_bw);
+ vty_out (vty, " max-rsv-bw %g\n", iflp->max_rsv_bw);
if (IS_PARAM_SET(iflp, LP_UNRSV_BW))
{
for (i = 0; i < 8; i++)
if (iflp->unrsv_bw[i] != iflp->default_bw)
- vty_outln (vty, " unrsv-bw %d %g",
+ vty_out (vty, " unrsv-bw %d %g\n",
i, iflp->unrsv_bw[i]);
}
if (IS_PARAM_SET(iflp, LP_ADM_GRP))
- vty_outln (vty, " admin-grp 0x%x", iflp->admin_grp);
+ vty_out (vty, " admin-grp 0x%x\n", iflp->admin_grp);
if (IS_PARAM_SET(iflp, LP_DELAY))
{
vty_out(vty, " delay %u", iflp->av_delay);
vty_out (vty, VTYNL);
}
if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
- vty_outln (vty, " delay-variation %u", iflp->delay_var);
+ vty_out (vty, " delay-variation %u\n", iflp->delay_var);
if (IS_PARAM_SET(iflp, LP_PKT_LOSS))
- vty_outln (vty, " packet-loss %g", iflp->pkt_loss);
+ vty_out (vty, " packet-loss %g\n", iflp->pkt_loss);
if (IS_PARAM_SET(iflp, LP_AVA_BW))
- vty_outln (vty, " ava-bw %g", iflp->ava_bw);
+ vty_out (vty, " ava-bw %g\n", iflp->ava_bw);
if (IS_PARAM_SET(iflp, LP_RES_BW))
- vty_outln (vty, " res-bw %g", iflp->res_bw);
+ vty_out (vty, " res-bw %g\n", iflp->res_bw);
if (IS_PARAM_SET(iflp, LP_USE_BW))
- vty_outln (vty, " use-bw %g", iflp->use_bw);
+ vty_out (vty, " use-bw %g\n", iflp->use_bw);
if (IS_PARAM_SET(iflp, LP_RMT_AS))
- vty_outln (vty, " neighbor %s as %u", inet_ntoa(iflp->rmt_ip),
+ vty_out (vty, " neighbor %s as %u\n", inet_ntoa(iflp->rmt_ip),
iflp->rmt_as);
- vty_outln (vty, " exit-link-params");
+ vty_out (vty, " exit-link-params\n");
return 0;
}
vrf = vrf_lookup_by_id (ifp->vrf_id);
if (ifp->vrf_id == VRF_DEFAULT)
- vty_outln (vty, "interface %s", ifp->name);
+ vty_out (vty, "interface %s\n", ifp->name);
else
- vty_outln (vty, "interface %s vrf %s", ifp->name,vrf->name);
+ vty_out (vty, "interface %s vrf %s\n", ifp->name,vrf->name);
if (if_data)
{
if (if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON)
- vty_outln (vty, " shutdown");
+ vty_out (vty, " shutdown\n");
zebra_ptm_if_write(vty, if_data);
}
if (ifp->desc)
- vty_outln (vty, " description %s",ifp->desc);
+ vty_out (vty, " description %s\n",ifp->desc);
/* Assign bandwidth here to avoid unnecessary interface flap
while processing config script */
if (ifp->bandwidth != 0)
- vty_outln (vty, " bandwidth %u", ifp->bandwidth);
+ vty_out (vty, " bandwidth %u\n", ifp->bandwidth);
if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION))
- vty_outln (vty, " no link-detect");
+ vty_out (vty, " no link-detect\n");
for (ALL_LIST_ELEMENTS_RO (ifp->connected, addrnode, ifc))
{
if (if_data)
{
if (if_data->multicast != IF_ZEBRA_MULTICAST_UNSPEC)
- vty_outln (vty, " %smulticast",
+ vty_out (vty, " %smulticast\n",
if_data->multicast == IF_ZEBRA_MULTICAST_ON ? "" : "no ");
}
link_params_config_write (vty, ifp);
- vty_outln (vty, "!");
+ vty_out (vty, "!\n");
}
return 0;
}
if(irdp->flags & IF_ACTIVE || irdp->flags & IF_SHUTDOWN) {
if( irdp->flags & IF_SHUTDOWN)
- vty_outln (vty, " ip irdp shutdown ");
+ vty_out (vty, " ip irdp shutdown \n");
if( irdp->flags & IF_BROADCAST)
- vty_outln (vty, " ip irdp broadcast");
+ vty_out (vty, " ip irdp broadcast\n");
else
- vty_outln (vty, " ip irdp multicast");
+ vty_out (vty, " ip irdp multicast\n");
- vty_outln (vty, " ip irdp preference %ld",
+ vty_out (vty, " ip irdp preference %ld\n",
irdp->Preference);
for (ALL_LIST_ELEMENTS_RO (irdp->AdvPrefList, node, adv))
- vty_outln (vty, " ip irdp address %s preference %d",
+ vty_out (vty, " ip irdp address %s preference %d\n",
inet_2a(adv->ip.s_addr, b1),
adv->pref);
- vty_outln (vty, " ip irdp holdtime %d",
+ vty_out (vty, " ip irdp holdtime %d\n",
irdp->Lifetime);
- vty_outln (vty, " ip irdp minadvertinterval %ld",
+ vty_out (vty, " ip irdp minadvertinterval %ld\n",
irdp->MinAdvertInterval);
- vty_outln (vty, " ip irdp maxadvertinterval %ld",
+ vty_out (vty, " ip irdp maxadvertinterval %ld\n",
irdp->MaxAdvertInterval);
}
if (zvrf->rid_user_assigned.u.prefix4.s_addr)
{
if (zvrf_id (zvrf) == VRF_DEFAULT)
- vty_outln (vty, "router-id %s",
+ vty_out (vty, "router-id %s\n",
inet_ntoa(zvrf->rid_user_assigned.u.prefix4));
else
- vty_outln (vty, "router-id %s vrf %s",
+ vty_out (vty, "router-id %s vrf %s\n",
inet_ntoa (zvrf->rid_user_assigned.u.prefix4),
zvrf_name(zvrf));
}
if (if_is_loopback (ifp) ||
CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK))
{
- vty_outln (vty,
- "Cannot configure IPv6 Router Advertisements on this interface");
+ vty_out (vty,
+ "Cannot configure IPv6 Router Advertisements on this interface\n");
return CMD_WARNING;
}
if (if_is_loopback (ifp) ||
CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK))
{
- vty_outln (vty,
- "Cannot configure IPv6 Router Advertisements on this interface");
+ vty_out (vty,
+ "Cannot configure IPv6 Router Advertisements on this interface\n");
return CMD_WARNING;
}
interval = strtoul(argv[idx_number]->arg, NULL, 10);
if ((zif->rtadv.AdvDefaultLifetime != -1 && interval > (unsigned)zif->rtadv.AdvDefaultLifetime * 1000))
{
- vty_outln (vty,
- "This ra-interval would conflict with configured ra-lifetime!");
+ vty_out (vty,
+ "This ra-interval would conflict with configured ra-lifetime!\n");
return CMD_WARNING;
}
interval = strtoul(argv[idx_number]->arg, NULL, 10);
if ((zif->rtadv.AdvDefaultLifetime != -1 && interval > (unsigned)zif->rtadv.AdvDefaultLifetime))
{
- vty_outln (vty,
- "This ra-interval would conflict with configured ra-lifetime!");
+ vty_out (vty,
+ "This ra-interval would conflict with configured ra-lifetime!\n");
return CMD_WARNING;
}
* MaxRtrAdvInterval and 9000 seconds. -- RFC4861, 6.2.1 */
if ((lifetime != 0 && lifetime * 1000 < zif->rtadv.MaxRtrAdvInterval))
{
- vty_outln (vty,
- "This ra-lifetime would conflict with configured ra-interval");
+ vty_out (vty,
+ "This ra-lifetime would conflict with configured ra-interval\n");
return CMD_WARNING;
}
ret = str2prefix_ipv6 (prefix, &rp.prefix);
if (!ret)
{
- vty_outln (vty, "Malformed IPv6 prefix");
+ vty_out (vty, "Malformed IPv6 prefix\n");
return CMD_WARNING;
}
apply_mask_ipv6 (&rp.prefix); /* RFC4861 4.6.2 */
rp.AdvPreferredLifetime = strmatch (preflifetime, "infinite") ? UINT32_MAX : strtoll (preflifetime, NULL, 10);
if (rp.AdvPreferredLifetime > rp.AdvValidLifetime)
{
- vty_outln (vty, "Invalid preferred lifetime");
+ vty_out (vty, "Invalid preferred lifetime\n");
return CMD_WARNING;
}
}
ret = str2prefix_ipv6 (prefix, &rp.prefix);
if (!ret)
{
- vty_outln (vty, "Malformed IPv6 prefix");
+ vty_out (vty, "Malformed IPv6 prefix\n");
return CMD_WARNING;
}
apply_mask_ipv6 (&rp.prefix); /* RFC4861 4.6.2 */
ret = rtadv_prefix_reset (zebra_if, &rp);
if (!ret)
{
- vty_outln (vty, "Non-existant IPv6 prefix");
+ vty_out (vty, "Non-existant IPv6 prefix\n");
return CMD_WARNING;
}
CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK)))
{
if (zif->rtadv.AdvSendAdvertisements)
- vty_outln (vty, " no ipv6 nd suppress-ra");
+ vty_out (vty, " no ipv6 nd suppress-ra\n");
}
interval = zif->rtadv.MaxRtrAdvInterval;
if (interval % 1000)
- vty_outln (vty, " ipv6 nd ra-interval msec %d",interval);
+ vty_out (vty, " ipv6 nd ra-interval msec %d\n",interval);
else
if (interval != RTADV_MAX_RTR_ADV_INTERVAL)
- vty_outln (vty, " ipv6 nd ra-interval %d",interval / 1000);
+ vty_out (vty, " ipv6 nd ra-interval %d\n",interval / 1000);
if (zif->rtadv.AdvIntervalOption)
- vty_outln (vty, " ipv6 nd adv-interval-option");
+ vty_out (vty, " ipv6 nd adv-interval-option\n");
if (zif->rtadv.AdvDefaultLifetime != -1)
- vty_outln (vty, " ipv6 nd ra-lifetime %d",zif->rtadv.AdvDefaultLifetime);
+ vty_out (vty, " ipv6 nd ra-lifetime %d\n",zif->rtadv.AdvDefaultLifetime);
if (zif->rtadv.HomeAgentPreference)
- vty_outln (vty, " ipv6 nd home-agent-preference %u",
+ vty_out (vty, " ipv6 nd home-agent-preference %u\n",
zif->rtadv.HomeAgentPreference);
if (zif->rtadv.HomeAgentLifetime != -1)
- vty_outln (vty, " ipv6 nd home-agent-lifetime %u",
+ vty_out (vty, " ipv6 nd home-agent-lifetime %u\n",
zif->rtadv.HomeAgentLifetime);
if (zif->rtadv.AdvHomeAgentFlag)
- vty_outln (vty, " ipv6 nd home-agent-config-flag");
+ vty_out (vty, " ipv6 nd home-agent-config-flag\n");
if (zif->rtadv.AdvReachableTime)
- vty_outln (vty, " ipv6 nd reachable-time %d",
+ vty_out (vty, " ipv6 nd reachable-time %d\n",
zif->rtadv.AdvReachableTime);
if (zif->rtadv.AdvManagedFlag)
- vty_outln (vty, " ipv6 nd managed-config-flag");
+ vty_out (vty, " ipv6 nd managed-config-flag\n");
if (zif->rtadv.AdvOtherConfigFlag)
- vty_outln (vty, " ipv6 nd other-config-flag");
+ vty_out (vty, " ipv6 nd other-config-flag\n");
if (zif->rtadv.DefaultPreference != RTADV_PREF_MEDIUM)
- vty_outln (vty, " ipv6 nd router-preference %s",
+ vty_out (vty, " ipv6 nd router-preference %s\n",
rtadv_pref_strs[zif->rtadv.DefaultPreference]);
if (zif->rtadv.AdvLinkMTU)
- vty_outln (vty, " ipv6 nd mtu %d", zif->rtadv.AdvLinkMTU);
+ vty_out (vty, " ipv6 nd mtu %d\n", zif->rtadv.AdvLinkMTU);
for (ALL_LIST_ELEMENTS_RO (zif->rtadv.AdvPrefixList, node, rprefix))
{
*/
#define ZFPM_SHOW_STAT(counter) \
do { \
- vty_outln (vty, "%-40s %10lu %16lu", #counter, total_stats.counter, \
+ vty_out (vty, "%-40s %10lu %16lu\n", #counter, total_stats.counter, \
zfpm_g->last_ivl_stats.counter); \
} while (0)
zfpm_stats_t total_stats;
time_t elapsed;
- vty_outln (vty, "%s%-40s %10s Last %2d secs%s", VTYNL, "Counter",
+ vty_out (vty, "%s%-40s %10s Last %2d secs%s\n", VTYNL, "Counter",
"Total", ZFPM_STATS_IVL_SECS, VTYNL);
/*
elapsed = zfpm_get_elapsed_time (zfpm_g->last_stats_clear_time);
- vty_outln (vty, "%sStats were cleared %lu seconds ago", VTYNL,
+ vty_out (vty, "%sStats were cleared %lu seconds ago\n", VTYNL,
(unsigned long)elapsed);
}
{
if (!zfpm_is_enabled ())
{
- vty_outln (vty, "The FPM module is not enabled...");
+ vty_out (vty, "The FPM module is not enabled...\n");
return;
}
zfpm_g->last_stats_clear_time = monotime(NULL);
- vty_outln (vty, "Cleared FPM stats");
+ vty_out (vty, "Cleared FPM stats\n");
}
/*
if (zfpm_g->fpm_server != FPM_DEFAULT_IP ||
zfpm_g->fpm_port != FPM_DEFAULT_PORT)
- vty_outln (vty,"fpm connection ip %s port %d", inet_ntoa (in),
+ vty_out (vty,"fpm connection ip %s port %d\n", inet_ntoa (in),
zfpm_g->fpm_port);
return 0;
rn = fec->rn;
prefix2str(&rn->p, buf, BUFSIZ);
- vty_outln (vty, "%s", buf);
+ vty_out (vty, "%s\n", buf);
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);
if (!nexthop || !nexthop->nh_label) // unexpected
return;
- vty_outln (vty, " type: %s remote label: %s distance: %d",
+ vty_out (vty, " type: %s remote label: %s distance: %d\n",
nhlfe_type2str(nhlfe->type),
label2str(nexthop->nh_label->label[0], buf, BUFSIZ),
nhlfe->distance);
vty = (struct vty *) ctxt;
- vty_outln (vty, "Local label: %u%s",
+ vty_out (vty, "Local label: %u%s\n",
lsp->ile.in_label,
CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED) ? " (installed)" : "");
write = 1;
prefix2str(&rn->p, buf, BUFSIZ);
- vty_outln (vty, "mpls label bind %s %s", buf,
+ vty_out (vty, "mpls label bind %s %s\n", buf,
label2str(fec->label, lstr, BUFSIZ));
}
}
if (use_json)
{
json = lsp_json(lsp);
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
json_object_object_add(json, label2str(lsp->ile.in_label, buf, BUFSIZ),
lsp_json(lsp));
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
else
{
- vty_outln (vty, " Inbound Outbound");
- vty_outln (vty, " Label Type Nexthop Label");
- vty_outln (vty, "-------- ------- --------------- --------");
+ vty_out (vty, " Inbound Outbound\n");
+ vty_out (vty, " Label Type Nexthop Label\n");
+ vty_out (vty, "-------- ------- --------------- --------\n");
for (ALL_LIST_ELEMENTS_RO(lsp_list, node, lsp))
{
break;
}
- vty_outln (vty, " %8d", nexthop->nh_label->label[0]);
+ vty_out (vty, " %8d\n", nexthop->nh_label->label[0]);
}
}
break;
}
- vty_outln (vty, "mpls lsp %u %s %s",
+ vty_out (vty, "mpls lsp %u %s %s\n",
slsp->ile.in_label, buf, lstr);
}
}
if ((zvrf->mpls_srgb.start_label != MPLS_DEFAULT_MIN_SRGB_LABEL) ||
(zvrf->mpls_srgb.end_label != MPLS_DEFAULT_MAX_SRGB_LABEL))
{
- vty_outln (vty, "mpls label global-block %u %u",
+ vty_out (vty, "mpls label global-block %u %u\n",
zvrf->mpls_srgb.start_label,zvrf->mpls_srgb.end_label);
}
if (!mpls_enabled)
{
- vty_outln (vty,"%% MPLS not turned on in kernel, ignoring command");
+ vty_out (vty,"%% MPLS not turned on in kernel, ignoring command\n");
return CMD_WARNING;
}
zvrf = vrf_info_lookup(VRF_DEFAULT);
if (!zvrf)
{
- vty_outln (vty, "%% Default VRF does not exist");
+ vty_out (vty, "%% Default VRF does not exist\n");
return CMD_WARNING;
}
if (!inlabel_str)
{
- vty_outln (vty, "%% No Label Information");
+ vty_out (vty, "%% No Label Information\n");
return CMD_WARNING;
}
label = atoi(inlabel_str);
if (!IS_MPLS_UNRESERVED_LABEL(label))
{
- vty_outln (vty, "%% Invalid label");
+ vty_out (vty, "%% Invalid label\n");
return CMD_WARNING;
}
{
if (!gate_str)
{
- vty_outln (vty, "%% No Nexthop Information");
+ vty_out (vty, "%% No Nexthop Information\n");
return CMD_WARNING;
}
if (!outlabel_str)
{
- vty_outln (vty, "%% No Outgoing label Information");
+ vty_out (vty, "%% No Outgoing label Information\n");
return CMD_WARNING;
}
}
gtype = NEXTHOP_TYPE_IPV4;
else
{
- vty_outln (vty, "%% Invalid nexthop");
+ vty_out (vty, "%% Invalid nexthop\n");
return CMD_WARNING;
}
}
if (!zebra_mpls_lsp_label_consistent (zvrf, in_label, out_label, gtype,
&gate, 0))
{
- vty_outln (vty,"%% Label value not consistent");
+ vty_out (vty,"%% Label value not consistent\n");
return CMD_WARNING;
}
#endif /* HAVE_CUMULUS */
if (ret)
{
- vty_outln (vty, "%% LSP cannot be %s",
+ vty_out (vty, "%% LSP cannot be %s\n",
add_cmd ? "added" : "deleted");
return CMD_WARNING;
}
zvrf = vrf_info_lookup(VRF_DEFAULT);
if (!zvrf)
{
- vty_outln (vty, "%% Default VRF does not exist");
+ vty_out (vty, "%% Default VRF does not exist\n");
return CMD_WARNING;
}
ret = str2prefix(prefix, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
{
if (!label_str)
{
- vty_outln (vty, "%% No label binding specified");
+ vty_out (vty, "%% No label binding specified\n");
return CMD_WARNING;
}
label = atoi(label_str);
if (!IS_MPLS_UNRESERVED_LABEL(label))
{
- vty_outln (vty, "%% Invalid label");
+ vty_out (vty, "%% Invalid label\n");
return CMD_WARNING;
}
if (zebra_mpls_label_already_bound (zvrf, label))
{
- vty_outln (vty,"%% Label already bound to a FEC");
+ vty_out (vty,"%% Label already bound to a FEC\n");
return CMD_WARNING;
}
}
if (ret)
{
- vty_outln (vty, "%% FEC to label binding cannot be %s",
+ vty_out (vty, "%% FEC to label binding cannot be %s\n",
add_cmd ? "added" : "deleted");
return CMD_WARNING;
}
ret = str2prefix(argv[3]->arg, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
zebra_mpls_print_fec (vty, zvrf, &p);
"MPLS information\n"
"MPLS status\n")
{
- vty_outln (vty, "MPLS support enabled: %s",
+ vty_out (vty, "MPLS support enabled: %s\n",
(mpls_enabled) ? "yes" : "no (mpls kernel extensions not detected)");
return CMD_SUCCESS;
}
zvrf = zebra_vrf_lookup_by_id(VRF_DEFAULT);
if (!zvrf)
{
- vty_outln (vty, "%% Default VRF does not exist");
+ vty_out (vty, "%% Default VRF does not exist\n");
return CMD_WARNING;
}
{
if (!start_label_str || !end_label_str)
{
- vty_outln (vty, "%% Labels not specified");
+ vty_out (vty, "%% Labels not specified\n");
return CMD_WARNING;
}
if (!IS_MPLS_UNRESERVED_LABEL(start_label) ||
!IS_MPLS_UNRESERVED_LABEL(end_label))
{
- vty_outln (vty, "%% Invalid label");
+ vty_out (vty, "%% Invalid label\n");
return CMD_WARNING;
}
if (end_label < start_label)
{
- vty_outln (vty,"%% End label is less than Start label");
+ vty_out (vty,"%% End label is less than Start label\n");
return CMD_WARNING;
}
if (ret)
{
- vty_outln (vty, "%% Global label block could not be %s",
+ vty_out (vty, "%% Global label block could not be %s\n",
add_cmd ? "added" : "deleted");
return CMD_WARNING;
}
zebra_ptm_write (struct vty *vty)
{
if (ptm_cb.ptm_enable)
- vty_outln (vty, "ptm-enable");
+ vty_out (vty, "ptm-enable\n");
return;
}
{
vty_out (vty, " PTM status: ");
if (ifp->ptm_enable) {
- vty_outln (vty, "%s",zebra_ptm_get_status_str(ifp->ptm_status));
+ vty_out (vty, "%s\n",zebra_ptm_get_status_str(ifp->ptm_status));
} else {
- vty_outln (vty, "disabled");
+ vty_out (vty, "disabled\n");
}
}
zebra_ptm_if_write (struct vty *vty, struct zebra_if *zebra_ifp)
{
if (zebra_ifp->ptm_enable == ZEBRA_IF_PTM_ENABLE_OFF)
- vty_outln (vty, " no ptm-enable");
+ vty_out (vty, " no ptm-enable\n");
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% Zebra Can't find rule.");
+ vty_out (vty, "%% Zebra Can't find rule.\n");
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% Zebra Argument is malformed.");
+ vty_out (vty, "%% Zebra Argument is malformed.\n");
return CMD_WARNING;
}
}
switch (ret)
{
case RMAP_RULE_MISSING:
- vty_outln (vty, "%% Zebra Can't find rule.");
+ vty_out (vty, "%% Zebra Can't find rule.\n");
return CMD_WARNING;
case RMAP_COMPILE_ERROR:
- vty_outln (vty, "%% Zebra Argument is malformed.");
+ vty_out (vty, "%% Zebra Argument is malformed.\n");
return CMD_WARNING;
}
}
{
if (inet_pton(AF_INET6, argv[idx_ip]->arg, &src.ipv6) != 1)
{
- vty_outln (vty, "%% not a valid IPv4/v6 address");
+ vty_out (vty, "%% not a valid IPv4/v6 address\n");
return CMD_WARNING;
}
if (!zebra_check_addr(&p))
{
- vty_outln (vty, "%% not a valid source IPv4/v6 address");
+ vty_out (vty, "%% not a valid source IPv4/v6 address\n");
return CMD_WARNING;
}
if (!pif)
{
- vty_outln (vty, "%% not a local address");
+ vty_out (vty, "%% not a local address\n");
return CMD_WARNING;
}
{
int i;
- vty_outln (vty, "Protocol : route-map ");
- vty_outln (vty, "------------------------");
+ vty_out (vty, "Protocol : route-map \n");
+ vty_out (vty, "------------------------\n");
for (i=0;i<ZEBRA_ROUTE_MAX;i++)
{
if (proto_rm[AFI_IP][i])
- vty_outln (vty, "%-10s : %-10s", zebra_route_string(i),
+ vty_out (vty, "%-10s : %-10s\n", zebra_route_string(i),
proto_rm[AFI_IP][i]);
else
- vty_outln (vty, "%-10s : none", zebra_route_string(i));
+ vty_out (vty, "%-10s : none\n", zebra_route_string(i));
}
if (proto_rm[AFI_IP][i])
- vty_outln (vty, "%-10s : %-10s", "any",proto_rm[AFI_IP][i]);
+ vty_out (vty, "%-10s : %-10s\n", "any",proto_rm[AFI_IP][i]);
else
- vty_outln (vty, "%-10s : none", "any");
+ vty_out (vty, "%-10s : none\n", "any");
return CMD_SUCCESS;
}
{
int i;
- vty_outln (vty, "Protocol : route-map ");
- vty_outln (vty, "------------------------");
+ vty_out (vty, "Protocol : route-map \n");
+ vty_out (vty, "------------------------\n");
for (i=0;i<ZEBRA_ROUTE_MAX;i++)
{
if (proto_rm[AFI_IP6][i])
- vty_outln (vty, "%-10s : %-10s", zebra_route_string(i),
+ vty_out (vty, "%-10s : %-10s\n", zebra_route_string(i),
proto_rm[AFI_IP6][i]);
else
- vty_outln (vty, "%-10s : none", zebra_route_string(i));
+ vty_out (vty, "%-10s : none\n", zebra_route_string(i));
}
if (proto_rm[AFI_IP6][i])
- vty_outln (vty, "%-10s : %-10s", "any",proto_rm[AFI_IP6][i]);
+ vty_out (vty, "%-10s : %-10s\n", "any",proto_rm[AFI_IP6][i]);
else
- vty_outln (vty, "%-10s : none", "any");
+ vty_out (vty, "%-10s : none\n", "any");
return CMD_SUCCESS;
}
{
int i;
- vty_outln (vty, "Protocol : route-map ");
- vty_outln (vty, "------------------------");
+ vty_out (vty, "Protocol : route-map \n");
+ vty_out (vty, "------------------------\n");
for (i=0;i<ZEBRA_ROUTE_MAX;i++)
{
if (nht_rm[AFI_IP][i])
- vty_outln (vty, "%-10s : %-10s", zebra_route_string(i),
+ vty_out (vty, "%-10s : %-10s\n", zebra_route_string(i),
nht_rm[AFI_IP][i]);
else
- vty_outln (vty, "%-10s : none", zebra_route_string(i));
+ vty_out (vty, "%-10s : none\n", zebra_route_string(i));
}
if (nht_rm[AFI_IP][i])
- vty_outln (vty, "%-10s : %-10s", "any",nht_rm[AFI_IP][i]);
+ vty_out (vty, "%-10s : %-10s\n", "any",nht_rm[AFI_IP][i]);
else
- vty_outln (vty, "%-10s : none", "any");
+ vty_out (vty, "%-10s : none\n", "any");
return CMD_SUCCESS;
}
{
int i;
- vty_outln (vty, "Protocol : route-map ");
- vty_outln (vty, "------------------------");
+ vty_out (vty, "Protocol : route-map \n");
+ vty_out (vty, "------------------------\n");
for (i=0;i<ZEBRA_ROUTE_MAX;i++)
{
if (nht_rm[AFI_IP6][i])
- vty_outln (vty, "%-10s : %-10s", zebra_route_string(i),
+ vty_out (vty, "%-10s : %-10s\n", zebra_route_string(i),
nht_rm[AFI_IP6][i]);
else
- vty_outln (vty, "%-10s : none", zebra_route_string(i));
+ vty_out (vty, "%-10s : none\n", zebra_route_string(i));
}
if (nht_rm[AFI_IP][i])
- vty_outln (vty, "%-10s : %-10s", "any",nht_rm[AFI_IP6][i]);
+ vty_out (vty, "%-10s : %-10s\n", "any",nht_rm[AFI_IP6][i]);
else
- vty_outln (vty, "%-10s : none", "any");
+ vty_out (vty, "%-10s : none\n", "any");
return CMD_SUCCESS;
}
zebra_route_map_write_delay_timer (struct vty *vty)
{
if (vty && (zebra_rmap_update_timer != ZEBRA_RMAP_DEFAULT_UPDATE_TIMER))
- vty_outln (vty, "zebra route-map delay-timer %d",
+ vty_out (vty, "zebra route-map delay-timer %d\n",
zebra_rmap_update_timer);
return;
}
for (i=0;i<ZEBRA_ROUTE_MAX;i++)
{
if (proto_rm[AFI_IP][i])
- vty_outln (vty, "ip protocol %s route-map %s", zebra_route_string(i),
+ vty_out (vty, "ip protocol %s route-map %s\n", zebra_route_string(i),
proto_rm[AFI_IP][i]);
if (proto_rm[AFI_IP6][i])
- vty_outln (vty, "ipv6 protocol %s route-map %s", zebra_route_string(i),
+ vty_out (vty, "ipv6 protocol %s route-map %s\n", zebra_route_string(i),
proto_rm[AFI_IP6][i]);
if (nht_rm[AFI_IP][i])
- vty_outln (vty, "ip nht %s route-map %s", zebra_route_string(i),
+ vty_out (vty, "ip nht %s route-map %s\n", zebra_route_string(i),
nht_rm[AFI_IP][i]);
if (nht_rm[AFI_IP6][i])
- vty_outln (vty, "ipv6 nht %s route-map %s", zebra_route_string(i),
+ vty_out (vty, "ipv6 nht %s route-map %s\n", zebra_route_string(i),
nht_rm[AFI_IP6][i]);
}
if (proto_rm[AFI_IP][ZEBRA_ROUTE_MAX])
- vty_outln (vty, "ip protocol %s route-map %s", "any",
+ vty_out (vty, "ip protocol %s route-map %s\n", "any",
proto_rm[AFI_IP][ZEBRA_ROUTE_MAX]);
if (proto_rm[AFI_IP6][ZEBRA_ROUTE_MAX])
- vty_outln (vty, "ipv6 protocol %s route-map %s", "any",
+ vty_out (vty, "ipv6 protocol %s route-map %s\n", "any",
proto_rm[AFI_IP6][ZEBRA_ROUTE_MAX]);
if (nht_rm[AFI_IP][ZEBRA_ROUTE_MAX])
- vty_outln (vty, "ip nht %s route-map %s", "any",
+ vty_out (vty, "ip nht %s route-map %s\n", "any",
nht_rm[AFI_IP][ZEBRA_ROUTE_MAX]);
if (nht_rm[AFI_IP6][ZEBRA_ROUTE_MAX])
- vty_outln (vty, "ipv6 nht %s route-map %s", "any",
+ vty_out (vty, "ipv6 nht %s route-map %s\n", "any",
nht_rm[AFI_IP6][ZEBRA_ROUTE_MAX]);
if (zebra_rmap_update_timer != ZEBRA_RMAP_DEFAULT_UPDATE_TIMER)
- vty_outln (vty, "zebra route-map delay-timer %d",
+ vty_out (vty, "zebra route-map delay-timer %d\n",
zebra_rmap_update_timer);
}
zvrf = vrf->info;
if (! zvrf || strcmp (zvrf_name (zvrf), VRF_DEFAULT_NAME))
{
- vty_outln (vty, "vrf %s", zvrf_name(zvrf));
- vty_outln (vty, "!");
+ vty_out (vty, "vrf %s\n", zvrf_name(zvrf));
+ vty_out (vty, "!\n");
}
}
return 0;
ret = str2prefix (dest_str, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
ret = inet_aton (mask_str, &mask);
if (ret == 0)
{
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
p.prefixlen = ip_masklen (mask);
if (!zvrf)
{
- vty_outln (vty, "%% vrf %s is not defined", vrf_id_str);
+ vty_out (vty, "%% vrf %s is not defined\n", vrf_id_str);
return CMD_WARNING;
}
{
if (!mpls_enabled)
{
- vty_outln (vty,
- "%% MPLS not turned on in kernel, ignoring command");
+ vty_out (vty,
+ "%% MPLS not turned on in kernel, ignoring command\n");
return CMD_WARNING;
}
int rc = mpls_str2label (label_str, &snh_label.num_labels,
{
switch (rc) {
case -1:
- vty_outln (vty, "%% Malformed label(s)");
+ vty_out (vty, "%% Malformed label(s)\n");
break;
case -2:
- vty_outln (vty, "%% Cannot use reserved label(s) (%d-%d)",
+ vty_out (vty, "%% Cannot use reserved label(s) (%d-%d)\n",
MPLS_MIN_RESERVED_LABEL,MPLS_MAX_RESERVED_LABEL);
break;
case -3:
- vty_outln (vty, "%% Too many labels. Enter %d or fewer",
+ vty_out (vty, "%% Too many labels. Enter %d or fewer\n",
MPLS_MAX_LABELS);
break;
}
{
if (flag_str)
{
- vty_outln (vty, "%% can not have flag %s with Null0", flag_str);
+ vty_out (vty, "%% can not have flag %s with Null0\n", flag_str);
return CMD_WARNING;
}
if (add_cmd)
SET_FLAG (flag, ZEBRA_FLAG_BLACKHOLE);
break;
default:
- vty_outln (vty, "%% Malformed flag %s ", flag_str);
+ vty_out (vty, "%% Malformed flag %s \n", flag_str);
return CMD_WARNING;
}
}
struct interface *ifp = if_lookup_by_name (gate_str, zvrf_id (zvrf));
if (!ifp)
{
- vty_outln (vty, "%% Unknown interface: %s", gate_str);
+ vty_out (vty, "%% Unknown interface: %s\n", gate_str);
ifindex = IFINDEX_DELETED;
}
else
multicast_mode_ipv4_set (MCAST_MIX_PFXLEN);
else
{
- vty_outln (vty, "Invalid mode specified");
+ vty_out (vty, "Invalid mode specified\n");
return CMD_WARNING;
}
ret = inet_aton (argv[idx_ipv4]->arg, &addr);
if (ret == 0)
{
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
if (re)
vty_show_ip_route_detail (vty, rn, 1);
else
- vty_outln (vty, "%% No match for RPF lookup");
+ vty_out (vty, "%% No match for RPF lookup\n");
return CMD_SUCCESS;
}
if (!(zvrf = zebra_vrf_lookup_by_name (vrf_name)))
{
if (use_json)
- vty_outln (vty, "{}");
+ vty_out (vty, "{}\n");
else
- vty_outln (vty, "vrf %s not defined", vrf_name);
+ vty_out (vty, "vrf %s not defined\n", vrf_name);
return CMD_SUCCESS;
}
if (zvrf_id (zvrf) == VRF_UNKNOWN)
{
if (use_json)
- vty_outln (vty, "{}");
+ vty_out (vty, "{}\n");
else
- vty_outln (vty, "vrf %s inactive", vrf_name);
+ vty_out (vty, "vrf %s inactive\n", vrf_name);
return CMD_SUCCESS;
}
if (! table)
{
if (use_json)
- vty_outln (vty, "{}");
+ vty_out (vty, "{}\n");
return CMD_SUCCESS;
}
vty_out (vty, SHOW_ROUTE_V6_HEADER);
if (zvrf_id (zvrf) != VRF_DEFAULT)
- vty_outln (vty, "%sVRF %s:", VTYNL,
+ vty_out (vty, "%sVRF %s:\n", VTYNL,
zvrf_name(zvrf));
first = 0;
if (use_json)
{
- vty_outln (vty, "%s",
+ vty_out (vty, "%s\n",
json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
if ((zvrf = vrf->info) != NULL)
{
- vty_outln (vty, "%sVRF %s:", VTYNL, zvrf_name(zvrf));
+ vty_out (vty, "%sVRF %s:\n", VTYNL, zvrf_name(zvrf));
zebra_print_rnh_table(zvrf_id (zvrf), AF_INET, vty, RNH_NEXTHOP_TYPE);
}
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
if ((zvrf = vrf->info) != NULL)
{
- vty_outln (vty, "%sVRF %s:", VTYNL, zvrf_name(zvrf));
+ vty_out (vty, "%sVRF %s:\n", VTYNL, zvrf_name(zvrf));
zebra_print_rnh_table(zvrf_id (zvrf), AF_INET6, vty, RNH_NEXTHOP_TYPE);
}
if (type < 0)
{
- vty_outln (vty, "Unknown route type");
+ vty_out (vty, "Unknown route type\n");
return CMD_WARNING;
}
}
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv4 address");
+ vty_out (vty, "%% Malformed IPv4 address\n");
return CMD_WARNING;
}
rn = route_node_match (table, (struct prefix *) &p);
if (! rn)
{
- vty_outln (vty, "%% Network not in table");
+ vty_out (vty, "%% Network not in table\n");
return CMD_WARNING;
}
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv4 address");
+ vty_out (vty, "%% Malformed IPv4 address\n");
return CMD_WARNING;
}
rn = route_node_match (table, (struct prefix *) &p);
if (! rn || rn->p.prefixlen != p.prefixlen)
{
- vty_outln (vty, "%% Network not in table");
+ vty_out (vty, "%% Network not in table\n");
return CMD_WARNING;
}
}
}
- vty_outln (vty, "%-20s %-20s %s (vrf %s)",
+ vty_out (vty, "%-20s %-20s %s (vrf %s)\n",
"Route Source", "Routes", "FIB",
zvrf_name(((rib_table_info_t *)table->info)->zvrf));
{
if (i == ZEBRA_ROUTE_BGP)
{
- vty_outln (vty, "%-20s %-20d %-20d ", "ebgp",
+ vty_out (vty, "%-20s %-20d %-20d \n", "ebgp",
rib_cnt[ZEBRA_ROUTE_BGP],fib_cnt[ZEBRA_ROUTE_BGP]);
- vty_outln (vty, "%-20s %-20d %-20d ", "ibgp",
+ vty_out (vty, "%-20s %-20d %-20d \n", "ibgp",
rib_cnt[ZEBRA_ROUTE_IBGP],fib_cnt[ZEBRA_ROUTE_IBGP]);
}
else
- vty_outln (vty, "%-20s %-20d %-20d ", zebra_route_string(i),
+ vty_out (vty, "%-20s %-20d %-20d \n", zebra_route_string(i),
rib_cnt[i], fib_cnt[i]);
}
}
- vty_outln (vty, "------");
- vty_outln (vty, "%-20s %-20d %-20d ", "Totals", rib_cnt[ZEBRA_ROUTE_TOTAL],
+ 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_outln (vty, "%-20s %-20s %s (vrf %s)",
+ vty_out (vty, "%-20s %-20s %s (vrf %s)\n",
"Route Source", "Prefix Routes", "FIB",
zvrf_name(((rib_table_info_t *)table->info)->zvrf));
{
if (i == ZEBRA_ROUTE_BGP)
{
- vty_outln (vty, "%-20s %-20d %-20d ", "ebgp",
+ vty_out (vty, "%-20s %-20d %-20d \n", "ebgp",
rib_cnt[ZEBRA_ROUTE_BGP] - rib_cnt[ZEBRA_ROUTE_IBGP],
fib_cnt[ZEBRA_ROUTE_BGP] - fib_cnt[ZEBRA_ROUTE_IBGP]);
- vty_outln (vty, "%-20s %-20d %-20d ", "ibgp",
+ vty_out (vty, "%-20s %-20d %-20d \n", "ibgp",
rib_cnt[ZEBRA_ROUTE_IBGP],fib_cnt[ZEBRA_ROUTE_IBGP]);
}
else
- vty_outln (vty, "%-20s %-20d %-20d ", zebra_route_string(i),
+ vty_out (vty, "%-20s %-20d %-20d \n", zebra_route_string(i),
rib_cnt[i], fib_cnt[i]);
}
}
- vty_outln (vty, "------");
- vty_outln (vty, "%-20s %-20d %-20d ", "Totals", rib_cnt[ZEBRA_ROUTE_TOTAL],
+ 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);
}
ret = str2prefix_ipv4 (argv[idx_ipv4]->arg, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv4 address");
+ vty_out (vty, "%% Malformed IPv4 address\n");
return CMD_WARNING;
}
ret = str2prefix_ipv4 (argv[idx_ipv4_prefixlen]->arg, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed IPv4 address");
+ vty_out (vty, "%% Malformed IPv4 address\n");
return CMD_WARNING;
}
ret = str2prefix (dest_str, &p);
if (ret <= 0)
{
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
ret = str2prefix (src_str, &src);
if (ret <= 0 || src.family != AF_INET6)
{
- vty_outln (vty, "%% Malformed source address");
+ vty_out (vty, "%% Malformed source address\n");
return CMD_WARNING;
}
src_p = (struct prefix_ipv6*)&src;
if (!zvrf)
{
- vty_outln (vty, "%% vrf %s is not defined", vrf_id_str);
+ vty_out (vty, "%% vrf %s is not defined\n", vrf_id_str);
return CMD_WARNING;
}
{
if (!mpls_enabled)
{
- vty_outln (vty,
- "%% MPLS not turned on in kernel, ignoring command");
+ vty_out (vty,
+ "%% MPLS not turned on in kernel, ignoring command\n");
return CMD_WARNING;
}
int rc = mpls_str2label (label_str, &snh_label.num_labels,
{
switch (rc) {
case -1:
- vty_outln (vty, "%% Malformed label(s)");
+ vty_out (vty, "%% Malformed label(s)\n");
break;
case -2:
- vty_outln (vty, "%% Cannot use reserved label(s) (%d-%d)",
+ vty_out (vty, "%% Cannot use reserved label(s) (%d-%d)\n",
MPLS_MIN_RESERVED_LABEL,MPLS_MAX_RESERVED_LABEL);
break;
case -3:
- vty_outln (vty, "%% Too many labels. Enter %d or fewer",
+ vty_out (vty, "%% Too many labels. Enter %d or fewer\n",
MPLS_MAX_LABELS);
break;
}
{
if (flag_str)
{
- vty_outln (vty, "%% can not have flag %s with Null0", flag_str);
+ vty_out (vty, "%% can not have flag %s with Null0\n", flag_str);
return CMD_WARNING;
}
if (add_cmd)
SET_FLAG (flag, ZEBRA_FLAG_BLACKHOLE);
break;
default:
- vty_outln (vty, "%% Malformed flag %s ", flag_str);
+ vty_out (vty, "%% Malformed flag %s \n", flag_str);
return CMD_WARNING;
}
}
address. */
if (ret != 1)
{
- vty_outln (vty, "%% Malformed address");
+ vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
type = STATIC_IPV6_GATEWAY_IFINDEX;
ifp = if_lookup_by_name (ifname, zvrf_id (zvrf));
if (!ifp)
{
- vty_outln (vty, "%% Malformed Interface name %s", ifname);
+ vty_out (vty, "%% Malformed Interface name %s\n", ifname);
return CMD_WARNING;
}
ifindex = ifp->ifindex;
ifp = if_lookup_by_name (gate_str, zvrf_id (zvrf));
if (!ifp)
{
- vty_outln (vty, "%% Malformed Interface name %s", gate_str);
+ vty_out (vty, "%% Malformed Interface name %s\n", gate_str);
ifindex = IFINDEX_DELETED;
}
else
if (type < 0)
{
- vty_outln (vty, "Unknown route type");
+ vty_out (vty, "Unknown route type\n");
return CMD_WARNING;
}
}
if (ret <= 0)
{
- vty_outln (vty, "Malformed IPv6 address");
+ vty_out (vty, "Malformed IPv6 address\n");
return CMD_WARNING;
}
rn = route_node_match (table, (struct prefix *) &p);
if (! rn)
{
- vty_outln (vty, "%% Network not in table");
+ vty_out (vty, "%% Network not in table\n");
return CMD_WARNING;
}
if (ret <= 0)
{
- vty_outln (vty, "Malformed IPv6 prefix");
+ vty_out (vty, "Malformed IPv6 prefix\n");
return CMD_WARNING;
}
rn = route_node_match (table, (struct prefix *) &p);
if (! rn || rn->p.prefixlen != p.prefixlen)
{
- vty_outln (vty, "%% Network not in table");
+ vty_out (vty, "%% Network not in table\n");
return CMD_WARNING;
}
ret = str2prefix_ipv6 (argv[idx_ipv6]->arg, &p);
if (ret <= 0)
{
- vty_outln (vty, "Malformed IPv6 address");
+ vty_out (vty, "Malformed IPv6 address\n");
return CMD_WARNING;
}
ret = str2prefix_ipv6 (argv[idx_ipv6_prefixlen]->arg, &p);
if (ret <= 0)
{
- vty_outln (vty, "Malformed IPv6 prefix");
+ vty_out (vty, "Malformed IPv6 prefix\n");
return CMD_WARNING;
}
if (!is_zebra_valid_kernel_table(table_id))
{
- vty_outln (vty, "Invalid routing table ID, %d. Must be in range 1-252",
+ vty_out (vty, "Invalid routing table ID, %d. Must be in range 1-252\n",
table_id);
return CMD_WARNING;
}
if (is_zebra_main_routing_table(table_id))
{
- vty_outln (vty, "Invalid routing table ID, %d. Must be non-default table",
+ vty_out (vty, "Invalid routing table ID, %d. Must be non-default table\n",
table_id);
return CMD_WARNING;
}
if (!is_zebra_valid_kernel_table(table_id))
{
- vty_outln (vty,"Invalid routing table ID. Must be in range 1-252");
+ vty_out (vty,"Invalid routing table ID. Must be in range 1-252\n");
return CMD_WARNING;
}
if (is_zebra_main_routing_table(table_id))
{
- vty_outln (vty, "Invalid routing table ID, %d. Must be non-default table",
+ vty_out (vty, "Invalid routing table ID, %d. Must be non-default table\n",
table_id);
return CMD_WARNING;
}
config_write_protocol (struct vty *vty)
{
if (allow_delete)
- vty_outln (vty, "allow-external-route-update");
+ vty_out (vty, "allow-external-route-update\n");
if (zebra_rnh_ip_default_route)
- vty_outln (vty, "ip nht resolve-via-default");
+ vty_out (vty, "ip nht resolve-via-default\n");
if (zebra_rnh_ipv6_default_route)
- vty_outln (vty, "ipv6 nht resolve-via-default");
+ vty_out (vty, "ipv6 nht resolve-via-default\n");
enum multicast_mode ipv4_multicast_mode = multicast_mode_ipv4_get ();
if (ipv4_multicast_mode != MCAST_NO_CONFIG)
- vty_outln (vty, "ip multicast rpf-lookup-mode %s",
+ vty_out (vty, "ip multicast rpf-lookup-mode %s\n",
ipv4_multicast_mode == MCAST_URIB_ONLY ? "urib-only" : ipv4_multicast_mode == MCAST_MRIB_ONLY ? "mrib-only" : ipv4_multicast_mode == MCAST_MIX_MRIB_FIRST ? "mrib-then-urib" : ipv4_multicast_mode == MCAST_MIX_DISTANCE ? "lower-distance" : "longer-prefix");
zebra_routemap_config_write_protocol(vty);
vty_out (vty, " Instance: %d", client->instance);
vty_out (vty, VTYNL);
- vty_outln (vty, "------------------------ ");
- vty_outln (vty, "FD: %d ", client->sock);
- vty_outln (vty, "Route Table ID: %d ", client->rtm_table);
+ vty_out (vty, "------------------------ \n");
+ vty_out (vty, "FD: %d \n", client->sock);
+ vty_out (vty, "Route Table ID: %d \n", client->rtm_table);
- vty_outln (vty, "Connect Time: %s ",
+ vty_out (vty, "Connect Time: %s \n",
zserv_time_buf(&client->connect_time, cbuf, ZEBRA_TIME_BUF));
if (client->nh_reg_time)
{
- vty_outln (vty, "Nexthop Registry Time: %s ",
+ vty_out (vty, "Nexthop Registry Time: %s \n",
zserv_time_buf(&client->nh_reg_time, nhbuf, ZEBRA_TIME_BUF));
if (client->nh_last_upd_time)
- vty_outln (vty, "Nexthop Last Update Time: %s ",
+ vty_out (vty, "Nexthop Last Update Time: %s \n",
zserv_time_buf(&client->nh_last_upd_time, mbuf, ZEBRA_TIME_BUF));
else
- vty_outln (vty, "No Nexthop Update sent");
+ vty_out (vty, "No Nexthop Update sent\n");
}
else
- vty_outln (vty, "Not registered for Nexthop Updates");
+ vty_out (vty, "Not registered for Nexthop Updates\n");
- vty_outln (vty, "Last Msg Rx Time: %s ",
+ vty_out (vty, "Last Msg Rx Time: %s \n",
zserv_time_buf(&client->last_read_time, rbuf, ZEBRA_TIME_BUF));
- vty_outln (vty, "Last Msg Tx Time: %s ",
+ vty_out (vty, "Last Msg Tx Time: %s \n",
zserv_time_buf(&client->last_write_time, wbuf, ZEBRA_TIME_BUF));
if (client->last_read_time)
- vty_outln (vty, "Last Rcvd Cmd: %s ",
+ vty_out (vty, "Last Rcvd Cmd: %s \n",
zserv_command_string(client->last_read_cmd));
if (client->last_write_time)
- vty_outln (vty, "Last Sent Cmd: %s ",
+ vty_out (vty, "Last Sent Cmd: %s \n",
zserv_command_string(client->last_write_cmd));
vty_out (vty, VTYNL);
- vty_outln (vty, "Type Add Update Del ");
- vty_outln (vty, "================================================== ");
- vty_outln (vty, "IPv4 %-12d%-12d%-12d", client->v4_route_add_cnt,
+ vty_out (vty, "Type Add Update Del \n");
+ vty_out (vty, "================================================== \n");
+ vty_out (vty, "IPv4 %-12d%-12d%-12d\n", client->v4_route_add_cnt,
client->v4_route_upd8_cnt, client->v4_route_del_cnt);
- vty_outln (vty, "IPv6 %-12d%-12d%-12d", client->v6_route_add_cnt,
+ vty_out (vty, "IPv6 %-12d%-12d%-12d\n", client->v6_route_add_cnt,
client->v6_route_upd8_cnt, client->v6_route_del_cnt);
- vty_outln (vty, "Redist:v4 %-12d%-12d%-12d", client->redist_v4_add_cnt, 0,
+ vty_out (vty, "Redist:v4 %-12d%-12d%-12d\n", client->redist_v4_add_cnt, 0,
client->redist_v4_del_cnt);
- vty_outln (vty, "Redist:v6 %-12d%-12d%-12d", client->redist_v6_add_cnt, 0,
+ vty_out (vty, "Redist:v6 %-12d%-12d%-12d\n", client->redist_v6_add_cnt, 0,
client->redist_v6_del_cnt);
- vty_outln (vty, "Connected %-12d%-12d%-12d", client->ifadd_cnt, 0,
+ vty_out (vty, "Connected %-12d%-12d%-12d\n", client->ifadd_cnt, 0,
client->ifdel_cnt);
- vty_outln (vty, "BFD peer %-12d%-12d%-12d", client->bfd_peer_add_cnt,
+ vty_out (vty, "BFD peer %-12d%-12d%-12d\n", client->bfd_peer_add_cnt,
client->bfd_peer_upd8_cnt, client->bfd_peer_del_cnt);
- vty_outln (vty, "Interface Up Notifications: %d",client->ifup_cnt);
- vty_outln (vty, "Interface Down Notifications: %d",client->ifdown_cnt);
+ 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);
return;
char cbuf[ZEBRA_TIME_BUF], rbuf[ZEBRA_TIME_BUF];
char wbuf[ZEBRA_TIME_BUF];
- vty_outln (vty, "%-8s%12s %12s%12s%8d/%-8d%8d/%-8d",
+ vty_out (vty, "%-8s%12s %12s%12s%8d/%-8d%8d/%-8d\n",
zebra_route_string(client->proto),
zserv_time_buf(&client->connect_time, cbuf, ZEBRA_TIME_BUF),
zserv_time_buf(&client->last_read_time, rbuf, ZEBRA_TIME_BUF),
SHOW_STR
"default routing table to use for all clients\n")
{
- vty_outln (vty, "table %d",zebrad.rtm_table_default);
+ vty_out (vty, "table %d\n",zebrad.rtm_table_default);
return CMD_SUCCESS;
}
if (ret == 0)
{
- vty_outln (vty, "Can't turn on IP forwarding");
+ vty_out (vty, "Can't turn on IP forwarding\n");
return CMD_WARNING;
}
if (ret != 0)
{
- vty_outln (vty, "Can't turn off IP forwarding");
+ vty_out (vty, "Can't turn off IP forwarding\n");
return CMD_WARNING;
}
{
struct vrf *vrf;
- vty_outln (vty,
- " Route Route Neighbor LSP LSP");
- vty_outln (vty,
- "VRF Installs Removals Updates Installs Removals");
+ vty_out (vty,
+ " Route Route Neighbor LSP LSP\n");
+ vty_out (vty,
+ "VRF Installs Removals Updates Installs Removals\n");
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
{
struct zebra_vrf *zvrf = vrf->info;
struct listnode *node;
struct zserv *client;
- vty_outln (vty,
- "Name Connect Time Last Read Last Write IPv4 Routes IPv6 Routes ");
- vty_outln (vty,
- "--------------------------------------------------------------------------------");
+ vty_out (vty,
+ "Name Connect Time Last Read Last Write IPv4 Routes IPv6 Routes \n");
+ vty_out (vty,
+ "--------------------------------------------------------------------------------\n");
for (ALL_LIST_ELEMENTS_RO (zebrad.client_list, node, client))
zebra_show_client_brief(vty, client);
- vty_outln (vty, "Routes column shows (added+updated)/deleted");
+ vty_out (vty, "Routes column shows (added+updated)/deleted\n");
return CMD_SUCCESS;
}
config_write_table (struct vty *vty)
{
if (zebrad.rtm_table_default)
- vty_outln (vty, "table %d",zebrad.rtm_table_default);
+ vty_out (vty, "table %d\n",zebrad.rtm_table_default);
return 0;
}
ret = ipforward ();
if (ret == 0)
- vty_outln (vty, "IP forwarding is off");
+ vty_out (vty, "IP forwarding is off\n");
else
- vty_outln (vty, "IP forwarding is on");
+ vty_out (vty, "IP forwarding is on\n");
return CMD_SUCCESS;
}
switch (ret)
{
case -1:
- vty_outln (vty, "ipv6 forwarding is unknown");
+ vty_out (vty, "ipv6 forwarding is unknown\n");
break;
case 0:
- vty_outln (vty, "ipv6 forwarding is %s", "off");
+ vty_out (vty, "ipv6 forwarding is %s\n", "off");
break;
case 1:
- vty_outln (vty, "ipv6 forwarding is %s", "on");
+ vty_out (vty, "ipv6 forwarding is %s\n", "on");
break;
default:
- vty_outln (vty, "ipv6 forwarding is %s", "off");
+ vty_out (vty, "ipv6 forwarding is %s\n", "off");
break;
}
return CMD_SUCCESS;
if (ret == 0)
{
- vty_outln (vty, "Can't turn on IPv6 forwarding");
+ vty_out (vty, "Can't turn on IPv6 forwarding\n");
return CMD_WARNING;
}
if (ret != 0)
{
- vty_outln (vty, "Can't turn off IPv6 forwarding");
+ vty_out (vty, "Can't turn off IPv6 forwarding\n");
return CMD_WARNING;
}
router_id_write (vty);
if (!ipforward ())
- vty_outln (vty, "no ip forwarding");
+ vty_out (vty, "no ip forwarding\n");
if (!ipforward_ipv6 ())
- vty_outln (vty, "no ipv6 forwarding");
- vty_outln (vty, "!");
+ vty_out (vty, "no ipv6 forwarding\n");
+ vty_out (vty, "!\n");
return 0;
}
projects / matthieu / frr.git / commitdiff