diff options
| author | Chris Caputo <ccaputo@alt.net> | 2010-07-27 16:28:55 +0000 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2011-03-21 13:15:32 +0000 |
| commit | 6c88b44dcb26b60bb1f93e5c387aa102019ed849 (patch) | |
| tree | 772aacb2702dd635ca271ceca966986e38ecb3be /bgpd/bgp_main.c | |
| parent | cca85d27a59c31e1b20e4c4adc7d9bb57606e584 (diff) | |
bgpd: fix bgp_node locking issues
* bgpd: Connected table locks were being locked but not unlocked, such that
eventually a lock would exceed 2^31 and become negative, thus triggering
an assert later on.
* bgp_main.c: (bgp_exit) delete connected elements along with ifp's.
* bgp_nexthop.c: (bgp_nexthop_lookup{,_ipv6}) add missing unlocks
(bgp_multiaccess_check_v4) ditto
(bgp_connected_{add,delete}) Use a distinct memtype for bgp_connected_ref.
(bgp_scan_finish) reset the nexthop cache to clean it up when bgpd exits
* bgp_route.c: fix missing bgp_node unlocks
* lib/memtype.c: (memory_list_bgp) add MTYPE_BGP_CONN
* testing: has been tested for almost 2 months now.
Diffstat (limited to 'bgpd/bgp_main.c')
| -rw-r--r-- | bgpd/bgp_main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 9d14683c..1a460c6b 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -243,7 +243,15 @@ bgp_exit (int status) if (retain_mode) if_add_hook (IF_DELETE_HOOK, NULL); for (ALL_LIST_ELEMENTS (iflist, node, nnode, ifp)) - if_delete (ifp); + { + struct listnode *c_node, *c_nnode; + struct connected *c; + + for (ALL_LIST_ELEMENTS (ifp->connected, c_node, c_nnode, c)) + bgp_connected_delete (c); + + if_delete (ifp); + } list_free (iflist); /* reverse bgp_attr_init */ |