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

staticd: fix processing nht updates

Browse Source 
When processing an NHT update, we should go though all `static_vrf`
structures instead of regualar `vrf`, because some of `static_vrf` may
not have corresponding `vrf` and will miss the update.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2024-02-03 21:34:18 +02:00
parent 273356eac5
commit 6da3e78ce5
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
staticd/static_nht.c
View File

@ -18,8 +18,7 @@
#include "static_nht.h" #include "static_nht.h"
static void static_nht_update_path(struct static_path *pn, struct prefix *nhp, static void static_nht_update_path(struct static_path *pn, struct prefix *nhp,
uint32_t nh_num, vrf_id_t nh_vrf_id, uint32_t nh_num, vrf_id_t nh_vrf_id)
struct vrf *vrf)
{ {
struct static_nexthop *nh; struct static_nexthop *nh;
@ -49,18 +48,13 @@ static void static_nht_update_path(struct static_path *pn, struct prefix *nhp,
static void static_nht_update_safi(struct prefix *sp, struct prefix *nhp, static void static_nht_update_safi(struct prefix *sp, struct prefix *nhp,
uint32_t nh_num, afi_t afi, safi_t safi, uint32_t nh_num, afi_t afi, safi_t safi,
struct vrf *vrf, vrf_id_t nh_vrf_id) struct static_vrf *svrf, vrf_id_t nh_vrf_id)
{ {
struct route_table *stable; struct route_table *stable;
struct static_vrf *svrf;
struct route_node *rn; struct route_node *rn;
struct static_path *pn; struct static_path *pn;
struct static_route_info *si; struct static_route_info *si;
svrf = vrf->info;
if (!svrf)
return;
stable = static_vrf_static_table(afi, safi, svrf); stable = static_vrf_static_table(afi, safi, svrf);
if (!stable) if (!stable)
return; return;
@ -71,7 +65,7 @@ static void static_nht_update_safi(struct prefix *sp, struct prefix *nhp,
si = static_route_info_from_rnode(rn); si = static_route_info_from_rnode(rn);
frr_each(static_path_list, &si->path_list, pn) { frr_each(static_path_list, &si->path_list, pn) {
static_nht_update_path(pn, nhp, nh_num, static_nht_update_path(pn, nhp, nh_num,
nh_vrf_id, vrf); nh_vrf_id);
} }
route_unlock_node(rn); route_unlock_node(rn);
} }
@ -83,7 +77,7 @@ static void static_nht_update_safi(struct prefix *sp, struct prefix *nhp,
if (!si) if (!si)
continue; continue;
frr_each(static_path_list, &si->path_list, pn) { frr_each(static_path_list, &si->path_list, pn) {
static_nht_update_path(pn, nhp, nh_num, nh_vrf_id, vrf); static_nht_update_path(pn, nhp, nh_num, nh_vrf_id);
} }
} }
} }
@ -91,29 +85,23 @@ static void static_nht_update_safi(struct prefix *sp, struct prefix *nhp,
void static_nht_update(struct prefix *sp, struct prefix *nhp, uint32_t nh_num, void static_nht_update(struct prefix *sp, struct prefix *nhp, uint32_t nh_num,
afi_t afi, safi_t safi, vrf_id_t nh_vrf_id) afi_t afi, safi_t safi, vrf_id_t nh_vrf_id)
{ {
struct static_vrf *svrf;
struct vrf *vrf; RB_FOREACH (svrf, svrf_name_head, &svrfs)
static_nht_update_safi(sp, nhp, nh_num, afi, safi, svrf,
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
static_nht_update_safi(sp, nhp, nh_num, afi, safi, vrf,
nh_vrf_id); nh_vrf_id);
} }
static void static_nht_reset_start_safi(struct prefix *nhp, afi_t afi, static void static_nht_reset_start_safi(struct prefix *nhp, afi_t afi,
safi_t safi, struct vrf *vrf, safi_t safi, struct static_vrf *svrf,
vrf_id_t nh_vrf_id) vrf_id_t nh_vrf_id)
{ {
struct static_vrf *svrf;
struct route_table *stable; struct route_table *stable;
struct static_nexthop *nh; struct static_nexthop *nh;
struct static_path *pn; struct static_path *pn;
struct route_node *rn; struct route_node *rn;
struct static_route_info *si; struct static_route_info *si;
svrf = vrf->info;
if (!svrf)
return;
stable = static_vrf_static_table(afi, safi, svrf); stable = static_vrf_static_table(afi, safi, svrf);
if (!stable) if (!stable)
return; return;
@ -153,10 +141,10 @@ static void static_nht_reset_start_safi(struct prefix *nhp, afi_t afi,
void static_nht_reset_start(struct prefix *nhp, afi_t afi, safi_t safi, void static_nht_reset_start(struct prefix *nhp, afi_t afi, safi_t safi,
vrf_id_t nh_vrf_id) vrf_id_t nh_vrf_id)
{ {
struct vrf *vrf; struct static_vrf *svrf;
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) RB_FOREACH (svrf, svrf_name_head, &svrfs)
static_nht_reset_start_safi(nhp, afi, safi, vrf, nh_vrf_id); static_nht_reset_start_safi(nhp, afi, safi, svrf, nh_vrf_id);
} }
static void static_nht_mark_state_safi(struct prefix *sp, afi_t afi, static void static_nht_mark_state_safi(struct prefix *sp, afi_t afi,