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

inactivity-job: Schedule job by CHILD_SA unique ID instead of reqid

Browse Source
This commit is contained in:
Martin Willi
2015-02-20 13:34:51 +01:00
parent 84e391e08e
commit 85ace154d8
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/processing/jobs/inactivity_job.c
+8 -8
View File
@@ -30,9 +30,9 @@ struct private_inactivity_job_t {
inactivity_job_t public;
/**
* Reqid of CHILD_SA to check
* Unique CHILD_SA identifier to check
*/
u_int32_t reqid;
u_int32_t id;
/**
* Inactivity timeout
@@ -57,8 +57,8 @@ METHOD(job_t, execute, job_requeue_t,
ike_sa_t *ike_sa;
u_int32_t reschedule = 0;
ike_sa = charon->ike_sa_manager->checkout_by_id(charon->ike_sa_manager,
this->reqid, TRUE);
ike_sa = charon->child_sa_manager->checkout_by_id(charon->child_sa_manager,
this->id, NULL);
if (ike_sa)
{
enumerator_t *enumerator;
@@ -69,9 +69,9 @@ METHOD(job_t, execute, job_requeue_t,
status_t status = SUCCESS;
enumerator = ike_sa->create_child_sa_enumerator(ike_sa);
while (enumerator->enumerate(enumerator, (void**)&child_sa))
while (enumerator->enumerate(enumerator, &child_sa))
{
if (child_sa->get_reqid(child_sa) == this->reqid)
if (child_sa->get_unique_id(child_sa) == this->id)
{
time_t in, out, install, diff;
@@ -136,7 +136,7 @@ METHOD(job_t, get_priority, job_priority_t,
/**
* See header
*/
inactivity_job_t *inactivity_job_create(u_int32_t reqid, u_int32_t timeout,
inactivity_job_t *inactivity_job_create(u_int32_t unique_id, u_int32_t timeout,
bool close_ike)
{
private_inactivity_job_t *this;
@@ -149,7 +149,7 @@ inactivity_job_t *inactivity_job_create(u_int32_t reqid, u_int32_t timeout,
.destroy = _destroy,
},
},
.reqid = reqid,
.id = unique_id,
.timeout = timeout,
.close_ike = close_ike,
);
src/libcharon/processing/jobs/inactivity_job.h
+2 -2
View File
@@ -42,12 +42,12 @@ struct inactivity_job_t {
/**
* Create a inactivity_job instance.
*
* @param reqid reqid of CHILD_SA to check for inactivity
* @param unique_id unique CHILD_SA identifier to check for inactivity
* @param timeout inactivity timeout in s
* @param close_ike close IKE_SA if the last remaining CHILD_SA is inactive?
* @return inactivity checking job
*/
inactivity_job_t *inactivity_job_create(u_int32_t reqid, u_int32_t timeout,
inactivity_job_t *inactivity_job_create(u_int32_t unique_id, u_int32_t timeout,
bool close_ike);
#endif /** INACTIVITY_JOB_H_ @}*/