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

Merge pull request #6471 from volta-networks/fix_zebra_register_rnh_pseudowire

Browse Source 
zebra: Every time zebra receives a ZEBRA_PW_SET, zebra should evaluate nh
This commit is contained in:
Donald Sharp 2020-06-10 19:03:06 -04:00 committed by GitHub
commit 7a3302bb90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zebra/zebra_pw.c
View File

@ -125,9 +125,12 @@ void zebra_pw_change(struct zebra_pw *pw, ifindex_t ifindex, int type, int af,
pw->flags = flags; pw->flags = flags;
pw->data = *data; pw->data = *data;
if (zebra_pw_enabled(pw)) if (zebra_pw_enabled(pw)) {
zebra_register_rnh_pseudowire(pw->vrf_id, pw); bool nht_exists;
else { zebra_register_rnh_pseudowire(pw->vrf_id, pw, &nht_exists);
if (nht_exists)
zebra_pw_update(pw);
} else {
if (pw->protocol == ZEBRA_ROUTE_STATIC) if (pw->protocol == ZEBRA_ROUTE_STATIC)
zebra_deregister_rnh_pseudowire(pw->vrf_id, pw); zebra_deregister_rnh_pseudowire(pw->vrf_id, pw);
zebra_pw_uninstall(pw); zebra_pw_uninstall(pw);

13
zebra/zebra_rnh.c
View File

@ -343,25 +343,32 @@ static void addr2hostprefix(int af, const union g_addr *addr,
} }
} }
void zebra_register_rnh_pseudowire(vrf_id_t vrf_id, struct zebra_pw *pw) void zebra_register_rnh_pseudowire(vrf_id_t vrf_id, struct zebra_pw *pw,
bool *nht_exists)
{ {
struct prefix nh; struct prefix nh;
struct rnh *rnh; struct rnh *rnh;
bool exists; bool exists;
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
*nht_exists = false;
zvrf = vrf_info_lookup(vrf_id); zvrf = vrf_info_lookup(vrf_id);
if (!zvrf) if (!zvrf)
return; return;
addr2hostprefix(pw->af, &pw->nexthop, &nh); addr2hostprefix(pw->af, &pw->nexthop, &nh);
rnh = zebra_add_rnh(&nh, vrf_id, RNH_NEXTHOP_TYPE, &exists); rnh = zebra_add_rnh(&nh, vrf_id, RNH_NEXTHOP_TYPE, &exists);
if (rnh && !listnode_lookup(rnh->zebra_pseudowire_list, pw)) { if (!rnh)
return;
if (!listnode_lookup(rnh->zebra_pseudowire_list, pw)) {
listnode_add(rnh->zebra_pseudowire_list, pw); listnode_add(rnh->zebra_pseudowire_list, pw);
pw->rnh = rnh; pw->rnh = rnh;
zebra_evaluate_rnh(zvrf, family2afi(pw->af), 1, zebra_evaluate_rnh(zvrf, family2afi(pw->af), 1,
RNH_NEXTHOP_TYPE, &nh); RNH_NEXTHOP_TYPE, &nh);
} } else
*nht_exists = true;
} }
void zebra_deregister_rnh_pseudowire(vrf_id_t vrf_id, struct zebra_pw *pw) void zebra_deregister_rnh_pseudowire(vrf_id_t vrf_id, struct zebra_pw *pw)

2
zebra/zebra_rnh.h
View File

@ -50,7 +50,7 @@ extern struct rnh *zebra_lookup_rnh(struct prefix *p, vrf_id_t vrfid,
extern void zebra_free_rnh(struct rnh *rnh); extern void zebra_free_rnh(struct rnh *rnh);
extern void zebra_add_rnh_client(struct rnh *rnh, struct zserv *client, extern void zebra_add_rnh_client(struct rnh *rnh, struct zserv *client,
enum rnh_type type, vrf_id_t vrfid); enum rnh_type type, vrf_id_t vrfid);
extern void zebra_register_rnh_pseudowire(vrf_id_t, struct zebra_pw *); extern void zebra_register_rnh_pseudowire(vrf_id_t, struct zebra_pw *, bool *);
extern void zebra_deregister_rnh_pseudowire(vrf_id_t, struct zebra_pw *); extern void zebra_deregister_rnh_pseudowire(vrf_id_t, struct zebra_pw *);
extern void zebra_remove_rnh_client(struct rnh *rnh, struct zserv *client, extern void zebra_remove_rnh_client(struct rnh *rnh, struct zserv *client,
enum rnh_type type); enum rnh_type type);