From: Lou Berger <lberger@labn.net>
Date: Sun, 14 May 2017 15:10:42 +0000 (-0400)
Subject: bgpd: fix v6 encap safi config - more labeled unicast breakage (Issue #473)
X-Git-Tag: reindent-master-before~170^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=20aeb9709ee03c6331265c6e0bc287f0c3628e56;p=mirror%2Ffrr.git

bgpd: fix v6 encap safi config - more labeled unicast breakage (Issue #473)

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 4d983c3876..f2fa8a0643 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -60,16 +60,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 static struct peer_group *
 listen_range_exists (struct bgp *bgp, struct prefix *range, int exact);
-#if 0
-#define INSTALL_CMD_ON_AF_NODES(cmd) \
-  install_element(BGP_IPV4_NODE, cmd); \
-  install_element(BGP_IPV4M_NODE, cmd); \
-  install_element(BGP_IPV4L_NODE, cmd); \
-  install_element(BGP_IPV6_NODE, cmd); \
-  install_element(BGP_IPV6M_NODE, cmd); \
-  install_element(BGP_IPV6L_NODE, cmd); \
-  install_element(BGP_VPNV4_NODE, cmd);
-#endif
+
 static enum node_type
 bgp_node_type (afi_t afi, safi_t safi)
 {
@@ -111,7 +102,7 @@ bgp_node_type (afi_t afi, safi_t safi)
           return BGP_VPNV6_NODE;
           break;
         case SAFI_ENCAP:
-          return BGP_ENCAP_NODE;
+          return BGP_ENCAPV6_NODE;
           break;
         }
       break;