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

Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

Browse Source 
zebra: Unlock the route node when sending route notifications
This commit is contained in:
Donatas Abraitis 2023-06-06 08:52:40 +03:00 committed by GitHub
commit 29f6fb04d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebra/rib.h
View File

@ -465,6 +465,13 @@ extern uint8_t route_distance(int type);
extern void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq,
bool rt_delete);
/*
* rib_find_rn_from_ctx
*
* Returns a lock increased route_node for the appropriate
* table and prefix specified by the context. Developer
* should unlock the node when done.
*/
extern struct route_node *
rib_find_rn_from_ctx(const struct zebra_dplane_ctx *ctx);

16
zebra/zapi_msg.c
View File

@ -801,11 +801,17 @@ int zsend_route_notify_owner(const struct route_node *rn,
int zsend_route_notify_owner_ctx(const struct zebra_dplane_ctx *ctx,
enum zapi_route_notify_owner note)
{
return (route_notify_internal(
rib_find_rn_from_ctx(ctx), dplane_ctx_get_type(ctx),
dplane_ctx_get_instance(ctx), dplane_ctx_get_vrf(ctx),
dplane_ctx_get_table(ctx), note, dplane_ctx_get_afi(ctx),
dplane_ctx_get_safi(ctx)));
int result;
struct route_node *rn = rib_find_rn_from_ctx(ctx);
result = route_notify_internal(
rn, dplane_ctx_get_type(ctx), dplane_ctx_get_instance(ctx),
dplane_ctx_get_vrf(ctx), dplane_ctx_get_table(ctx), note,
dplane_ctx_get_afi(ctx), dplane_ctx_get_safi(ctx));
route_unlock_node(rn);
return result;
}
static void zread_route_notify_request(ZAPI_HANDLER_ARGS)