diff options
Diffstat (limited to 'src/charon/processing')
| -rw-r--r-- | src/charon/processing/jobs/initiate_mediation_job.c | 15 | ||||
| -rw-r--r-- | src/charon/processing/jobs/update_sa_job.c | 98 | ||||
| -rw-r--r-- | src/charon/processing/jobs/update_sa_job.h | 52 |
3 files changed, 158 insertions, 7 deletions
diff --git a/src/charon/processing/jobs/initiate_mediation_job.c b/src/charon/processing/jobs/initiate_mediation_job.c index de97daafa..ee9644045 100644 --- a/src/charon/processing/jobs/initiate_mediation_job.c +++ b/src/charon/processing/jobs/initiate_mediation_job.c @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: initiate_mediation_job.c 3792 2008-04-10 12:51:04Z tobias $ + * $Id: initiate_mediation_job.c 4192 2008-07-18 15:51:40Z martin $ */ #include "initiate_mediation_job.h" @@ -56,10 +56,11 @@ static void destroy(private_initiate_mediation_job_t *this) /** * Callback to handle initiation of mediation connection */ -static bool initiate_callback(private_initiate_mediation_job_t *this, signal_t signal, level_t level, - ike_sa_t *ike_sa, char *format, va_list args) +static bool initiate_callback(private_initiate_mediation_job_t *this, + signal_t signal, level_t level, ike_sa_t *ike_sa, + void *data, char *format, va_list args) { - if (signal == CHILD_UP_SUCCESS) + if (signal == CHD_UP_SUCCESS) { /* mediation connection is up */ this->mediation_sa_id = ike_sa->get_id(ike_sa); @@ -119,7 +120,7 @@ static void initiate(private_initiate_mediation_job_t *this) mediation_cfg->destroy(mediation_cfg); mediated_cfg->destroy(mediated_cfg); charon->bus->set_sa(charon->bus, mediated_sa); - SIG(IKE_UP_FAILED, "mediation failed"); + SIG_IKE(UP_FAILED, "mediation failed"); destroy(this); return; } @@ -138,7 +139,7 @@ static void initiate(private_initiate_mediation_job_t *this) charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, mediation_sa); charon->bus->set_sa(charon->bus, mediated_sa); - SIG(IKE_UP_FAILED, "mediation failed"); + SIG_IKE(UP_FAILED, "mediation failed"); destroy(this); return; } @@ -179,7 +180,7 @@ static void reinitiate(private_initiate_mediation_job_t *this) charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, mediation_sa); charon->bus->set_sa(charon->bus, mediated_sa); - SIG(IKE_UP_FAILED, "mediation failed"); + SIG_IKE(UP_FAILED, "mediation failed"); destroy(this); return; } diff --git a/src/charon/processing/jobs/update_sa_job.c b/src/charon/processing/jobs/update_sa_job.c new file mode 100644 index 000000000..acf263d25 --- /dev/null +++ b/src/charon/processing/jobs/update_sa_job.c @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2008 Martin Willi + * Hochschule fuer Technik Rapperswil + * + * 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. + * + * $Id$ + */ + +#include <stdlib.h> + +#include "update_sa_job.h" + +#include <sa/ike_sa.h> +#include <daemon.h> + + +typedef struct private_update_sa_job_t private_update_sa_job_t; + +/** + * Private data of an update_sa_job_t Object + */ +struct private_update_sa_job_t { + /** + * public update_sa_job_t interface + */ + update_sa_job_t public; + + /** + * reqid of the CHILD_SA + */ + u_int32_t reqid; + + /** + * New SA address and port + */ + host_t *new; +}; + +/** + * Implements job_t.destroy. + */ +static void destroy(private_update_sa_job_t *this) +{ + this->new->destroy(this->new); + free(this); +} + +/** + * Implementation of job_t.execute. + */ +static void execute(private_update_sa_job_t *this) +{ + ike_sa_t *ike_sa; + + ike_sa = charon->ike_sa_manager->checkout_by_id(charon->ike_sa_manager, + this->reqid, TRUE); + if (ike_sa == NULL) + { + DBG1(DBG_JOB, "CHILD_SA with reqid %d not found for update", this->reqid); + } + else + { + /* we update only if other host is NATed, but not our */ + if (ike_sa->has_condition(ike_sa, COND_NAT_THERE) && + !ike_sa->has_condition(ike_sa, COND_NAT_HERE)) + { + ike_sa->update_hosts(ike_sa, NULL, this->new); + } + charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa); + } + destroy(this); +} + +/* + * Described in header + */ +update_sa_job_t *update_sa_job_create(u_int32_t reqid, host_t *new) +{ + private_update_sa_job_t *this = malloc_thing(private_update_sa_job_t); + + this->public.job_interface.execute = (void (*) (job_t *)) execute; + this->public.job_interface.destroy = (void (*) (job_t *)) destroy; + + this->reqid = reqid; + this->new = new; + + return &this->public; +} + diff --git a/src/charon/processing/jobs/update_sa_job.h b/src/charon/processing/jobs/update_sa_job.h new file mode 100644 index 000000000..5a350d939 --- /dev/null +++ b/src/charon/processing/jobs/update_sa_job.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008 Martin Willi + * Hochschule fuer Technik Rapperswil + * + * 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. + * + * $Id$ + */ + +/** + * @defgroup update_sa_job update_sa_job + * @{ @ingroup jobs + */ + +#ifndef UPDATE_SA_JOB_H_ +#define UPDATE_SA_JOB_H_ + +typedef struct update_sa_job_t update_sa_job_t; + +#include <library.h> +#include <utils/host.h> +#include <processing/jobs/job.h> + +/** + * Update the addresses of an IKE and its CHILD_SAs. + */ +struct update_sa_job_t { + + /** + * implements job_t interface + */ + job_t job_interface; +}; + +/** + * Creates a job to update IKE and CHILD_SA addresses. + * + * @param reqid reqid of the CHILD_SA + * @param new new address and port + * @return update_sa_job_t object + */ +update_sa_job_t *update_sa_job_create(u_int32_t reqid, host_t *new); + +#endif /*UPDATE_SA_JOB_H_ @} */ |