aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2010-07-05 13:52:05 +0200
committerTobias Brunner <tobias@strongswan.org>2010-09-02 19:01:22 +0200
commitc5f7146b17453d1d4d2c7cbd4e9880a3fd342591 (patch)
tree584be6d9d6e57082ad9c50e8cffc1aeee86e5514 /src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
parent633fbe4fde8887d8026c1c121f26c220dda26329 (diff)
downloadstrongswan-c5f7146b17453d1d4d2c7cbd4e9880a3fd342591.tar.bz2
strongswan-c5f7146b17453d1d4d2c7cbd4e9880a3fd342591.tar.xz
Refer to processor via hydra and not charon.
Diffstat (limited to 'src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c')
-rw-r--r--src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
index dcd6871c1..9ba539175 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
@@ -35,6 +35,7 @@
#include "kernel_netlink_ipsec.h"
#include "kernel_netlink_shared.h"
+#include <hydra.h>
#include <daemon.h>
#include <threading/thread.h>
#include <threading/mutex.h>
@@ -296,7 +297,7 @@ struct policy_entry_t {
static u_int policy_hash(policy_entry_t *key)
{
chunk_t chunk = chunk_create((void*)&key->sel,
- sizeof(struct xfrm_selector) + sizeof(u_int32_t));
+ sizeof(struct xfrm_selector) + sizeof(u_int32_t));
return chunk_hash(chunk);
}
@@ -593,7 +594,7 @@ static void process_acquire(private_kernel_netlink_ipsec_t *this, struct nlmsghd
DBG1(DBG_KNL, "creating acquire job for policy %R === %R with reqid {%u}",
src_ts, dst_ts, reqid);
job = (job_t*)acquire_job_create(reqid, src_ts, dst_ts);
- charon->processor->queue_job(charon->processor, job);
+ hydra->processor->queue_job(hydra->processor, job);
}
/**
@@ -631,7 +632,7 @@ static void process_expire(private_kernel_netlink_ipsec_t *this, struct nlmsghdr
{
job = (job_t*)rekey_child_sa_job_create(reqid, protocol, spi);
}
- charon->processor->queue_job(charon->processor, job);
+ hydra->processor->queue_job(hydra->processor, job);
}
/**
@@ -703,7 +704,7 @@ static void process_migrate(private_kernel_netlink_ipsec_t *this, struct nlmsghd
src_ts, dst_ts, policy_dir_names, dir, reqid, local);
job = (job_t*)migrate_job_create(reqid, src_ts, dst_ts, dir,
local, remote);
- charon->processor->queue_job(charon->processor, job);
+ hydra->processor->queue_job(hydra->processor, job);
}
else
{
@@ -740,7 +741,7 @@ static void process_mapping(private_kernel_netlink_ipsec_t *this,
DBG1(DBG_KNL, "NAT mappings of ESP CHILD_SA with SPI %.8x and "
"reqid {%u} changed, queuing update job", ntohl(spi), reqid);
job = (job_t*)update_sa_job_create(reqid, host);
- charon->processor->queue_job(charon->processor, job);
+ hydra->processor->queue_job(hydra->processor, job);
}
}
}
@@ -1705,7 +1706,7 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
DBG2(DBG_KNL, "policy %R === %R %N (mark %u/0x%8x) "
"already exists, increasing refcount",
src_ts, dst_ts, policy_dir_names, direction,
- mark.value, mark.mask);
+ mark.value, mark.mask);
}
else
{
@@ -2260,7 +2261,7 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create()
}
this->job = callback_job_create((callback_job_cb_t)receive_events,
this, NULL, NULL);
- charon->processor->queue_job(charon->processor, (job_t*)this->job);
+ hydra->processor->queue_job(hydra->processor, (job_t*)this->job);
return &this->public;
}