diff options
| author | Martin Willi <martin@strongswan.org> | 2008-07-18 15:51:40 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-07-18 15:51:40 +0000 |
| commit | a4a3e0c7dcb475cb7e7fe73e974a7e9a9aaca1fa (patch) | |
| tree | b9e1d1247c4bed48b42aed306f90ec99774cdc71 /src/charon/processing | |
| parent | 2f725443e59953347b2454393ce5186099e9c642 (diff) | |
| download | strongswan-a4a3e0c7dcb475cb7e7fe73e974a7e9a9aaca1fa.tar.bz2 strongswan-a4a3e0c7dcb475cb7e7fe73e974a7e9a9aaca1fa.tar.xz | |
introduced an additional bus->signal parameter for signal specific data
added SIG_IKE/SIG_CHD macros for signal emitting
Diffstat (limited to 'src/charon/processing')
| -rw-r--r-- | src/charon/processing/jobs/initiate_mediation_job.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/charon/processing/jobs/initiate_mediation_job.c b/src/charon/processing/jobs/initiate_mediation_job.c index d4eb2a22c..ef728bfbf 100644 --- a/src/charon/processing/jobs/initiate_mediation_job.c +++ b/src/charon/processing/jobs/initiate_mediation_job.c @@ -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; } |