diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-02-12 15:30:18 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-03-03 17:36:11 +0100 |
| commit | 8394ea2a42eb23ba22471d913dcf47e6067109e1 (patch) | |
| tree | 365f6d98c717f76701dac4e4ef1064d408c305f5 /src/libcharon/plugins/kernel_iph | |
| parent | dec9e1957feb56c854bc24a657a6a378d74317f6 (diff) | |
| download | strongswan-8394ea2a42eb23ba22471d913dcf47e6067109e1.tar.bz2 strongswan-8394ea2a42eb23ba22471d913dcf47e6067109e1.tar.xz | |
libhydra: Move kernel interface to libcharon
This moves hydra->kernel_interface to charon->kernel.
Diffstat (limited to 'src/libcharon/plugins/kernel_iph')
| -rw-r--r-- | src/libcharon/plugins/kernel_iph/kernel_iph_net.c | 4 | ||||
| -rw-r--r-- | src/libcharon/plugins/kernel_iph/kernel_iph_plugin.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libcharon/plugins/kernel_iph/kernel_iph_net.c b/src/libcharon/plugins/kernel_iph/kernel_iph_net.c index a4be4041e..6a8a96821 100644 --- a/src/libcharon/plugins/kernel_iph/kernel_iph_net.c +++ b/src/libcharon/plugins/kernel_iph/kernel_iph_net.c @@ -24,7 +24,7 @@ #include "kernel_iph_net.h" -#include <hydra.h> +#include <daemon.h> #include <threading/mutex.h> #include <collections/linked_list.h> #include <processing/jobs/callback_job.h> @@ -130,7 +130,7 @@ static job_requeue_t roam_event(private_kernel_iph_net_t *this) this->roam_address = FALSE; this->mutex->unlock(this->mutex); - hydra->kernel_interface->roam(hydra->kernel_interface, address); + charon->kernel->roam(charon->kernel, address); return JOB_REQUEUE_NONE; } diff --git a/src/libcharon/plugins/kernel_iph/kernel_iph_plugin.c b/src/libcharon/plugins/kernel_iph/kernel_iph_plugin.c index c5475e30b..c16381440 100644 --- a/src/libcharon/plugins/kernel_iph/kernel_iph_plugin.c +++ b/src/libcharon/plugins/kernel_iph/kernel_iph_plugin.c @@ -17,8 +17,6 @@ #include "kernel_iph_plugin.h" #include "kernel_iph_net.h" -#include <hydra.h> - typedef struct private_kernel_iph_plugin_t private_kernel_iph_plugin_t; /** |