bgpd: correct no form commands #18911
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ton31337
reviewed
May 30, 2025
bgpd/bgp_vty.c
Outdated
| @@ -9359,7 +9359,9 @@ DEFUN (no_neighbor_addpath_tx_all_paths, | |||
| if (!peer) | |||
| return CMD_WARNING_CONFIG_FAILED; | |||
|
|
|||
| if (peer->addpath_type[bgp_node_afi(vty)][bgp_node_safi(vty)] != BGP_ADDPATH_ALL) { | |||
| if (peer->addpath_type[bgp_node_afi(vty)][bgp_node_safi(vty) == SAFI_LABELED_UNICAST | |||
There was a problem hiding this comment.
While this is okay functionally, can you please assign a separate variable to avoid these curls?
There was a problem hiding this comment.
Done. thanks for your help.
|
@Mergifyio backport stable/10.3 stable/10.2 stable/10.1 stable/10.0 |
✅ Backports have been created
|
Before: ``` anlan(config-router-af)# neighbor 22::22 addpath-tx-all-paths anlan(config-router-af)# no neighbor 22::22 addpath-tx-all-paths % Peer not currently configured to transmit all paths.anlan(config-router-af)# ``` After: ``` anlan(config-router)# address-family ipv6 labeled-unicast anlan(config-router-af)# neighbor 22::22 addpath-tx-all-paths anlan(config-router-af)# no neighbor 22::22 addpath-tx-all-paths ``` `bgp_addpath_set_peer_type()` changes from `SAFI_LABELED_UNICAST` to `SAFI_UNICAST`, so we need the same change during the early check. Signed-off-by: anlan_cs <anlan_cs@126.com>
This was referenced May 30, 2025
donaldsharp
added a commit
that referenced
this pull request
May 30, 2025
bgpd: correct no form commands (backport #18911)
donaldsharp
added a commit
that referenced
this pull request
May 30, 2025
bgpd: correct no form commands (backport #18911)
donaldsharp
added a commit
that referenced
this pull request
May 30, 2025
bgpd: correct no form commands (backport #18911)
donaldsharp
added a commit
that referenced
this pull request
May 30, 2025
bgpd: correct no form commands (backport #18911)
ton31337
added a commit
to opensourcerouting/frr
that referenced
this pull request
Aug 2, 2025
* bgpd: correct no form commands (backport FRRouting#18911) * bgpd: fix to show exist/non-exist-map in 'show run' properly FRRouting#18853 * redhat: make FRR RPM build to work on RedHat 10 (backport FRRouting#18920) * build: check for libunwind.h, not unwind.h (backport FRRouting#18912) * bgpd: use AS4B format for BGP loc-rib messages. (backport FRRouting#18936) * bgpd: fix for the validity and the presence of prefixes in the BGP VPN table. (backport FRRouting#17370) * bgpd: Force adj-rib-out updates if MRAI is kicked in (backport FRRouting#18959) * zebra: Provide SID value when sending SRv6 SID release notify message (backport FRRouting#18971) * bgpd: Fix crash when fetching statistics for bgp instance (backport FRRouting#19003) * nhrpd: fix crash when accessing invalid memory zone (backport FRRouting#18994) * zebra: Initialize RB tree for router tables (backport FRRouting#19049) * zebra: fix null pointer dereference in zebra_evpn_sync_neigh_del (backport FRRouting#19054) * zebra: fix stale NHG in kernel (backport FRRouting#18899) * bgpd: Fix incorrect stripping of transitive extended communities (backport FRRouting#19065) * lib: Fix no on-match goto NUM command (backport FRRouting#19108) * bgpd: Fix extended community check for IP non-transitive type (backport FRRouting#19097) * bgpd: Fix DEREF_OF_NULL.EX.COND in bgp_updgrp_packet (backport FRRouting#19126) * lib: revert addition of vtysh_flush() call in vty_out() (backport FRRouting#19109) * bgpd: Extract link bandwidth value from extcommunity before using for WCMP (backport FRRouting#19165) * Use ipv4 class E addresses (240.0.0.0/4) as connected routes by default (backport FRRouting#18095) * bfdd: Set bfd.LocalDiag when transitioning to AdminDown (backport FRRouting#18592) * zebra: clean up a json object leak (backport FRRouting#19192) * bgpd: Do not try to reuse freed route-maps (backport FRRouting#19191) * lib: fix routemap crash (backport FRRouting#19127) * bgpd: initialize local variable (backport FRRouting#19233) * ospfd: Use after free cleanup of lsa (backport FRRouting#19224) * vtysh: copy config from file should actually apply (backport FRRouting#19242) * bgpd : Fix compilation error in bgpd module: Update TP_ARGS for bgp (backport FRRouting#19266) * bgpd: Ensure addpath does not withdraw selected route in some situations (backport FRRouting#19210) * lib, zebra: mark singleton nexthops inactive/active on link state changes for wecmp (backport FRRouting#18947) * eigrp: validate hello packets and tlvs better (backport FRRouting#19251) * bgpd: [GR] fixed selectionDeferralTimer to display select_defer_time val FRRouting#19283 Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
ton31337
added a commit
to opensourcerouting/frr
that referenced
this pull request
Aug 2, 2025
* bgpd: correct no form commands (backport FRRouting#18911) * build: check for libunwind.h, not unwind.h (backport FRRouting#18912) * redhat: make FRR RPM build to work on RedHat 10 (backport FRRouting#18920) * bgpd: use AS4B format for BGP loc-rib messages. (backport FRRouting#18936) * bgpd: Force adj-rib-out updates if MRAI is kicked in (backport FRRouting#18959) * zebra: Provide SID value when sending SRv6 SID release notify message (backport FRRouting#18971) * nhrpd: fix crash when accessing invalid memory zone (backport FRRouting#18994) * lib: Fix no on-match goto NUM command (backport FRRouting#19108) * bgpd: Fix DEREF_OF_NULL.EX.COND in bgp_updgrp_packet (backport FRRouting#19126) * bgpd: Extract link bandwidth value from extcommunity before using for WCMP (backport FRRouting#19165) * bfdd: Set bfd.LocalDiag when transitioning to AdminDown (backport FRRouting#18592) * bgpd: Do not try to reuse freed route-maps (backport FRRouting#19191) * lib: fix routemap crash (backport FRRouting#19127) * lib, zebra: mark singleton nexthops inactive/active on link state changes for wecmp (backport FRRouting#18947) * bgpd: [GR] fixed selectionDeferralTimer to display select_defer_time val FRRouting#19284 Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before:
After:
bgp_addpath_set_peer_type()changes fromSAFI_LABELED_UNICASTtoSAFI_UNICAST, so we need the same change during the early check.