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

Merge pull request #728 from donaldsharp/owner

Browse Source 
bgpd: Remove unset table.owner
This commit is contained in:
Russ White 2017-06-19 21:55:43 -04:00 committed by GitHub
commit 7ee5d889e1
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_route.c
View File

@ -3532,10 +3532,6 @@ bgp_cleanup_table(struct bgp_table *table, safi_t safi)
&& (ri->sub_type == BGP_ROUTE_NORMAL || && (ri->sub_type == BGP_ROUTE_NORMAL ||
ri->sub_type == BGP_ROUTE_AGGREGATE)) ri->sub_type == BGP_ROUTE_AGGREGATE))
{ {
#if ENABLE_BGP_VNC
if (table->owner && table->owner->bgp)
vnc_import_bgp_del_route(table->owner->bgp, &rn->p, ri);
#endif
bgp_zebra_withdraw (&rn->p, ri, safi); bgp_zebra_withdraw (&rn->p, ri, safi);
bgp_info_reap (rn, ri); bgp_info_reap (rn, ri);
} }

6
bgpd/bgp_table.c
View File

@ -50,12 +50,6 @@ bgp_table_unlock (struct bgp_table *rt)
route_table_finish (rt->route_table); route_table_finish (rt->route_table);
rt->route_table = NULL; rt->route_table = NULL;
if (rt->owner)
{
peer_unlock (rt->owner);
rt->owner = NULL;
}
XFREE (MTYPE_BGP_TABLE, rt); XFREE (MTYPE_BGP_TABLE, rt);
} }

3
bgpd/bgp_table.h
View File

@ -31,9 +31,6 @@ struct bgp_table
int lock; int lock;
/* The owner of this 'bgp_table' structure. */
struct peer *owner;
struct route_table *route_table; struct route_table *route_table;
uint64_t version; uint64_t version;
}; };