Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bgpd: [10.0] Unset advertised capabilities if capability is disabled #15521

Merged
merged 3 commits into from
Mar 19, 2024
Merged

bgpd: [10.0] Unset advertised capabilities if capability is disabled #15521

merged 3 commits into from
Mar 19, 2024

Conversation

ton31337
Copy link
Member

No description provided.

@ton31337
tests: Check if capabilities can be disabled via dynamic capabilities
5776a60 
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit fd613d1)
@frrbot frrbot bot added bgp tests Topotests, make check, etc labels Mar 11, 2024
@ton31337 ton31337 mentioned this pull request Mar 11, 2024
Closed
@donaldsharp
Copy link
Member

Looks like the backport went south

build	11-Mar-2024 15:35:06	                 from ./lib/ipaddr.h:12,
build	11-Mar-2024 15:35:06	                 from ./lib/prefix.h:16,
build	11-Mar-2024 15:35:06	                 from ./lib/stream.h:14,
build	11-Mar-2024 15:35:06	                 from bgpd/bgp_packet.c:12:
build	11-Mar-2024 15:35:06	bgpd/bgp_packet.c:1500:13: error: ‘struct peer’ has no member named ‘addpath_paths_limit’
build	11-Mar-2024 15:35:06	         peer->addpath_paths_limit[afi][safi]
build	11-Mar-2024 15:35:06	             ^
build	11-Mar-2024 15:35:06	./lib/zlog.h:109:29: note: in definition of macro ‘_zlog_ecref’
build	11-Mar-2024 15:35:06	   zlog_ref(&_xref, (msg), ##__VA_ARGS__);                        \
build	11-Mar-2024 15:35:06	                             ^
build	11-Mar-2024 15:35:06	bgpd/bgp_packet.c:1493:5: note: in expansion of macro ‘zlog_debug’
build	11-Mar-2024 15:35:06	     zlog_debug("%pBP sending CAPABILITY has %s %s for afi/safi: %s/%s, limit: %u",
build	11-Mar-2024 15:35:06	     ^
build	11-Mar-2024 15:35:06	In file included from bgpd/bgp_packet.c:8:0:
build	11-Mar-2024 15:35:06	bgpd/bgp_packet.c:1504:24: error: ‘PEER_CAP_PATHS_LIMIT_ADV’ undeclared (first use in this function)
build	11-Mar-2024 15:35:06	   COND_FLAG(peer->cap, PEER_CAP_PATHS_LIMIT_ADV,
build	11-Mar-2024 15:35:06	                        ^
build	11-Mar-2024 15:35:06	./lib/zebra.h:275:38: note: in definition of macro ‘SET_FLAG’
build	11-Mar-2024 15:35:06	 #define SET_FLAG(V,F)        (V) |= (F)
build	11-Mar-2024 15:35:06	                                      ^
build	11-Mar-2024 15:35:06	bgpd/bgp_packet.c:1504:3: note: in expansion of macro ‘COND_FLAG’
build	11-Mar-2024 15:35:06	   COND_FLAG(peer->cap, PEER_CAP_PATHS_LIMIT_ADV,
build	11-Mar-2024 15:35:06	   ^
build	11-Mar-2024 15:35:06	bgpd/bgp_packet.c:1507:1: error: expected expression before ‘>>’ token
build	11-Mar-2024 15:35:06	 >>>>>>> 77102e853 (bgpd: Unset advertised capabilities if capability is disabled)
build	11-Mar-2024 15:35:06	 ^
build	11-Mar-2024 15:35:06	bgpd/bgp_packet.c:1507:1: warning: floating constant exceeds range of ‘double’ [-Woverflow]
build	11-Mar-2024 15:35:06	bgpd/bgp_packet.c: At top level:```

@ton31337
Copy link
Member Author

yeah, I will fix it, because paths limit capability is not included in 10.0.

ton31337 added 2 commits March 12, 2024 09:47
@ton31337
bgpd: Unset advertised capabilities if capability is disabled
66f0565 
When using dynamic capabilities, do not forget to unset advertised capabilities.

Otherwise, it's kept as advertised.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 77102e8)
@ton31337
bgpd: Allow dynamically disable graceful-restart/long-lived graceful-…
6d31b86 
…restart

If we enter `bgp graceful-restart-disable`, make sure we disable the capabilities.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 7875736)
@ton31337 ton31337 force-pushed the fix/backport_1818186432569d2bc3e4113945ff958c3ac4796b_10.0 branch from 2a660c9 to 6d31b86 Compare March 12, 2024 07:53
@ton31337 ton31337 added this to the 10.0 milestone Mar 18, 2024
riw777
riw777 approved these changes Mar 19, 2024
View reviewed changes
Copy link
Member

@riw777 riw777 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@riw777 riw777 merged commit be0b868 into FRRouting:dev/10.0 Mar 19, 2024
9 checks passed
@ton31337 ton31337 deleted the fix/backport_1818186432569d2bc3e4113945ff958c3ac4796b_10.0 branch March 19, 2024 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@riw777 riw777 riw777 approved these changes

Assignees
No one assigned
Labels
bgp dev/10.0 size/L tests Topotests, make check, etc
Projects
None yet
Milestone
10.0
Development

Successfully merging this pull request may close these issues.
3 participants
@ton31337 @donaldsharp @riw777