bgpd, lib, vtysh: hook up bgp VPNv6 CLI node
Signed-off-by: Lou Berger <lberger@labn.net>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 6f3af9e..304da25 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -57,8 +57,15 @@
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;
}
@@ -67,6 +74,8 @@
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)
@@ -4285,6 +4294,23 @@
"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",
@@ -4293,6 +4319,7 @@
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;
@@ -9116,6 +9143,13 @@
1
};
+static struct cmd_node bgp_vpnv6_node =
+{
+ BGP_VPNV6_NODE,
+ "%s(config-router-af-vpnv6)# ",
+ 1
+};
+
static void community_list_vty (void);
void
@@ -9128,6 +9162,7 @@
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);
@@ -9136,6 +9171,7 @@
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);
@@ -9294,6 +9330,7 @@
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);
@@ -9302,6 +9339,7 @@
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);
@@ -9310,6 +9348,7 @@
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);
@@ -9318,6 +9357,7 @@
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);
@@ -9332,6 +9372,8 @@
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);
@@ -9467,6 +9509,29 @@
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);
@@ -9489,6 +9554,8 @@
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);
@@ -9503,6 +9570,8 @@
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);
@@ -9529,6 +9598,10 @@
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);
@@ -9543,6 +9616,8 @@
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);
@@ -9557,6 +9632,8 @@
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);
@@ -9685,6 +9762,8 @@
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);
@@ -9699,6 +9778,8 @@
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);
@@ -9713,6 +9794,8 @@
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);
@@ -9727,6 +9810,8 @@
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);
@@ -9741,6 +9826,8 @@
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);
@@ -9822,6 +9909,20 @@
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);
@@ -9841,6 +9942,9 @@
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);
@@ -9852,12 +9956,16 @@
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 @@
}
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 @@
/* 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 aee7d06..dbcef5e 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2590,6 +2590,7 @@
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 @@
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 @@
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 @@
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 9f4d8fa..f695b72 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -737,6 +737,7 @@
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 2703bb9..418e5d7 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -280,7 +280,8 @@
* 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))
@@ -684,6 +685,12 @@
"%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,
@@ -819,6 +826,29 @@
}
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",
@@ -1043,6 +1073,7 @@
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:
@@ -1081,6 +1112,7 @@
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;
@@ -2275,6 +2307,7 @@
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 */
@@ -2301,6 +2334,7 @@
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);
@@ -2337,6 +2371,8 @@
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);
@@ -2368,6 +2404,7 @@
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);
@@ -2394,6 +2431,8 @@
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
@@ -2401,6 +2440,7 @@
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 @@
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);