Enable socket-raw on Android if pluto is enabled.

diff --git a/Android.mk.in b/Android.mk.in
index efb4f42cf226678382dcee3e79ca7e01b1edbb10..7f0a59f2fc0a58bb43564dffcfffc0861a38d44e 100644 (file)
--- a/Android.mk.in
+++ b/Android.mk.in
@@ -1,15 +1,23 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+# whether pluto (IKEv1 daemon) is built.  charon (IKEv2) is always enabled
+strongswan_BUILD_PLUTO := true
+
 # this is the list of plugins that are built into libstrongswan and charon
 # also these plugins are loaded by default (if not changed in strongswan.conf)
 strongswan_CHARON_PLUGINS := openssl fips-prf random pubkey pkcs1 \
        pem xcbc hmac kernel-netlink socket-default android \
        stroke eap-identity eap-mschapv2 eap-md5
 
+ifneq ($(strongswan_BUILD_PLUTO),)
+# if both daemons are enabled we use raw sockets in charon
+strongswan_CHARON_PLUGINS := $(subst socket-default,socket-raw, \
+                               $(strongswan_CHARON_PLUGINS))
 # plugins loaded by pluto
 strongswan_PLUTO_PLUGINS := openssl fips-prf random pubkey pkcs1 \
        pem xcbc hmac kernel-netlink xauth
+endif
 
 # list of all plugins - used to enable them with the function below
 strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \

diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index 974139ac0b976d69c299efbaaa88a7e52a477a77..03e1320b6ae12ac122ce16c5e4710cb4efd493e4 100644 (file)
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -147,6 +147,8 @@ LOCAL_SRC_FILES += $(call add_plugin, socket-default)
 
 LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic)
 
+LOCAL_SRC_FILES += $(call add_plugin, socket-raw)
+
 LOCAL_SRC_FILES += $(call add_plugin, stroke)
 ifneq ($(call plugin_enabled, stroke),)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stroke/