denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed deadlock if checkin_and_destroy is called during shutdown.

Browse Source
This commit is contained in:
Tobias Brunner
2012-03-20 17:31:40 +01:00
parent 4b2f428f40
commit 894c52cba2
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa_manager.c
+10
View File
@@ -1490,6 +1490,16 @@ METHOD(ike_sa_manager_t, checkin_and_destroy, void,
if (get_entry_by_sa(this, ike_sa_id, ike_sa, &entry, &segment) == SUCCESS) if (get_entry_by_sa(this, ike_sa_id, ike_sa, &entry, &segment) == SUCCESS)
{ {
if (entry->driveout_waiting_threads && entry->driveout_new_threads)
{ /* it looks like flush() has been called and the SA is being deleted
* anyway, just check it in */
DBG2(DBG_MGR, "ignored check-in and destroy of IKE_SA during shutdown");
entry->checked_out = FALSE;
entry->condvar->broadcast(entry->condvar);
unlock_single_segment(this, segment);
return;
}
/* drive out waiting threads, as we are in hurry */ /* drive out waiting threads, as we are in hurry */
entry->driveout_waiting_threads = TRUE; entry->driveout_waiting_threads = TRUE;
/* mark it, so no new threads can get this entry */ /* mark it, so no new threads can get this entry */