ikev2: Immediately initiate queued tasks after establishing rekeyed IKE_SA
If additional tasks get queued before/while rekeying an IKE_SA, these get migrated to the new IKE_SA. We previously did not trigger initiation of these tasks, though, leaving the task unexecuted until a new task gets queued.
This commit is contained in:
@@ -0,0 +1,96 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Martin Willi
|
||||
* Copyright (C) 2015 revosec AG
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "initiate_tasks_job.h"
|
||||
|
||||
#include <sa/ike_sa.h>
|
||||
#include <daemon.h>
|
||||
|
||||
|
||||
typedef struct private_initiate_tasks_job_t private_initiate_tasks_job_t;
|
||||
|
||||
/**
|
||||
* Private data of an initiate_tasks_job_t Object
|
||||
*/
|
||||
struct private_initiate_tasks_job_t {
|
||||
|
||||
/**
|
||||
* Public initiate_tasks_job_t interface
|
||||
*/
|
||||
initiate_tasks_job_t public;
|
||||
|
||||
/**
|
||||
* ID of the IKE_SA to trigger task initiation
|
||||
*/
|
||||
ike_sa_id_t *ike_sa_id;
|
||||
};
|
||||
|
||||
METHOD(job_t, destroy, void,
|
||||
private_initiate_tasks_job_t *this)
|
||||
{
|
||||
this->ike_sa_id->destroy(this->ike_sa_id);
|
||||
free(this);
|
||||
}
|
||||
|
||||
METHOD(job_t, execute, job_requeue_t,
|
||||
private_initiate_tasks_job_t *this)
|
||||
{
|
||||
ike_sa_t *ike_sa;
|
||||
|
||||
ike_sa = charon->ike_sa_manager->checkout(charon->ike_sa_manager,
|
||||
this->ike_sa_id);
|
||||
if (ike_sa)
|
||||
{
|
||||
if (ike_sa->initiate(ike_sa, NULL, 0, NULL, NULL) == DESTROY_ME)
|
||||
{
|
||||
charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager,
|
||||
ike_sa);
|
||||
}
|
||||
else
|
||||
{
|
||||
charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
|
||||
}
|
||||
}
|
||||
return JOB_REQUEUE_NONE;
|
||||
}
|
||||
|
||||
METHOD(job_t, get_priority, job_priority_t,
|
||||
private_initiate_tasks_job_t *this)
|
||||
{
|
||||
return JOB_PRIO_MEDIUM;
|
||||
}
|
||||
|
||||
/*
|
||||
* Described in header
|
||||
*/
|
||||
initiate_tasks_job_t *initiate_tasks_job_create(ike_sa_id_t *ike_sa_id)
|
||||
{
|
||||
private_initiate_tasks_job_t *this;
|
||||
|
||||
INIT(this,
|
||||
.public = {
|
||||
.job_interface = {
|
||||
.execute = _execute,
|
||||
.get_priority = _get_priority,
|
||||
.destroy = _destroy,
|
||||
},
|
||||
},
|
||||
.ike_sa_id = ike_sa_id->clone(ike_sa_id),
|
||||
);
|
||||
|
||||
return &this->public;
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Martin Willi
|
||||
* Copyright (C) 2015 revosec AG
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup initiate_tasks_job initiate_tasks_job
|
||||
* @{ @ingroup cjobs
|
||||
*/
|
||||
|
||||
#ifndef INITIATE_TASKS_JOB_H_
|
||||
#define INITIATE_TASKS_JOB_H_
|
||||
|
||||
typedef struct initiate_tasks_job_t initiate_tasks_job_t;
|
||||
|
||||
#include <library.h>
|
||||
#include <processing/jobs/job.h>
|
||||
#include <sa/ike_sa_id.h>
|
||||
|
||||
/**
|
||||
* Job triggering initiation of any queued IKE_SA tasks.
|
||||
*/
|
||||
struct initiate_tasks_job_t {
|
||||
|
||||
/**
|
||||
* Implements job_t interface
|
||||
*/
|
||||
job_t job_interface;
|
||||
};
|
||||
|
||||
/**
|
||||
* Creates a job to trigger IKE_SA task initiation.
|
||||
*
|
||||
* @param ike_sa_id ID of IKE_SA to trigger tasks for (gets cloned)
|
||||
* @return job instance
|
||||
*/
|
||||
initiate_tasks_job_t *initiate_tasks_job_create(ike_sa_id_t *ike_sa_id);
|
||||
|
||||
#endif /** INITIATE_TASKS_JOB_H_ @}*/
|
||||
Reference in New Issue
Block a user