diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-03-03 17:39:27 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-03-03 17:39:58 +0100 |
| commit | 88ce12a927f03d88f29609a46e7880dc0ecfb8be (patch) | |
| tree | 7966167225b3e6f2ac51554f6092a28ab132c2b0 /src/libcharon/kernel/kernel_handler.c | |
| parent | 91d80298f9de5e7d792b7cb0a6c7a2c61784d744 (diff) | |
| parent | 28649f6d91971e0fe50078aec2937010e8c61cd8 (diff) | |
| download | strongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.bz2 strongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.xz | |
Merge branch 'libhydra-bye-bye'
Moves kernel plugins to libcharon and removes the unused libhydra. The
kernel interface is now accessible under charon->kernel.
Diffstat (limited to 'src/libcharon/kernel/kernel_handler.c')
| -rw-r--r-- | src/libcharon/kernel/kernel_handler.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libcharon/kernel/kernel_handler.c b/src/libcharon/kernel/kernel_handler.c index 9c0e2602b..be37d30e5 100644 --- a/src/libcharon/kernel/kernel_handler.c +++ b/src/libcharon/kernel/kernel_handler.c @@ -15,7 +15,6 @@ #include "kernel_handler.h" -#include <hydra.h> #include <daemon.h> #include <processing/jobs/acquire_job.h> #include <processing/jobs/delete_child_sa_job.h> @@ -135,8 +134,7 @@ METHOD(kernel_listener_t, roam, bool, METHOD(kernel_handler_t, destroy, void, private_kernel_handler_t *this) { - hydra->kernel_interface->remove_listener(hydra->kernel_interface, - &this->public.listener); + charon->kernel->remove_listener(charon->kernel, &this->public.listener); free(this); } @@ -157,8 +155,7 @@ kernel_handler_t *kernel_handler_create() }, ); - hydra->kernel_interface->add_listener(hydra->kernel_interface, - &this->public.listener); + charon->kernel->add_listener(charon->kernel, &this->public.listener); return &this->public; } |