proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 04:54:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3575 from LabNConsulting/working/master/no-bgp-attr-255

Browse Source 
bgpd: don't use BGP_ATTR_VNC(255) unless ENABLE_BGP_VNC_ATTR is defined
This commit is contained in:
Donald Sharp 2019-01-08 07:35:11 -05:00 committed by GitHub
commit fe615b5a9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_attr.c
View File

@ -78,7 +78,7 @@ static const struct message attr_str[] = {
{BGP_ATTR_AS_PATHLIMIT, "AS_PATHLIMIT"}, {BGP_ATTR_AS_PATHLIMIT, "AS_PATHLIMIT"},
{BGP_ATTR_PMSI_TUNNEL, "PMSI_TUNNEL_ATTRIBUTE"}, {BGP_ATTR_PMSI_TUNNEL, "PMSI_TUNNEL_ATTRIBUTE"},
{BGP_ATTR_ENCAP, "ENCAP"}, {BGP_ATTR_ENCAP, "ENCAP"},
#if ENABLE_BGP_VNC #if ENABLE_BGP_VNC_ATTR
{BGP_ATTR_VNC, "VNC"}, {BGP_ATTR_VNC, "VNC"},
#endif #endif
{BGP_ATTR_LARGE_COMMUNITIES, "LARGE_COMMUNITY"}, {BGP_ATTR_LARGE_COMMUNITIES, "LARGE_COMMUNITY"},
@ -2593,7 +2593,7 @@ bgp_attr_parse_ret_t bgp_attr_parse(struct peer *peer, struct attr *attr,
case BGP_ATTR_EXT_COMMUNITIES: case BGP_ATTR_EXT_COMMUNITIES:
ret = bgp_attr_ext_communities(&attr_args); ret = bgp_attr_ext_communities(&attr_args);
break; break;
#if ENABLE_BGP_VNC #if ENABLE_BGP_VNC_ATTR
case BGP_ATTR_VNC: case BGP_ATTR_VNC:
#endif #endif
case BGP_ATTR_ENCAP: case BGP_ATTR_ENCAP:
@ -2946,7 +2946,7 @@ static void bgp_packet_mpattr_tea(struct bgp *bgp, struct peer *peer,
attrhdrlen = 1 + 1; /* subTLV T + L */ attrhdrlen = 1 + 1; /* subTLV T + L */
break; break;
#if ENABLE_BGP_VNC #if ENABLE_BGP_VNC_ATTR
case BGP_ATTR_VNC: case BGP_ATTR_VNC:
attrname = "VNC"; attrname = "VNC";
subtlvs = attr->vnc_subtlvs; subtlvs = attr->vnc_subtlvs;
@ -3433,7 +3433,7 @@ bgp_size_t bgp_packet_attribute(struct bgp *bgp, struct peer *peer,
/* Tunnel Encap attribute */ /* Tunnel Encap attribute */
bgp_packet_mpattr_tea(bgp, peer, s, attr, BGP_ATTR_ENCAP); bgp_packet_mpattr_tea(bgp, peer, s, attr, BGP_ATTR_ENCAP);
#if ENABLE_BGP_VNC #if ENABLE_BGP_VNC_ATTR
/* VNC attribute */ /* VNC attribute */
bgp_packet_mpattr_tea(bgp, peer, s, attr, BGP_ATTR_VNC); bgp_packet_mpattr_tea(bgp, peer, s, attr, BGP_ATTR_VNC);
#endif #endif

2
bgpd/bgpd.h
View File

@ -1280,7 +1280,7 @@ struct bgp_nlri {
#define BGP_ATTR_ENCAP 23 #define BGP_ATTR_ENCAP 23
#define BGP_ATTR_LARGE_COMMUNITIES 32 #define BGP_ATTR_LARGE_COMMUNITIES 32
#define BGP_ATTR_PREFIX_SID 40 #define BGP_ATTR_PREFIX_SID 40
#if ENABLE_BGP_VNC #if ENABLE_BGP_VNC_ATTR
#define BGP_ATTR_VNC 255 #define BGP_ATTR_VNC 255
#endif #endif

2
tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
View File

@ -20,7 +20,7 @@ router bgp 5226
neighbor 2.2.2.2 activate neighbor 2.2.2.2 activate
exit-address-family exit-address-family
! !
rfp holddown-factor 100 rfp holddown-factor 0
! !
vnc defaults vnc defaults
rd auto:vn:123 rd auto:vn:123

2
tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
View File

@ -18,7 +18,7 @@ router bgp 5226
neighbor 2.2.2.2 activate neighbor 2.2.2.2 activate
exit-address-family exit-address-family
! !
rfp holddown-factor 100 rfp holddown-factor 0
! !
vnc defaults vnc defaults
rd auto:vn:123 rd auto:vn:123

2
tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
View File

@ -19,7 +19,7 @@ router bgp 5226
neighbor 2.2.2.2 activate neighbor 2.2.2.2 activate
exit-address-family exit-address-family
! !
rfp holddown-factor 100 rfp holddown-factor 0
! !
vnc defaults vnc defaults
rd auto:vn:123 rd auto:vn:123

2
tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf
View File

@ -20,7 +20,7 @@ router bgp 5226
neighbor 2.2.2.2 activate neighbor 2.2.2.2 activate
exit-address-family exit-address-family
! !
rfp holddown-factor 100 rfp holddown-factor 0
rfp full-table-download off rfp full-table-download off
! !
vnc defaults vnc defaults

2
tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf
View File

@ -18,7 +18,7 @@ router bgp 5226
neighbor 2.2.2.2 activate neighbor 2.2.2.2 activate
exit-address-family exit-address-family
! !
rfp holddown-factor 100 rfp holddown-factor 0
rfp full-table-download off rfp full-table-download off
! !
vnc defaults vnc defaults

2
tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf
View File

@ -19,7 +19,7 @@ router bgp 5226
neighbor 2.2.2.2 activate neighbor 2.2.2.2 activate
exit-address-family exit-address-family
! !
rfp holddown-factor 100 rfp holddown-factor 0
rfp full-table-download off rfp full-table-download off
! !
vnc defaults vnc defaults