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

bgpd: fix up multipath merge breakage

Browse Source 
the BGP multipath code was developed against a pre-f6f434b Quagga where
bgp_attr_unintern and ecommunity_free took single-star pointers.  They
now take double-star pointers.

  * bgpd/bgp_mpath.c: fix up bgp_attr_unintern & ecommunity_free calls.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2012-04-28 22:37:20 +02:00
parent 27f689793a
commit fac3c2453a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/bgp_mpath.c
View File

@ -230,7 +230,7 @@ bgp_info_mpath_free (struct bgp_info_mpath **mpath)
if (mpath && *mpath) if (mpath && *mpath)
{ {
if ((*mpath)->mp_attr) if ((*mpath)->mp_attr)
bgp_attr_unintern ((*mpath)->mp_attr); bgp_attr_unintern (&(*mpath)->mp_attr);
XFREE (MTYPE_BGP_MPATH_INFO, *mpath); XFREE (MTYPE_BGP_MPATH_INFO, *mpath);
*mpath = NULL; *mpath = NULL;
} }
@ -605,7 +605,7 @@ bgp_info_mpath_aggregate_update (struct bgp_info *new_best,
if (old_best && (old_best != new_best) && if (old_best && (old_best != new_best) &&
(old_attr = bgp_info_mpath_attr (old_best))) (old_attr = bgp_info_mpath_attr (old_best)))
{ {
bgp_attr_unintern (old_attr); bgp_attr_unintern (&old_attr);
bgp_info_mpath_attr_set (old_best, NULL); bgp_info_mpath_attr_set (old_best, NULL);
} }
@ -616,7 +616,7 @@ bgp_info_mpath_aggregate_update (struct bgp_info *new_best,
{ {
if ((new_attr = bgp_info_mpath_attr (new_best))) if ((new_attr = bgp_info_mpath_attr (new_best)))
{ {
bgp_attr_unintern (new_attr); bgp_attr_unintern (&new_attr);
bgp_info_mpath_attr_set (new_best, NULL); bgp_info_mpath_attr_set (new_best, NULL);
SET_FLAG (new_best->flags, BGP_INFO_ATTR_CHANGED); SET_FLAG (new_best->flags, BGP_INFO_ATTR_CHANGED);
} }
@ -692,7 +692,7 @@ bgp_info_mpath_aggregate_update (struct bgp_info *new_best,
{ {
ecommerge = ecommunity_merge (ecomm, ae->ecommunity); ecommerge = ecommunity_merge (ecomm, ae->ecommunity);
ecomm = ecommunity_uniq_sort (ecommerge); ecomm = ecommunity_uniq_sort (ecommerge);
ecommunity_free (ecommerge); ecommunity_free (&ecommerge);
} }
else else
ecomm = ecommunity_dup (ae->ecommunity); ecomm = ecommunity_dup (ae->ecommunity);
@ -728,10 +728,10 @@ bgp_info_mpath_aggregate_update (struct bgp_info *new_best,
if (new_attr != bgp_info_mpath_attr (new_best)) if (new_attr != bgp_info_mpath_attr (new_best))
{ {
if ((old_attr = bgp_info_mpath_attr (new_best))) if ((old_attr = bgp_info_mpath_attr (new_best)))
bgp_attr_unintern (old_attr); bgp_attr_unintern (&old_attr);
bgp_info_mpath_attr_set (new_best, new_attr); bgp_info_mpath_attr_set (new_best, new_attr);
SET_FLAG (new_best->flags, BGP_INFO_ATTR_CHANGED); SET_FLAG (new_best->flags, BGP_INFO_ATTR_CHANGED);
} }
else else
bgp_attr_unintern (new_attr); bgp_attr_unintern (&new_attr);
} }