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

Merge pull request #5165 from donaldsharp/evpn_fixup

Browse Source 
bgpd: return created bgp_path_info
This commit is contained in:
Sri Mohana Singamsetty 2019-10-17 10:15:01 -07:00 committed by GitHub
commit 03e484aafa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/bgp_evpn.c
View File

@ -2394,8 +2394,9 @@ static int handle_tunnel_ip_change(struct bgp *bgp, struct bgpevpn *vpn,
return 0; return 0;
} }
static void bgp_create_evpn_bgp_path_info(struct bgp_path_info *parent_pi, static struct bgp_path_info *
struct bgp_node *rn) bgp_create_evpn_bgp_path_info(struct bgp_path_info *parent_pi,
struct bgp_node *rn)
{ {
struct attr *attr_new; struct attr *attr_new;
struct bgp_path_info *pi; struct bgp_path_info *pi;
@ -2416,6 +2417,8 @@ static void bgp_create_evpn_bgp_path_info(struct bgp_path_info *parent_pi,
pi->extra->num_labels = parent_pi->extra->num_labels; pi->extra->num_labels = parent_pi->extra->num_labels;
} }
bgp_path_info_add(rn, pi); bgp_path_info_add(rn, pi);
return pi;
} }
/* Install EVPN route entry in ES */ /* Install EVPN route entry in ES */
@ -2542,7 +2545,7 @@ static int install_evpn_route_entry_in_vrf(struct bgp *bgp_vrf,
break; break;
if (!pi) if (!pi)
bgp_create_evpn_bgp_path_info(parent_pi, rn); pi = bgp_create_evpn_bgp_path_info(parent_pi, rn);
else { else {
if (attrhash_cmp(pi->attr, &attr) if (attrhash_cmp(pi->attr, &attr)
&& !CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) { && !CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) {
@ -2606,7 +2609,7 @@ static int install_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
break; break;
if (!pi) if (!pi)
bgp_create_evpn_bgp_path_info(parent_pi, rn); pi = bgp_create_evpn_bgp_path_info(parent_pi, rn);
else { else {
if (attrhash_cmp(pi->attr, parent_pi->attr) if (attrhash_cmp(pi->attr, parent_pi->attr)
&& !CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) { && !CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) {