diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-07-06 11:50:43 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-09-02 19:01:23 +0200 |
| commit | 81f6ec276b1322d79428e6195c03065259482a50 (patch) | |
| tree | b5cb627a457329290bebf6e7e5e056cfa5b8cd36 /src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | |
| parent | 09ae31f13a65e4946d5e71ffd635af62b1695e1c (diff) | |
| download | strongswan-81f6ec276b1322d79428e6195c03065259482a50.tar.bz2 strongswan-81f6ec276b1322d79428e6195c03065259482a50.tar.xz | |
Moved acquire job creation to kernel event handler.
Diffstat (limited to 'src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c')
| -rw-r--r-- | src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index 6773dcf87..b49009545 100644 --- a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -60,7 +60,6 @@ #include <threading/thread.h> #include <threading/mutex.h> #include <processing/jobs/callback_job.h> -#include <processing/jobs/acquire_job.h> #include <processing/jobs/migrate_job.h> #include <processing/jobs/rekey_child_sa_job.h> #include <processing/jobs/delete_child_sa_job.h> @@ -902,7 +901,6 @@ static void process_acquire(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* u_int32_t index, reqid = 0; traffic_selector_t *src_ts, *dst_ts; policy_entry_t *policy; - job_t *job; switch (msg->sadb_msg_satype) { @@ -931,17 +929,15 @@ static void process_acquire(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* } else { - DBG1(DBG_KNL, "received an SADB_ACQUIRE with policy id %d but no matching policy found", - index); + DBG1(DBG_KNL, "received an SADB_ACQUIRE with policy id %d but no" + " matching policy found", index); } src_ts = sadb_address2ts(response.src); dst_ts = sadb_address2ts(response.dst); this->mutex->unlock(this->mutex); - DBG1(DBG_KNL, "creating acquire job for policy %R === %R with reqid {%u}", - src_ts, dst_ts, reqid); - job = (job_t*)acquire_job_create(reqid, src_ts, dst_ts); - hydra->processor->queue_job(hydra->processor, job); + charon->kernel_interface->acquire(charon->kernel_interface, reqid, src_ts, + dst_ts); } /** |