diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-07-06 12:09:06 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-09-02 19:01:24 +0200 |
| commit | a22853b302f6b15c03f647fcf4c9e9498314dcd7 (patch) | |
| tree | d5623a0ed48ccdb131b63a53e54873f3da24a9e1 /src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | |
| parent | 81f6ec276b1322d79428e6195c03065259482a50 (diff) | |
| download | strongswan-a22853b302f6b15c03f647fcf4c9e9498314dcd7.tar.bz2 strongswan-a22853b302f6b15c03f647fcf4c9e9498314dcd7.tar.xz | |
Moved delete/rekey CHILD_SA 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 | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index b49009545..b91b6d141 100644 --- a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -61,8 +61,6 @@ #include <threading/mutex.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/migrate_job.h> -#include <processing/jobs/rekey_child_sa_job.h> -#include <processing/jobs/delete_child_sa_job.h> #include <processing/jobs/update_sa_job.h> /** non linux specific */ @@ -949,7 +947,6 @@ static void process_expire(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* protocol_id_t protocol; u_int32_t spi, reqid; bool hard; - job_t *job; DBG2(DBG_KNL, "received an SADB_EXPIRE"); @@ -971,18 +968,8 @@ static void process_expire(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* return; } - DBG1(DBG_KNL, "creating %s job for %N CHILD_SA with SPI %.8x and reqid {%u}", - hard ? "delete" : "rekey", protocol_id_names, - protocol, ntohl(spi), reqid); - if (hard) - { - job = (job_t*)delete_child_sa_job_create(reqid, protocol, spi); - } - else - { - job = (job_t*)rekey_child_sa_job_create(reqid, protocol, spi); - } - hydra->processor->queue_job(hydra->processor, job); + charon->kernel_interface->expire(charon->kernel_interface, reqid, protocol, + spi, hard); } #ifdef SADB_X_MIGRATE |