denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Replace android-net plugin with kernel-netlink

Browse Source 
Virtual IPs are not handled by the kernel-netlink plugin and tun devices are
ignored.
This commit is contained in:
Tobias Brunner
2013-05-03 15:11:19 +02:00
parent 67332b4e22
commit 3b7f25906e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/Android.mk
+1 -1
View File
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \ strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \
pkcs1 pkcs8 pem xcbc hmac socket-default \ pkcs1 pkcs8 pem xcbc hmac socket-default kernel-netlink \
eap-identity eap-mschapv2 eap-md5 eap-gtc eap-identity eap-mschapv2 eap-md5 eap-gtc
strongswan_PLUGINS := $(strongswan_CHARON_PLUGINS) strongswan_PLUGINS := $(strongswan_CHARON_PLUGINS)
src/frontends/android/jni/libandroidbridge/charonservice.c
+7 -2
View File
@@ -410,6 +410,13 @@ static void set_options(char *logfile)
* information */ * information */
lib->settings->set_bool(lib->settings, lib->settings->set_bool(lib->settings,
"charon.plugins.socket-default.set_source", FALSE); "charon.plugins.socket-default.set_source", FALSE);
/* don't install virtual IPs via kernel-netlink */
lib->settings->set_bool(lib->settings,
"charon.install_virtual_ip", FALSE);
/* ignore tun devices (it's mostly tun0 but it may already be taken, ignore
* some others too) */
lib->settings->set_str(lib->settings,
"charon.interfaces_ignore", "tun0, tun1, tun2, tun3, tun4");
} }
/** /**
@@ -419,8 +426,6 @@ static void charonservice_init(JNIEnv *env, jobject service, jobject builder)
{ {
private_charonservice_t *this; private_charonservice_t *this;
static plugin_feature_t features[] = { static plugin_feature_t features[] = {
PLUGIN_CALLBACK(kernel_net_register, kernel_android_net_create),
PLUGIN_PROVIDE(CUSTOM, "kernel-net"),
PLUGIN_CALLBACK(kernel_ipsec_register, kernel_android_ipsec_create), PLUGIN_CALLBACK(kernel_ipsec_register, kernel_android_ipsec_create),
PLUGIN_PROVIDE(CUSTOM, "kernel-ipsec"), PLUGIN_PROVIDE(CUSTOM, "kernel-ipsec"),
PLUGIN_CALLBACK((plugin_feature_callback_t)charonservice_register, NULL), PLUGIN_CALLBACK((plugin_feature_callback_t)charonservice_register, NULL),