mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-24 16:10:11 +00:00
Code Issues Releases Activity

- Cover pfsync callouts deletion with PF_LOCK().

Browse Source 
- Cover setting up interface between pf and pfsync with PF_LOCK().
This commit is contained in:
Gleb Smirnoff 2011-12-20 12:34:16 +00:00
parent f42acd0f79
commit 352e70652f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=228732
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/contrib/pf/net/if_pfsync.c
View File

@ -539,9 +539,13 @@ pfsync_clone_destroy(struct ifnet *ifp)
#ifdef __FreeBSD__
EVENTHANDLER_DEREGISTER(ifnet_departure_event, sc->sc_detachtag);
PF_LOCK();
#endif
timeout_del(&sc->sc_bulk_tmo); /* XXX: need PF_LOCK() before */
timeout_del(&sc->sc_bulk_tmo);
timeout_del(&sc->sc_tmo);
#ifdef __FreeBSD__
PF_UNLOCK();
#endif
#if NCARP > 0
#ifdef notyet
#ifdef __FreeBSD__
@ -3392,6 +3396,7 @@ vnet_pfsync_init(const void *unused)
if (error)
panic("%s: swi_add %d", __func__, error);
PF_LOCK();
pfsync_state_import_ptr = pfsync_state_import;
pfsync_up_ptr = pfsync_up;
pfsync_insert_state_ptr = pfsync_insert_state;
@ -3400,6 +3405,7 @@ vnet_pfsync_init(const void *unused)
pfsync_clear_states_ptr = pfsync_clear_states;
pfsync_state_in_use_ptr = pfsync_state_in_use;
pfsync_defer_ptr = pfsync_defer;
PF_UNLOCK();
return (0);
}
@ -3410,6 +3416,7 @@ vnet_pfsync_uninit(const void *unused)
swi_remove(pfsync_swi.pfsync_swi_cookie);
PF_LOCK();
pfsync_state_import_ptr = NULL;
pfsync_up_ptr = NULL;
pfsync_insert_state_ptr = NULL;
@ -3418,6 +3425,7 @@ vnet_pfsync_uninit(const void *unused)
pfsync_clear_states_ptr = NULL;
pfsync_state_in_use_ptr = NULL;
pfsync_defer_ptr = NULL;
PF_UNLOCK();
if_clone_detach(&pfsync_cloner);