diff options
| -rw-r--r-- | bgpd/bgp_route.c | 14 | ||||
| -rw-r--r-- | bgpd/bgp_route.h | 1 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 32 | ||||
| -rw-r--r-- | bgpd/bgpd.h | 16 |
4 files changed, 42 insertions, 21 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 4e172bf8..80ae0793 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1529,6 +1529,7 @@ bgp_processq_del (struct work_queue *wq, void *data) { struct bgp_process_queue *pq = data; + bgp_unlock(pq->bgp); bgp_unlock_node (pq->rn); XFREE (MTYPE_BGP_PROCESS_QUEUE, pq); } @@ -1578,6 +1579,7 @@ bgp_process (struct bgp *bgp, struct bgp_node *rn, afi_t afi, safi_t safi) pqnode->rn = bgp_lock_node (rn); /* unlocked by bgp_processq_del */ pqnode->bgp = bgp; + bgp_lock(bgp); pqnode->afi = afi; pqnode->safi = safi; @@ -2670,18 +2672,6 @@ bgp_clear_node_queue_init (struct peer *peer) peer->clear_node_queue->spec.data = peer; } -/* Route clearing may not be done yet. - * Otherwise events in peer->clear_node_queue could happen after bgp is freed. - */ -void -bgp_clear_route_wait (struct peer *peer) -{ - struct work_queue *wq = peer->clear_node_queue; - - while (listcount (wq->items) > 0) - work_queue_run(wq->thread); -} - static void bgp_clear_route_table (struct peer *peer, afi_t afi, safi_t safi, struct bgp_table *table, struct peer *rsclient) diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h index 02193ba9..3e65bb10 100644 --- a/bgpd/bgp_route.h +++ b/bgpd/bgp_route.h @@ -171,7 +171,6 @@ extern void bgp_soft_reconfig_rsclient (struct peer *, afi_t, safi_t); extern void bgp_check_local_routes_rsclient (struct peer *rsclient, afi_t afi, safi_t safi); extern void bgp_clear_route (struct peer *, afi_t, safi_t); extern void bgp_clear_route_all (struct peer *); -extern void bgp_clear_route_wait (struct peer *); extern void bgp_clear_adj_in (struct peer *, afi_t, safi_t); extern void bgp_clear_stale_route (struct peer *, afi_t, safi_t); diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index af2f15e4..6f44f1fd 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -648,7 +648,9 @@ void peer_free (struct peer *peer) { assert (peer->status == Deleted); - + + bgp_unlock(peer->bgp); + /* this /ought/ to have been done already through bgp_stop earlier, * but just to be sure.. */ @@ -708,6 +710,7 @@ peer_new (struct bgp *bgp) peer->password = NULL; peer->bgp = bgp; peer = peer_lock (peer); /* initial reference */ + bgp_lock (bgp); /* Set default flags. */ for (afi = AFI_IP; afi < AFI_MAX; afi++) @@ -1133,8 +1136,6 @@ peer_delete (struct peer *peer) bgp_timer_set (peer); /* stops all timers for Deleted */ - bgp_clear_route_wait (peer); - /* Delete from all peer list. */ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP)) { @@ -1828,6 +1829,7 @@ bgp_create (as_t *as, const char *name) if ( (bgp = XCALLOC (MTYPE_BGP, sizeof (struct bgp))) == NULL) return NULL; + bgp_lock (bgp); bgp->peer_self = peer_new (bgp); bgp->peer_self->host = strdup ("Static announcement"); @@ -1964,7 +1966,6 @@ bgp_delete (struct bgp *bgp) struct listnode *node; struct listnode *next; afi_t afi; - safi_t safi; int i; /* Delete static route. */ @@ -1978,14 +1979,31 @@ bgp_delete (struct bgp *bgp) for (ALL_LIST_ELEMENTS (bgp->group, node, next, group)) peer_group_delete (group); - list_delete (bgp->group); for (ALL_LIST_ELEMENTS (bgp->peer, node, next, peer)) peer_delete (peer); - list_delete (bgp->peer); for (ALL_LIST_ELEMENTS (bgp->rsclient, node, next, peer)) peer_delete (peer); + + if (bgp->peer_self) { + peer_delete(bgp->peer_self); + bgp->peer_self = NULL; + } + + bgp_unlock(bgp); /* initial reference */ + + return 0; +} + +void +bgp_free(struct bgp *bgp) +{ + afi_t afi; + safi_t safi; + + list_delete (bgp->group); + list_delete (bgp->peer); list_delete (bgp->rsclient); listnode_delete (bm->bgp, bgp); @@ -2004,8 +2022,6 @@ bgp_delete (struct bgp *bgp) XFREE (MTYPE_ROUTE_TABLE,bgp->rib[afi][safi]); } XFREE (MTYPE_BGP, bgp); - - return 0; } struct peer * diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 0cd88d81..84164593 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -70,6 +70,9 @@ struct bgp /* Name of this BGP instance. */ char *name; + /* Reference count to allow peer_delete to finish after bgp_delete */ + int lock; + /* Self peer. */ struct peer *peer_self; @@ -897,6 +900,19 @@ bgp_config_check (const struct bgp *bgp, int config) return CHECK_FLAG (bgp->config, config); } +static inline void +bgp_lock(struct bgp *bgp) +{ + ++bgp->lock; +} + +static inline void +bgp_unlock(struct bgp *bgp) +{ + if (--bgp->lock == 0) + bgp_free (bgp); +} + extern int bgp_router_id_set (struct bgp *, struct in_addr *); extern int bgp_cluster_id_set (struct bgp *, struct in_addr *); |