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 3f8367598feaa511c1323b0e3886861ddc95987b..8e455d09fbacda59b221f66ffe8302ddd79c455e 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -74,7 +74,7 @@ static const struct message attr_str[] = {
        {BGP_ATTR_AS4_AGGREGATOR, "AS4_AGGREGATOR"},
        {BGP_ATTR_AS_PATHLIMIT, "AS_PATHLIMIT"},
        {BGP_ATTR_ENCAP, "ENCAP"},
-#if ENABLE_BGP_VNC
+#if ENABLE_BGP_VNC_ATTR
        {BGP_ATTR_VNC, "VNC"},
 #endif
        {BGP_ATTR_LARGE_COMMUNITIES, "LARGE_COMMUNITY"},
@@ -2455,7 +2455,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:
@@ -2803,7 +2803,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->extra->vnc_subtlvs;
@@ -3278,7 +3278,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 3cf7d89054e31d6f3cec85fb21374d5ed6b3ba6f..f9951a54e4a58e6222358761df9c1cc79042909a 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -963,7 +963,7 @@ struct bgp_nlri {
 #define BGP_ATTR_AS_PATHLIMIT                   21
 #define BGP_ATTR_ENCAP                          23
 #define BGP_ATTR_LARGE_COMMUNITIES              32
-#if ENABLE_BGP_VNC
+#if ENABLE_BGP_VNC_ATTR
 #define BGP_ATTR_VNC                           255
 #endif