Mrib nht wonky #17254
Merged
Mrib nht wonky #17254
Conversation
This file contains 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
|
@Mergifyio backport dev/10.2 |
✅ Backports have been created
|
donaldsharp
force-pushed
the
mrib_nht_wonky
branch
from
4fa8876 to
5a1c2d0
Compare
Jafaral
reviewed
Oct 27, 2024
zebra/zebra_rib.c
Outdated
Comment on lines
1251
to
1260
| struct rib_table_info *info = NULL; | ||
| vrf_id_t vrf_id = VRF_UNKNOWN; | ||
|
|
||
| if (IS_ZEBRA_DEBUG_RIB || IS_ZEBRA_DEBUG_RIB_DETAILED) { | ||
| info = srcdest_rnode_table_info(rn); | ||
| assert(info); | ||
| } | ||
|
|
There was a problem hiding this comment.
I don't think info can be null, but SA isn't smart enough to realize that:
https://ci1.netdef.org/browse/FRR-PULLREQ3-STATICANALYZER-5787
However, to avoid adding a false positive, and since we only care about what safi we have below, I suggest to pull that value here and use it below without using info afterwards.
safi_t safi = -1;
if (IS_ZEBRA_DEBUG_RIB || IS_ZEBRA_DEBUG_RIB_DETAILED) {
struct rib_table_info *info;
info = srcdest_rnode_table_info(rn);
if (info)
safi = info->safi
}
use safi below instead of info->safi
Nothing special here, just allow sharpd to ask to watch nexthops in the mrib. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Trying to figure out what safi we are talking about is fun when it is not put into the debugs. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Currently the mroute code was not allowing the mroute to be sent to the dataplane. This leaves us with a situation where the routes being installed where never being set as installed and additionally nht against the mrib would not work if the route came into existence after the nexthop tracking was asked for. Turns out all the pieces where there to let this work. Modify the code to pass it to the dplane and to send it back up as having worked. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
donaldsharp
force-pushed
the
mrib_nht_wonky
branch
from
5a1c2d0 to
3bff65a
Compare
Jafaral
added a commit
that referenced
this pull request
Oct 30, 2024
Mrib nht wonky (backport #17254)
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.
No description provided.