proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 04:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Unset advertised capabilities if capability is disabled

Browse Source 
When using dynamic capabilities, do not forget to unset advertised capabilities.

Otherwise, it's kept as advertised.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-03-09 22:17:27 +02:00
parent aa6ceeeb5b
commit 77102e853e
1 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
bgpd/bgp_packet.c
View File

@ -1240,7 +1240,6 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
/* Encode MP_EXT capability. */ /* Encode MP_EXT capability. */
switch (capability_code) { switch (capability_code) {
case CAPABILITY_CODE_SOFT_VERSION: case CAPABILITY_CODE_SOFT_VERSION:
SET_FLAG(peer->cap, PEER_CAP_SOFT_VERSION_ADV);
stream_putc(s, action); stream_putc(s, action);
stream_putc(s, CAPABILITY_CODE_SOFT_VERSION); stream_putc(s, CAPABILITY_CODE_SOFT_VERSION);
cap_len = stream_get_endp(s); cap_len = stream_get_endp(s);
@ -1271,6 +1270,9 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
: "Removing", : "Removing",
capability, iana_afi2str(pkt_afi), capability, iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi)); iana_safi2str(pkt_safi));
COND_FLAG(peer->cap, PEER_CAP_SOFT_VERSION_ADV,
action == CAPABILITY_ACTION_SET);
break; break;
case CAPABILITY_CODE_MP: case CAPABILITY_CODE_MP:
stream_putc(s, action); stream_putc(s, action);
@ -1294,7 +1296,6 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
!CHECK_FLAG(peer->flags, PEER_FLAG_GRACEFUL_RESTART_HELPER)) !CHECK_FLAG(peer->flags, PEER_FLAG_GRACEFUL_RESTART_HELPER))
return; return;
SET_FLAG(peer->cap, PEER_CAP_RESTART_ADV);
stream_putc(s, action); stream_putc(s, action);
stream_putc(s, CAPABILITY_CODE_RESTART); stream_putc(s, CAPABILITY_CODE_RESTART);
cap_len = stream_get_endp(s); cap_len = stream_get_endp(s);
@ -1343,13 +1344,13 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
capability, iana_afi2str(pkt_afi), capability, iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi)); iana_safi2str(pkt_safi));
COND_FLAG(peer->cap, PEER_CAP_RESTART_ADV,
action == CAPABILITY_ACTION_SET);
break; break;
case CAPABILITY_CODE_LLGR: case CAPABILITY_CODE_LLGR:
if (!CHECK_FLAG(peer->cap, PEER_CAP_RESTART_ADV)) if (!CHECK_FLAG(peer->cap, PEER_CAP_RESTART_ADV))
return; return;
SET_FLAG(peer->cap, PEER_CAP_LLGR_ADV);
stream_putc(s, action); stream_putc(s, action);
stream_putc(s, CAPABILITY_CODE_LLGR); stream_putc(s, CAPABILITY_CODE_LLGR);
cap_len = stream_get_endp(s); cap_len = stream_get_endp(s);
@ -1381,10 +1382,11 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
: "Removing", : "Removing",
capability, iana_afi2str(pkt_afi), capability, iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi)); iana_safi2str(pkt_safi));
COND_FLAG(peer->cap, PEER_CAP_LLGR_ADV,
action == CAPABILITY_ACTION_SET);
break; break;
case CAPABILITY_CODE_ADDPATH: case CAPABILITY_CODE_ADDPATH:
SET_FLAG(peer->cap, PEER_CAP_ADDPATH_ADV);
FOREACH_AFI_SAFI (afi, safi) { FOREACH_AFI_SAFI (afi, safi) {
if (peer->afc[afi][safi]) { if (peer->afc[afi][safi]) {
addpath_afi_safi_count++; addpath_afi_safi_count++;
@ -1462,10 +1464,10 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
capability, iana_afi2str(pkt_afi), capability, iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi)); iana_safi2str(pkt_safi));
COND_FLAG(peer->cap, PEER_CAP_ADDPATH_ADV,
action == CAPABILITY_ACTION_SET);
break; break;
case CAPABILITY_CODE_PATHS_LIMIT: case CAPABILITY_CODE_PATHS_LIMIT:
SET_FLAG(peer->cap, PEER_CAP_PATHS_LIMIT_ADV);
FOREACH_AFI_SAFI (afi, safi) { FOREACH_AFI_SAFI (afi, safi) {
if (!peer->afc[afi][safi]) if (!peer->afc[afi][safi])
continue; continue;
@ -1505,6 +1507,8 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
.send); .send);
} }
COND_FLAG(peer->cap, PEER_CAP_PATHS_LIMIT_ADV,
action == CAPABILITY_ACTION_SET);
break; break;
case CAPABILITY_CODE_ORF: case CAPABILITY_CODE_ORF:
/* Convert AFI, SAFI to values for packet. */ /* Convert AFI, SAFI to values for packet. */
@ -1578,43 +1582,42 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
iana_safi2str(pkt_safi)); iana_safi2str(pkt_safi));
break; break;
case CAPABILITY_CODE_FQDN: case CAPABILITY_CODE_FQDN:
if (CHECK_FLAG(peer->flags, PEER_FLAG_CAPABILITY_FQDN) && stream_putc(s, action);
hostname) { stream_putc(s, CAPABILITY_CODE_FQDN);
SET_FLAG(peer->cap, PEER_CAP_HOSTNAME_ADV); cap_len = stream_get_endp(s);
stream_putc(s, action); stream_putc(s, 0); /* Capability Length */
stream_putc(s, CAPABILITY_CODE_FQDN);
cap_len = stream_get_endp(s);
stream_putc(s, 0); /* Capability Length */
len = strlen(hostname); len = strlen(hostname);
if (len > BGP_MAX_HOSTNAME)
len = BGP_MAX_HOSTNAME;
stream_putc(s, len);
stream_put(s, hostname, len);
if (domainname) {
len = strlen(domainname);
if (len > BGP_MAX_HOSTNAME) if (len > BGP_MAX_HOSTNAME)
len = BGP_MAX_HOSTNAME; len = BGP_MAX_HOSTNAME;
stream_putc(s, len); stream_putc(s, len);
stream_put(s, hostname, len); stream_put(s, domainname, len);
} else
stream_putc(s, 0);
if (domainname) { len = stream_get_endp(s) - cap_len - 1;
len = strlen(domainname); stream_putc_at(s, cap_len, len);
if (len > BGP_MAX_HOSTNAME)
len = BGP_MAX_HOSTNAME;
stream_putc(s, len); if (bgp_debug_neighbor_events(peer))
stream_put(s, domainname, len); zlog_debug("%pBP sending CAPABILITY has %s %s for afi/safi: %s/%s",
} else peer,
stream_putc(s, 0); action == CAPABILITY_ACTION_SET
? "Advertising"
: "Removing",
capability, iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi));
len = stream_get_endp(s) - cap_len - 1; COND_FLAG(peer->cap, PEER_CAP_HOSTNAME_ADV,
stream_putc_at(s, cap_len, len); action == CAPABILITY_ACTION_SET);
if (bgp_debug_neighbor_events(peer))
zlog_debug("%pBP sending CAPABILITY has %s %s for afi/safi: %s/%s",
peer,
action == CAPABILITY_ACTION_SET
? "Advertising"
: "Removing",
capability, iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi));
}
break; break;
case CAPABILITY_CODE_REFRESH: case CAPABILITY_CODE_REFRESH:
case CAPABILITY_CODE_AS4: case CAPABILITY_CODE_AS4:
@ -1624,13 +1627,12 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
case CAPABILITY_CODE_EXT_MESSAGE: case CAPABILITY_CODE_EXT_MESSAGE:
break; break;
case CAPABILITY_CODE_ROLE: case CAPABILITY_CODE_ROLE:
if (peer->local_role != ROLE_UNDEFINED) { stream_putc(s, action);
SET_FLAG(peer->cap, PEER_CAP_ROLE_ADV); stream_putc(s, CAPABILITY_CODE_ROLE);
stream_putc(s, action); stream_putc(s, CAPABILITY_CODE_ROLE_LEN);
stream_putc(s, CAPABILITY_CODE_ROLE); stream_putc(s, peer->local_role);
stream_putc(s, CAPABILITY_CODE_ROLE_LEN); COND_FLAG(peer->cap, PEER_CAP_ROLE_ADV,
stream_putc(s, peer->local_role); action == CAPABILITY_ACTION_SET);
}
break; break;
default: default:
break; break;