android: Build libpts and init/deinit libpts in BYOD IMC

diff --git a/src/frontends/android/jni/Android.mk b/src/frontends/android/jni/Android.mk
index 781d8a1c47a9a104194435b5bb7aa66d2451c18b..0163e308d760cacdba1a2865263ce44c723daf4d 100644 (file)
--- a/src/frontends/android/jni/Android.mk
+++ b/src/frontends/android/jni/Android.mk
@@ -77,7 +77,8 @@ ifneq ($(strongswan_USE_BYOD),)
 strongswan_BUILD += \
        strongswan/src/libtnccs \
        strongswan/src/libtncif \
-       strongswan/src/libimcv
+       strongswan/src/libimcv \
+       strongswan/src/libpts
 endif
 
 include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \

diff --git a/src/frontends/android/jni/libandroidbridge/Android.mk b/src/frontends/android/jni/libandroidbridge/Android.mk
index ca154722bc99b81a8a2d9ba5d563a80d7d1ccb3b..29f95e58bee1f84510136effec8a2684cac5515c 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/Android.mk
+++ b/src/frontends/android/jni/libandroidbridge/Android.mk
@@ -34,6 +34,7 @@ LOCAL_C_INCLUDES += \
        $(strongswan_PATH)/src/libimcv \
        $(strongswan_PATH)/src/libtncif \
        $(strongswan_PATH)/src/libtnccs \
+       $(strongswan_PATH)/src/libpts \
        $(strongswan_PATH)/src/libtls
 endif
 
@@ -53,7 +54,7 @@ LOCAL_LDLIBS := -llog
 LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon
 
 ifneq ($(strongswan_USE_BYOD),)
-LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs
+LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs libpts
 endif
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/src/frontends/android/jni/libandroidbridge/byod/imc_android.c b/src/frontends/android/jni/libandroidbridge/byod/imc_android.c
index f83b6fdeb9f8ed54993424f09382565cb75d629c..06edf359aa9c9089e09129cd7673d92d63cea190 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/byod/imc_android.c
+++ b/src/frontends/android/jni/libandroidbridge/byod/imc_android.c
@@ -17,6 +17,7 @@
 #include "imc_android_state.h"
 
 #include <tnc/tnc.h>
+#include <libpts.h>
 #include <imc/imc_agent.h>
 #include <imc/imc_msg.h>
 #include <pa_tnc/pa_tnc_msg.h>
@@ -64,6 +65,8 @@ TNC_Result TNC_IMC_Initialize(TNC_IMCID imc_id,
                return TNC_RESULT_FATAL;
        }
 
+       libpts_init();
+
        if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1)
        {
                DBG1(DBG_IMC, "no common IF-IMC version");
@@ -352,6 +355,8 @@ TNC_Result TNC_IMC_Terminate(TNC_IMCID imc_id)
                DBG1(DBG_IMC, "IMC \"%s\" has not been initialized", imc_name);
                return TNC_RESULT_NOT_INITIALIZED;
        }
+       /* has to be done before destroying the agent / deinitializing libimcv */
+       libpts_deinit();
        imc_android->destroy(imc_android);
        imc_android = NULL;
        return TNC_RESULT_SUCCESS;

diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index 5670131abed494be74b8194c736c3cda68bc4d11..f08a481355deb067014bfd84f4727492b8c4edfc 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -606,6 +606,7 @@ public class CharonVpnService extends VpnService implements Runnable
                        System.loadLibrary("tncif");
                        System.loadLibrary("tnccs");
                        System.loadLibrary("imcv");
+                       System.loadLibrary("pts");
                }
 
                System.loadLibrary("hydra");