diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2006-02-21 01:09:01 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2006-02-21 01:09:01 +0000 |
| commit | afb226bebd8350f8f6523f4692658b944bc2997f (patch) | |
| tree | 4435ee62f31050298f98dca0fe157fb7c9ca7e34 /bgpd/bgpd.c | |
| parent | 4528ffa280f93ce64213bd79311dc9d7b3c6a12f (diff) | |
[bgpd] Record afi/safi in bgp_table. Serialise peer clear with FSM.
2006-02-21 Paul Jakma <paul.jakma@sun.com>
* bgpd.h: move the clear_node_queue to be peer specific.
Add a new peer status flag, PEER_STATUS_CLEARING.
* bgp_table.h: (struct bgp_table) Add fields to record afi,
safi of the table.
(bgp_table_init) Take afi and safi to create table for.
* bgp_table.c: (bgp_table_init) record the afi and safi.
* bgp_nexthop.c: Update all calls to bgp_table_init.
* bgp_vty.c: ditto.
* bgpd.c: ditto.
* bgp_fsm.c: (bgp_timer_set) dont bring up a session which is
clearing.
* bgp_route.c: (general) Update all bgp_table_init calls.
(bgp_process_{rsclient,main}) clear_node is serialised
via PEER_STATUS_CLEARING and fsm now.
(struct bgp_clear_node_queue) can be removed. struct bgp_node
can be the queue item data directly, as struct peer can be
kept in the new wq global user data and afi/safi can be
retrieved via bgp_node -> bgp_table.
(bgp_clear_route_node) fix to get peer via wq->spec.data,
afi/safi via bgp_node->bgp_table.
(bgp_clear_node_queue_del) no more item data to delete, only
unlock the bgp_node.
(bgp_clear_node_complete) only need to unset CLEARING flag
and unlock struct peer.
(bgp_clear_node_queue_init) queue attaches to struct peer
now. record peer name as queue name.
(bgp_clear_route_table) If queue transitions to active,
serialise clearing by setting PEER_STATUS_CLEARING rather
than plugging process queue, and lock peer while queue
active.
Update to pass only bgp_node as per-queue-item specific data.
Diffstat (limited to 'bgpd/bgpd.c')
| -rw-r--r-- | bgpd/bgpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 1f1b4fd2..9f694f5e 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1866,9 +1866,9 @@ bgp_create (as_t *as, const char *name) for (afi = AFI_IP; afi < AFI_MAX; afi++) for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++) { - bgp->route[afi][safi] = bgp_table_init (); - bgp->aggregate[afi][safi] = bgp_table_init (); - bgp->rib[afi][safi] = bgp_table_init (); + bgp->route[afi][safi] = bgp_table_init (afi, safi); + bgp->aggregate[afi][safi] = bgp_table_init (afi, safi); + bgp->rib[afi][safi] = bgp_table_init (afi, safi); } bgp->default_local_pref = BGP_DEFAULT_LOCAL_PREF; |