From 0ad58f013a608e1292c32d72ec09b241258aabd7 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 13 Oct 2011 19:25:06 +0200
Subject: [PATCH] Enable socket-raw on Android if pluto is enabled.

---
 Android.mk.in            | 8 ++++++++
 src/libcharon/Android.mk | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/Android.mk.in b/Android.mk.in
index efb4f42cf..7f0a59f2f 100644
--- 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 974139ac0..03e1320b6 100644
--- 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/