From 01a2af45624e3713313974b1dd9c62c2d05e928f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 19 May 2015 17:40:36 -0700 Subject: [PATCH] bgpd: bgpd-fix-ipv6-afi-parser-node.patch BGPd: Make ipv6 unicast/multicast address-family work In the absence of this patch, attempting to type "address-family ipv6 unicast" would result in an "Ambiguous command" error and in the case of "address-family ipv6 multicast", the command would silently fail, without the prompt dropping into the address-family mode. The cause is how the parse tree is constructed for ipv6 address family. There was an error in extract.pl.in script and in vtysh.c files which assumed that there was only address family ipv6 command, without unicast or multicast and so the command was failing. --- vtysh/extract.pl.in | 2 +- vtysh/vtysh.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index d323cdb05a..49788363ea 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -45,7 +45,7 @@ $ignore{'"router zebra"'} = "ignore"; $ignore{'"address-family ipv4"'} = "ignore"; $ignore{'"address-family ipv4 (unicast|multicast)"'} = "ignore"; $ignore{'"address-family ipv6"'} = "ignore"; -$ignore{'"address-family ipv6 unicast"'} = "ignore"; +$ignore{'"address-family ipv6 (unicast|multicast)"'} = "ignore"; $ignore{'"address-family vpnv4"'} = "ignore"; $ignore{'"address-family vpnv4 unicast"'} = "ignore"; $ignore{'"address-family ipv4 vrf NAME"'} = "ignore"; diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 89b9b257ee..f6d82972d9 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2382,6 +2382,7 @@ vtysh_init_vty (void) #ifdef HAVE_IPV6 install_element (BGP_NODE, &address_family_ipv6_cmd); install_element (BGP_NODE, &address_family_ipv6_unicast_cmd); + install_element (BGP_NODE, &address_family_ipv6_multicast_cmd); #endif install_element (BGP_VPNV4_NODE, &exit_address_family_cmd); install_element (BGP_IPV4_NODE, &exit_address_family_cmd); -- 2.39.5