Add an Android specific kernel_net_t implementation
This currently provides only no-ops and is just added because a kernel-net implementation is required and kernel-netlink can't be used at the moment.
This commit is contained in:
parent
6e04147743
commit
24447cf49f
|
@ -4,7 +4,8 @@ include $(CLEAR_VARS)
|
||||||
# copy-n-paste from Makefile.am
|
# copy-n-paste from Makefile.am
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
android_jni.c android_jni.h \
|
android_jni.c android_jni.h \
|
||||||
charonservice.c charonservice.h
|
charonservice.c charonservice.h \
|
||||||
|
kernel/android_net.c kernel/android_net.h
|
||||||
|
|
||||||
# build libandroidbridge -------------------------------------------------------
|
# build libandroidbridge -------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "charonservice.h"
|
#include "charonservice.h"
|
||||||
#include "android_jni.h"
|
#include "android_jni.h"
|
||||||
|
#include "kernel/android_net.h"
|
||||||
|
|
||||||
#include <daemon.h>
|
#include <daemon.h>
|
||||||
#include <hydra.h>
|
#include <hydra.h>
|
||||||
|
@ -94,6 +95,10 @@ static void dbg_android(debug_t group, level_t level, char *fmt, ...)
|
||||||
static void charonservice_init(JNIEnv *env, jobject service)
|
static void charonservice_init(JNIEnv *env, jobject service)
|
||||||
{
|
{
|
||||||
private_charonservice_t *this;
|
private_charonservice_t *this;
|
||||||
|
static plugin_feature_t features[] = {
|
||||||
|
PLUGIN_CALLBACK(kernel_net_register, kernel_android_net_create),
|
||||||
|
PLUGIN_PROVIDE(CUSTOM, "kernel-net"),
|
||||||
|
};
|
||||||
|
|
||||||
INIT(this,
|
INIT(this,
|
||||||
.public = {
|
.public = {
|
||||||
|
@ -102,6 +107,9 @@ static void charonservice_init(JNIEnv *env, jobject service)
|
||||||
);
|
);
|
||||||
charonservice = &this->public;
|
charonservice = &this->public;
|
||||||
|
|
||||||
|
lib->plugins->add_static_features(lib->plugins, "androidbridge", features,
|
||||||
|
countof(features), TRUE);
|
||||||
|
|
||||||
lib->settings->set_int(lib->settings,
|
lib->settings->set_int(lib->settings,
|
||||||
"charon.plugins.android_log.loglevel", ANDROID_DEBUG_LEVEL);
|
"charon.plugins.android_log.loglevel", ANDROID_DEBUG_LEVEL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,9 @@
|
||||||
/**
|
/**
|
||||||
* @defgroup libandroidbridge libandroidbridge
|
* @defgroup libandroidbridge libandroidbridge
|
||||||
*
|
*
|
||||||
|
* @defgroup android_kernel kernel
|
||||||
|
* @ingroup libandroidbridge
|
||||||
|
*
|
||||||
* @defgroup charonservice charonservice
|
* @defgroup charonservice charonservice
|
||||||
* @{ @ingroup libandroidbridge
|
* @{ @ingroup libandroidbridge
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2012 Tobias Brunner
|
||||||
|
* Hochschule fuer Technik Rapperswil
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
* Free Software Foundation; either version 2 of the License, or (at your
|
||||||
|
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>. *
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "android_net.h"
|
||||||
|
|
||||||
|
typedef struct private_kernel_android_net_t private_kernel_android_net_t;
|
||||||
|
|
||||||
|
struct private_kernel_android_net_t {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Public kernel interface
|
||||||
|
*/
|
||||||
|
kernel_android_net_t public;
|
||||||
|
};
|
||||||
|
|
||||||
|
METHOD(kernel_net_t, add_ip, status_t,
|
||||||
|
private_kernel_android_net_t *this, host_t *virtual_ip, host_t *iface_ip)
|
||||||
|
{
|
||||||
|
/* we get the IP from the IKE_SA once the CHILD_SA is established */
|
||||||
|
return SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
METHOD(kernel_net_t, destroy, void,
|
||||||
|
private_kernel_android_net_t *this)
|
||||||
|
{
|
||||||
|
free(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Described in header.
|
||||||
|
*/
|
||||||
|
kernel_android_net_t *kernel_android_net_create()
|
||||||
|
{
|
||||||
|
private_kernel_android_net_t *this;
|
||||||
|
|
||||||
|
INIT(this,
|
||||||
|
.public = {
|
||||||
|
.interface = {
|
||||||
|
.get_source_addr = (void*)return_null,
|
||||||
|
.get_nexthop = (void*)return_null,
|
||||||
|
.get_interface = (void*)return_null,
|
||||||
|
.create_address_enumerator = (void*)enumerator_create_empty,
|
||||||
|
.add_ip = _add_ip,
|
||||||
|
.del_ip = (void*)return_failed,
|
||||||
|
.add_route = (void*)return_failed,
|
||||||
|
.del_route = (void*)return_failed,
|
||||||
|
.destroy = _destroy,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
return &this->public;
|
||||||
|
};
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2012 Tobias Brunner
|
||||||
|
* Hochschule fuer Technik Rapperswil
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
* Free Software Foundation; either version 2 of the License, or (at your
|
||||||
|
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @defgroup kernel_android_net kernel_android_net
|
||||||
|
* @{ @ingroup kernel_android
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef KERNEL_ANDROID_NET_H_
|
||||||
|
#define KERNEL_ANDROID_NET_H_
|
||||||
|
|
||||||
|
#include <library.h>
|
||||||
|
#include <kernel/kernel_net.h>
|
||||||
|
|
||||||
|
typedef struct kernel_android_net_t kernel_android_net_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of the kernel-net interface. This currently consists of only
|
||||||
|
* noops because a kernel_net_t implementation is required and we can't use
|
||||||
|
* kernel_netlink_net_t at the moment.
|
||||||
|
*/
|
||||||
|
struct kernel_android_net_t {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implements kernel_net_t interface
|
||||||
|
*/
|
||||||
|
kernel_net_t interface;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a android net interface instance.
|
||||||
|
*
|
||||||
|
* @return kernel_android_net_t instance
|
||||||
|
*/
|
||||||
|
kernel_android_net_t *kernel_android_net_create();
|
||||||
|
|
||||||
|
#endif /** KERNEL_ANDROID_NET_H_ @}*/
|
Loading…
Reference in New Issue