This is part of the core VPN and Encap SAFI changes.
Signed-off-by: Lou Berger <[email protected]>
Signed-off-by: David Lamparter <[email protected]>
---
bgpd/bgp_vty.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-
bgpd/bgpd.c | 15 +++++--
lib/command.c | 5 ++-
lib/command.h | 1 +
lib/vty.c | 1 +
vtysh/vtysh.c | 42 ++++++++++++++++++-
vtysh/vtysh_config.c | 3 ++
7 files changed, 171 insertions(+), 8 deletions(-)
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 5330a22..20aaec6 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -56,8 +56,15 @@ extern struct in_addr router_id_zebra;
afi_t
bgp_node_afi (struct vty *vty)
{
- if (vty->node == BGP_IPV6_NODE || vty->node == BGP_IPV6M_NODE)
- return AFI_IP6;
+ switch (vty->node)
+ {
+ case BGP_IPV6_NODE:
+ case BGP_IPV6M_NODE:
+ case BGP_VPNV6_NODE:
+ return AFI_IP6;
+ break;
+ }
+
return AFI_IP;
}
@@ -66,6 +73,8 @@ bgp_node_afi (struct vty *vty)
safi_t
bgp_node_safi (struct vty *vty)
{
+ if (vty->node == BGP_VPNV6_NODE)
+ return SAFI_MPLS_VPN;
if (vty->node == BGP_VPNV4_NODE)
return SAFI_MPLS_VPN;
if (vty->node == BGP_IPV4M_NODE || vty->node == BGP_IPV6M_NODE)
@@ -4284,6 +4293,23 @@ ALIAS (address_family_vpnv4,
"Address family\n"
"Address Family Modifier\n")
+DEFUN (address_family_vpnv6,
+ address_family_vpnv6_cmd,
+ "address-family vpnv6",
+ "Enter Address Family command mode\n"
+ "Address family\n")
+{
+ vty->node = BGP_VPNV6_NODE;
+ return CMD_SUCCESS;
+}
+
+ALIAS (address_family_vpnv6,
+ address_family_vpnv6_unicast_cmd,
+ "address-family vpnv6 unicast",
+ "Enter Address Family command mode\n"
+ "Address family\n"
+ "Address Family Modifier\n")
+
DEFUN (exit_address_family,
exit_address_family_cmd,
"exit-address-family",
@@ -4292,6 +4318,7 @@ DEFUN (exit_address_family,
if (vty->node == BGP_IPV4_NODE
|| vty->node == BGP_IPV4M_NODE
|| vty->node == BGP_VPNV4_NODE
+ || vty->node == BGP_VPNV6_NODE
|| vty->node == BGP_IPV6_NODE
|| vty->node == BGP_IPV6M_NODE)
vty->node = BGP_NODE;
@@ -9115,6 +9142,13 @@ static struct cmd_node bgp_vpnv4_node =
1
};
+static struct cmd_node bgp_vpnv6_node =
+{
+ BGP_VPNV6_NODE,
+ "%s(config-router-af-vpnv6)# ",
+ 1
+};
+
static void community_list_vty (void);
void
@@ -9127,6 +9161,7 @@ bgp_vty_init (void)
install_node (&bgp_ipv6_unicast_node, NULL);
install_node (&bgp_ipv6_multicast_node, NULL);
install_node (&bgp_vpnv4_node, NULL);
+ install_node (&bgp_vpnv6_node, NULL);
/* Install default VTY commands to new nodes. */
install_default (BGP_NODE);
@@ -9135,6 +9170,7 @@ bgp_vty_init (void)
install_default (BGP_IPV6_NODE);
install_default (BGP_IPV6M_NODE);
install_default (BGP_VPNV4_NODE);
+ install_default (BGP_VPNV6_NODE);
/* "bgp multiple-instance" commands. */
install_element (CONFIG_NODE, &bgp_multiple_instance_cmd);
@@ -9293,6 +9329,7 @@ bgp_vty_init (void)
install_element (BGP_IPV6_NODE, &neighbor_activate_cmd);
install_element (BGP_IPV6M_NODE, &neighbor_activate_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_activate_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_activate_cmd);
/* "no neighbor activate" commands. */
install_element (BGP_NODE, &no_neighbor_activate_cmd);
@@ -9301,6 +9338,7 @@ bgp_vty_init (void)
install_element (BGP_IPV6_NODE, &no_neighbor_activate_cmd);
install_element (BGP_IPV6M_NODE, &no_neighbor_activate_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_activate_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_activate_cmd);
/* "neighbor peer-group set" commands. */
install_element (BGP_NODE, &neighbor_set_peer_group_cmd);
@@ -9309,6 +9347,7 @@ bgp_vty_init (void)
install_element (BGP_IPV6_NODE, &neighbor_set_peer_group_cmd);
install_element (BGP_IPV6M_NODE, &neighbor_set_peer_group_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_set_peer_group_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_set_peer_group_cmd);
/* "no neighbor peer-group unset" commands. */
install_element (BGP_NODE, &no_neighbor_set_peer_group_cmd);
@@ -9317,6 +9356,7 @@ bgp_vty_init (void)
install_element (BGP_IPV6_NODE, &no_neighbor_set_peer_group_cmd);
install_element (BGP_IPV6M_NODE, &no_neighbor_set_peer_group_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_set_peer_group_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_set_peer_group_cmd);
/* "neighbor softreconfiguration inbound" commands.*/
install_element (BGP_NODE, &neighbor_soft_reconfiguration_cmd);
@@ -9331,6 +9371,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_soft_reconfiguration_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_soft_reconfiguration_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_soft_reconfiguration_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_soft_reconfiguration_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_soft_reconfiguration_cmd);
/* "neighbor attribute-unchanged" commands. */
install_element (BGP_NODE, &neighbor_attr_unchanged_cmd);
@@ -9466,6 +9508,29 @@ bgp_vty_init (void)
install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged9_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged10_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged1_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged2_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged3_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged4_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged5_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged6_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged7_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged8_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged9_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged10_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged1_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged2_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged3_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged4_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged5_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged6_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged7_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged8_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged9_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged10_cmd);
+
/* "nexthop-local unchanged" commands */
install_element (BGP_IPV6_NODE, &neighbor_nexthop_local_unchanged_cmd);
install_element (BGP_IPV6_NODE, &no_neighbor_nexthop_local_unchanged_cmd);
@@ -9488,6 +9553,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_nexthop_self_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_nexthop_self_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_nexthop_self_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_nexthop_self_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_nexthop_self_cmd);
/* "neighbor remove-private-AS" commands. */
install_element (BGP_NODE, &neighbor_remove_private_as_cmd);
@@ -9502,6 +9569,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_remove_private_as_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_remove_private_as_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_remove_private_as_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_remove_private_as_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_remove_private_as_cmd);
/* "neighbor send-community" commands.*/
install_element (BGP_NODE, &neighbor_send_community_cmd);
@@ -9528,6 +9597,10 @@ bgp_vty_init (void)
install_element (BGP_VPNV4_NODE, &neighbor_send_community_type_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_send_community_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_send_community_type_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_send_community_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_send_community_type_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_send_community_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_send_community_type_cmd);
/* "neighbor route-reflector" commands.*/
install_element (BGP_NODE, &neighbor_route_reflector_client_cmd);
@@ -9542,6 +9615,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_route_reflector_client_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_route_reflector_client_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_route_reflector_client_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_route_reflector_client_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_route_reflector_client_cmd);
/* "neighbor route-server" commands.*/
install_element (BGP_NODE, &neighbor_route_server_client_cmd);
@@ -9556,6 +9631,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_route_server_client_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_route_server_client_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_route_server_client_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_route_server_client_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_route_server_client_cmd);
/* "neighbor passive" commands. */
install_element (BGP_NODE, &neighbor_passive_cmd);
@@ -9684,6 +9761,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_distribute_list_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_distribute_list_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_distribute_list_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_distribute_list_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_distribute_list_cmd);
/* "neighbor prefix-list" commands. */
install_element (BGP_NODE, &neighbor_prefix_list_cmd);
@@ -9698,6 +9777,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_prefix_list_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_prefix_list_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_prefix_list_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_prefix_list_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_prefix_list_cmd);
/* "neighbor filter-list" commands. */
install_element (BGP_NODE, &neighbor_filter_list_cmd);
@@ -9712,6 +9793,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_filter_list_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_filter_list_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_filter_list_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_filter_list_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_filter_list_cmd);
/* "neighbor route-map" commands. */
install_element (BGP_NODE, &neighbor_route_map_cmd);
@@ -9726,6 +9809,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_route_map_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_route_map_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_route_map_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_route_map_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_route_map_cmd);
/* "neighbor unsuppress-map" commands. */
install_element (BGP_NODE, &neighbor_unsuppress_map_cmd);
@@ -9740,6 +9825,8 @@ bgp_vty_init (void)
install_element (BGP_IPV6M_NODE, &no_neighbor_unsuppress_map_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_unsuppress_map_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_unsuppress_map_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_unsuppress_map_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_unsuppress_map_cmd);
/* "neighbor maximum-prefix" commands. */
install_element (BGP_NODE, &neighbor_maximum_prefix_cmd);
@@ -9821,6 +9908,20 @@ bgp_vty_init (void)
install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_restart_cmd);
install_element (BGP_VPNV4_NODE,
&no_neighbor_maximum_prefix_threshold_restart_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_threshold_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_warning_cmd);
+ install_element (BGP_VPNV6_NODE,
&neighbor_maximum_prefix_threshold_warning_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_restart_cmd);
+ install_element (BGP_VPNV6_NODE,
&neighbor_maximum_prefix_threshold_restart_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_val_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_warning_cmd);
+ install_element (BGP_VPNV6_NODE,
&no_neighbor_maximum_prefix_threshold_warning_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_restart_cmd);
+ install_element (BGP_VPNV6_NODE,
&no_neighbor_maximum_prefix_threshold_restart_cmd);
+
/* "neighbor allowas-in" */
install_element (BGP_NODE, &neighbor_allowas_in_cmd);
install_element (BGP_NODE, &neighbor_allowas_in_arg_cmd);
@@ -9840,6 +9941,9 @@ bgp_vty_init (void)
install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_cmd);
install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_arg_cmd);
install_element (BGP_VPNV4_NODE, &no_neighbor_allowas_in_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_allowas_in_cmd);
+ install_element (BGP_VPNV6_NODE, &neighbor_allowas_in_arg_cmd);
+ install_element (BGP_VPNV6_NODE, &no_neighbor_allowas_in_cmd);
/* address-family commands. */
install_element (BGP_NODE, &address_family_ipv4_cmd);
@@ -9851,12 +9955,16 @@ bgp_vty_init (void)
install_element (BGP_NODE, &address_family_vpnv4_cmd);
install_element (BGP_NODE, &address_family_vpnv4_unicast_cmd);
+ install_element (BGP_NODE, &address_family_vpnv6_cmd);
+ install_element (BGP_NODE, &address_family_vpnv6_unicast_cmd);
+
/* "exit-address-family" command. */
install_element (BGP_IPV4_NODE, &exit_address_family_cmd);
install_element (BGP_IPV4M_NODE, &exit_address_family_cmd);
install_element (BGP_IPV6_NODE, &exit_address_family_cmd);
install_element (BGP_IPV6M_NODE, &exit_address_family_cmd);
install_element (BGP_VPNV4_NODE, &exit_address_family_cmd);
+ install_element (BGP_VPNV6_NODE, &exit_address_family_cmd);
/* "clear ip bgp commands" */
install_element (ENABLE_NODE, &clear_ip_bgp_all_cmd);
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index c3c0dba..d9c32ce 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -5286,10 +5286,14 @@ bgp_config_write_family_header (struct vty *vty, afi_t
afi, safi_t safi,
}
else if (afi == AFI_IP6)
{
- vty_out (vty, "ipv6");
-
- if (safi == SAFI_MULTICAST)
- vty_out (vty, " multicast");
+ if (safi == SAFI_MPLS_VPN)
+ vty_out (vty, "vpnv6");
+ else
+ {
+ vty_out (vty, "ipv6");
+ if (safi == SAFI_MULTICAST)
+ vty_out (vty, " multicast");
+ }
}
vty_out (vty, "%s", VTY_NEWLINE);
@@ -5531,6 +5535,9 @@ bgp_config_write (struct vty *vty)
/* IPv6 multicast configuration. */
write += bgp_config_write_family (vty, bgp, AFI_IP6, SAFI_MULTICAST);
+ /* IPv6 VPN configuration. */
+ write += bgp_config_write_family (vty, bgp, AFI_IP6, SAFI_MPLS_VPN);
+
write++;
}
return write;
diff --git a/lib/command.c b/lib/command.c
index d4023ab..7526dc7 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2590,6 +2590,7 @@ node_parent ( enum node_type node )
switch (node)
{
case BGP_VPNV4_NODE:
+ case BGP_VPNV6_NODE:
case BGP_IPV4_NODE:
case BGP_IPV4M_NODE:
case BGP_IPV6_NODE:
@@ -2957,9 +2958,10 @@ DEFUN (config_exit,
case VTY_NODE:
vty->node = CONFIG_NODE;
break;
- case BGP_VPNV4_NODE:
case BGP_IPV4_NODE:
case BGP_IPV4M_NODE:
+ case BGP_VPNV4_NODE:
+ case BGP_VPNV6_NODE:
case BGP_IPV6_NODE:
case BGP_IPV6M_NODE:
vty->node = BGP_NODE;
@@ -3000,6 +3002,7 @@ DEFUN (config_end,
case BABEL_NODE:
case BGP_NODE:
case BGP_VPNV4_NODE:
+ case BGP_VPNV6_NODE:
case BGP_IPV4_NODE:
case BGP_IPV4M_NODE:
case BGP_IPV6_NODE:
diff --git a/lib/command.h b/lib/command.h
index afc2e3f..b5c73ab 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -82,6 +82,7 @@ enum node_type
BABEL_NODE, /* Babel protocol mode node. */
BGP_NODE, /* BGP protocol mode which includes BGP4+ */
BGP_VPNV4_NODE, /* BGP MPLS-VPN PE exchange. */
+ BGP_VPNV6_NODE, /* BGP MPLS-VPN PE exchange. */
BGP_IPV4_NODE, /* BGP IPv4 unicast address family. */
BGP_IPV4M_NODE, /* BGP IPv4 multicast address family. */
BGP_IPV6_NODE, /* BGP IPv6 address family */
diff --git a/lib/vty.c b/lib/vty.c
index a9b9720..b01122c 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -738,6 +738,7 @@ vty_end_config (struct vty *vty)
case BABEL_NODE:
case BGP_NODE:
case BGP_VPNV4_NODE:
+ case BGP_VPNV6_NODE:
case BGP_IPV4_NODE:
case BGP_IPV4M_NODE:
case BGP_IPV6_NODE:
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index b55c671..d665050 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -303,7 +303,8 @@ vtysh_execute_func (const char *line, int pager)
* to move into node in the vtysh where it succeeded. */
if (ret == CMD_SUCCESS || ret == CMD_SUCCESS_DAEMON || ret == CMD_WARNING)
{
- if ((saved_node == BGP_VPNV4_NODE || saved_node == BGP_IPV4_NODE
+ if ((saved_node == BGP_VPNV4_NODE || saved_node == BGP_VPNV6_NODE
+ || saved_node == BGP_IPV4_NODE
|| saved_node == BGP_IPV6_NODE || saved_node == BGP_IPV4M_NODE
|| saved_node == BGP_IPV6M_NODE)
&& (tried == 1))
@@ -707,6 +708,12 @@ static struct cmd_node bgp_vpnv4_node =
"%s(config-router-af)# "
};
+static struct cmd_node bgp_vpnv6_node =
+{
+ BGP_VPNV6_NODE,
+ "%s(config-router-af)# "
+};
+
static struct cmd_node bgp_ipv4_node =
{
BGP_IPV4_NODE,
@@ -842,6 +849,29 @@ DEFUNSH (VTYSH_BGPD,
}
DEFUNSH (VTYSH_BGPD,
+ address_family_vpnv6,
+ address_family_vpnv6_cmd,
+ "address-family vpnv6",
+ "Enter Address Family command mode\n"
+ "Address family\n")
+{
+ vty->node = BGP_VPNV6_NODE;
+ return CMD_SUCCESS;
+}
+
+DEFUNSH (VTYSH_BGPD,
+ address_family_vpnv6_unicast,
+ address_family_vpnv6_unicast_cmd,
+ "address-family vpnv6 unicast",
+ "Enter Address Family command mode\n"
+ "Address family\n"
+ "Address Family Modifier\n")
+{
+ vty->node = BGP_VPNV6_NODE;
+ return CMD_SUCCESS;
+}
+
+DEFUNSH (VTYSH_BGPD,
address_family_ipv4_unicast,
address_family_ipv4_unicast_cmd,
"address-family ipv4 unicast",
@@ -1066,6 +1096,7 @@ vtysh_exit (struct vty *vty)
vty->node = CONFIG_NODE;
break;
case BGP_VPNV4_NODE:
+ case BGP_VPNV6_NODE:
case BGP_IPV4_NODE:
case BGP_IPV4M_NODE:
case BGP_IPV6_NODE:
@@ -1104,6 +1135,7 @@ DEFUNSH (VTYSH_BGPD,
if (vty->node == BGP_IPV4_NODE
|| vty->node == BGP_IPV4M_NODE
|| vty->node == BGP_VPNV4_NODE
+ || vty->node == BGP_VPNV6_NODE
|| vty->node == BGP_IPV6_NODE
|| vty->node == BGP_IPV6M_NODE)
vty->node = BGP_NODE;
@@ -2298,6 +2330,7 @@ vtysh_init_vty (void)
install_node (&rmap_node, NULL);
install_node (&zebra_node, NULL);
install_node (&bgp_vpnv4_node, NULL);
+ install_node (&bgp_vpnv6_node, NULL);
install_node (&bgp_ipv4_node, NULL);
install_node (&bgp_ipv4m_node, NULL);
/* #ifdef HAVE_IPV6 */
@@ -2324,6 +2357,7 @@ vtysh_init_vty (void)
vtysh_install_default (RMAP_NODE);
vtysh_install_default (ZEBRA_NODE);
vtysh_install_default (BGP_VPNV4_NODE);
+ vtysh_install_default (BGP_VPNV6_NODE);
vtysh_install_default (BGP_IPV4_NODE);
vtysh_install_default (BGP_IPV4M_NODE);
vtysh_install_default (BGP_IPV6_NODE);
@@ -2360,6 +2394,8 @@ vtysh_init_vty (void)
install_element (BGP_NODE, &vtysh_quit_bgpd_cmd);
install_element (BGP_VPNV4_NODE, &vtysh_exit_bgpd_cmd);
install_element (BGP_VPNV4_NODE, &vtysh_quit_bgpd_cmd);
+ install_element (BGP_VPNV6_NODE, &vtysh_exit_bgpd_cmd);
+ install_element (BGP_VPNV6_NODE, &vtysh_quit_bgpd_cmd);
install_element (BGP_IPV4_NODE, &vtysh_exit_bgpd_cmd);
install_element (BGP_IPV4_NODE, &vtysh_quit_bgpd_cmd);
install_element (BGP_IPV4M_NODE, &vtysh_exit_bgpd_cmd);
@@ -2391,6 +2427,7 @@ vtysh_init_vty (void)
install_element (BGP_IPV4_NODE, &vtysh_end_all_cmd);
install_element (BGP_IPV4M_NODE, &vtysh_end_all_cmd);
install_element (BGP_VPNV4_NODE, &vtysh_end_all_cmd);
+ install_element (BGP_VPNV6_NODE, &vtysh_end_all_cmd);
install_element (BGP_IPV6_NODE, &vtysh_end_all_cmd);
install_element (BGP_IPV6M_NODE, &vtysh_end_all_cmd);
install_element (ISIS_NODE, &vtysh_end_all_cmd);
@@ -2417,6 +2454,8 @@ vtysh_init_vty (void)
install_element (CONFIG_NODE, &router_bgp_view_cmd);
install_element (BGP_NODE, &address_family_vpnv4_cmd);
install_element (BGP_NODE, &address_family_vpnv4_unicast_cmd);
+ install_element (BGP_NODE, &address_family_vpnv6_cmd);
+ install_element (BGP_NODE, &address_family_vpnv6_unicast_cmd);
install_element (BGP_NODE, &address_family_ipv4_unicast_cmd);
install_element (BGP_NODE, &address_family_ipv4_multicast_cmd);
#ifdef HAVE_IPV6
@@ -2424,6 +2463,7 @@ vtysh_init_vty (void)
install_element (BGP_NODE, &address_family_ipv6_unicast_cmd);
#endif
install_element (BGP_VPNV4_NODE, &exit_address_family_cmd);
+ install_element (BGP_VPNV6_NODE, &exit_address_family_cmd);
install_element (BGP_IPV4_NODE, &exit_address_family_cmd);
install_element (BGP_IPV4M_NODE, &exit_address_family_cmd);
install_element (BGP_IPV6_NODE, &exit_address_family_cmd);
diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
index 94dc995..dcbb70f 100644
--- a/vtysh/vtysh_config.c
+++ b/vtysh/vtysh_config.c
@@ -169,6 +169,9 @@ vtysh_config_parse_line (const char *line)
if (strncmp (line, " address-family vpnv4",
strlen (" address-family vpnv4")) == 0)
config = config_get (BGP_VPNV4_NODE, line);
+ else if (strncmp (line, " address-family vpn6",
+ strlen (" address-family vpn6")) == 0)
+ config = config_get (BGP_VPNV6_NODE, line);
else if (strncmp (line, " address-family ipv4 multicast",
strlen (" address-family ipv4 multicast")) == 0)
config = config_get (BGP_IPV4M_NODE, line);
--
2.1.3
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
