libhydra: Move kernel interface to libcharon

This moves hydra->kernel_interface to charon->kernel.
This commit is contained in:
Tobias Brunner
2016-03-03 17:36:11 +01:00
parent dec9e1957f
commit 8394ea2a42
69 changed files with 257 additions and 358 deletions
@@ -18,7 +18,6 @@
#include "android_attr.h"
#include "../charonservice.h"
#include <hydra.h>
#include <utils/debug.h>
#include <library.h>
@@ -22,7 +22,7 @@
#include "android_dns_proxy.h"
#include <hydra.h>
#include <daemon.h>
#include <threading/rwlock.h>
#include <collections/hashtable.h>
#include <processing/jobs/callback_job.h>
@@ -121,8 +121,7 @@ static int open_socket(int family)
DBG1(DBG_NET, "could not open proxy socket: %s", strerror(errno));
return -1;
}
if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
skt, family))
if (!charon->kernel->bypass_socket(charon->kernel, skt, family))
{
DBG1(DBG_NET, "installing bypass policy for proxy socket failed");
close(skt);
@@ -19,7 +19,7 @@
#include <utils/debug.h>
#include <library.h>
#include <hydra.h>
#include <daemon.h>
#include <ipsec.h>
typedef struct private_kernel_android_ipsec_t private_kernel_android_ipsec_t;
@@ -42,8 +42,7 @@ struct private_kernel_android_ipsec_t {
*/
static void expire(u_int8_t protocol, u_int32_t spi, host_t *dst, bool hard)
{
hydra->kernel_interface->expire(hydra->kernel_interface, protocol,
spi, dst, hard);
charon->kernel->expire(charon->kernel, protocol, spi, dst, hard);
}
METHOD(kernel_ipsec_t, get_spi, status_t,
@@ -20,7 +20,7 @@
#include "../android_jni.h"
#include "../charonservice.h"
#include <hydra.h>
#include <daemon.h>
#include <processing/jobs/callback_job.h>
#include <threading/mutex.h>
@@ -75,7 +75,7 @@ static job_requeue_t roam_event()
{
/* this will fail if no connection is up */
charonservice->bypass_socket(charonservice, -1, 0);
hydra->kernel_interface->roam(hydra->kernel_interface, TRUE);
charon->kernel->roam(charon->kernel, TRUE);
return JOB_REQUEUE_NONE;
}