bgpd: don't use BGP_ATTR_VNC(255) unless ENABLE_BGP_VNC_ATTR is defined

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

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 206d91bfe9115a4cb8a363d2fb22dd67d2b1e813..147096b4ed4e5fd5391d0073b2696d596aaebdf1 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -76,7 +76,7 @@ static const struct message attr_str[] = {
        {BGP_ATTR_AS_PATHLIMIT, "AS_PATHLIMIT"},
        {BGP_ATTR_PMSI_TUNNEL, "PMSI_TUNNEL_ATTRIBUTE"},
        {BGP_ATTR_ENCAP, "ENCAP"},
-#if ENABLE_BGP_VNC
+#if ENABLE_BGP_VNC_ATTR
        {BGP_ATTR_VNC, "VNC"},
 #endif
        {BGP_ATTR_LARGE_COMMUNITIES, "LARGE_COMMUNITY"},
@@ -2434,7 +2434,7 @@ bgp_attr_parse_ret_t bgp_attr_parse(struct peer *peer, struct attr *attr,
                case BGP_ATTR_EXT_COMMUNITIES:
                        ret = bgp_attr_ext_communities(&attr_args);
                        break;
-#if ENABLE_BGP_VNC
+#if ENABLE_BGP_VNC_ATTR
                case BGP_ATTR_VNC:
 #endif
                case BGP_ATTR_ENCAP:
@@ -2767,7 +2767,7 @@ static void bgp_packet_mpattr_tea(struct bgp *bgp, struct peer *peer,
                attrhdrlen = 1 + 1;   /* subTLV T + L */
                break;
 
-#if ENABLE_BGP_VNC
+#if ENABLE_BGP_VNC_ATTR
        case BGP_ATTR_VNC:
                attrname = "VNC";
                subtlvs = attr->vnc_subtlvs;
@@ -3246,7 +3246,7 @@ bgp_size_t bgp_packet_attribute(struct bgp *bgp, struct peer *peer,
                /* Tunnel Encap attribute */
                bgp_packet_mpattr_tea(bgp, peer, s, attr, BGP_ATTR_ENCAP);
 
-#if ENABLE_BGP_VNC
+#if ENABLE_BGP_VNC_ATTR
                /* VNC attribute */
                bgp_packet_mpattr_tea(bgp, peer, s, attr, BGP_ATTR_VNC);
 #endif

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index c4ac4b0adb05d8e5f0c1cf15b899cc5f38c071d7..5b9272379a9144ea5ac117a54dcb251314880834 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -1077,7 +1077,7 @@ struct bgp_nlri {
 #define BGP_ATTR_ENCAP                          23
 #define BGP_ATTR_LARGE_COMMUNITIES              32
 #define BGP_ATTR_PREFIX_SID                     40
-#if ENABLE_BGP_VNC
+#if ENABLE_BGP_VNC_ATTR
 #define BGP_ATTR_VNC                           255
 #endif