diff options
| author | Martin Willi <martin@revosec.ch> | 2014-10-27 15:07:05 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-02-20 13:34:50 +0100 |
| commit | f81a9497483a7282c11adf5705d9ea3e83f6fffd (patch) | |
| tree | 8414a9b7e0eec4ae56fdcfa1447bd1e7f432504d /src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c | |
| parent | 971a91685da640363651e7a9a9edb9dfd94b7fe5 (diff) | |
| download | strongswan-f81a9497483a7282c11adf5705d9ea3e83f6fffd.tar.bz2 strongswan-f81a9497483a7282c11adf5705d9ea3e83f6fffd.tar.xz | |
kernel-interface: Raise expires with a proto/SPI/dst tuple instead of reqid
Diffstat (limited to 'src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c')
| -rw-r--r-- | src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c index 9fd6541a5..86db9e643 100644 --- a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c +++ b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c @@ -2032,9 +2032,8 @@ static void expire_data_destroy(expire_data_t *data) static job_requeue_t expire_job(expire_data_t *data) { private_kernel_wfp_ipsec_t *this = data->this; - u_int32_t reqid = 0; u_int8_t protocol; - entry_t *entry; + entry_t *entry = NULL; sa_entry_t key = { .spi = data->spi, .dst = data->dst, @@ -2048,7 +2047,6 @@ static job_requeue_t expire_job(expire_data_t *data) if (entry) { protocol = entry->isa.protocol; - reqid = entry->reqid; if (entry->osa.dst) { key.dst = entry->osa.dst; @@ -2065,15 +2063,14 @@ static job_requeue_t expire_job(expire_data_t *data) if (entry) { protocol = entry->isa.protocol; - reqid = entry->reqid; } this->mutex->unlock(this->mutex); } - if (reqid) + if (entry) { - hydra->kernel_interface->expire(hydra->kernel_interface, - reqid, protocol, data->spi, data->hard); + hydra->kernel_interface->expire(hydra->kernel_interface, protocol, + data->spi, data->dst, data->hard); } return JOB_REQUEUE_NONE; |