From: Martin Willi <martin@revosec.ch>
Date: Tue, 11 Feb 2014 14:41:49 +0000 (+0100)
Subject: processor: Flush pending jobs during cancel(), not destroy
X-Git-Tag: 5.2.0dr3~9^2~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=874e212f71b86a483445036096b29f0dd81b3ed3;p=thirdparty%2Fstrongswan.git

processor: Flush pending jobs during cancel(), not destroy

During shutdown, cancel queued jobs earlier to avoid having cleanup functions
accessing infrastructure not available anymore, for example watcher.
---

diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c
index 012b169e3f..27e5ab5f60 100644
--- a/src/libstrongswan/processing/processor.c
+++ b/src/libstrongswan/processing/processor.c
@@ -467,6 +467,8 @@ METHOD(processor_t, cancel, void,
 {
 	enumerator_t *enumerator;
 	worker_thread_t *worker;
+	job_t *job;
+	int i;
 
 	this->mutex->lock(this->mutex);
 	this->desired_threads = 0;
@@ -496,6 +498,14 @@ METHOD(processor_t, cancel, void,
 		worker->thread->join(worker->thread);
 		free(worker);
 	}
+	for (i = 0; i < JOB_PRIO_MAX; i++)
+	{
+		while (this->jobs[i]->remove_first(this->jobs[i],
+										   (void**)&job) == SUCCESS)
+		{
+			job->destroy(job);
+		}
+	}
 	this->mutex->unlock(this->mutex);
 }
 
@@ -510,7 +520,7 @@ METHOD(processor_t, destroy, void,
 	this->mutex->destroy(this->mutex);
 	for (i = 0; i < JOB_PRIO_MAX; i++)
 	{
-		this->jobs[i]->destroy_offset(this->jobs[i], offsetof(job_t, destroy));
+		this->jobs[i]->destroy(this->jobs[i]);
 	}
 	this->threads->destroy(this->threads);
 	free(this);