Load libipsec in Android app.

2012-08-08 15:12:24 +02:00
parent b70139fbfd
commit 06ed785e5a
4 changed files with 15 additions and 1 deletions
@@ -18,6 +18,7 @@
 #include <jni.h>

 #include <hydra.h>
+#include <ipsec.h>
 #include <daemon.h>
 #include <library.h>

@@ -88,10 +89,19 @@ JNI_METHOD(CharonVpnService, initializeCharon, void)
 		return;
 	}

+	if (!libipsec_init())
+	{
+		libipsec_deinit();
+		libhydra_deinit();
+		library_deinit();
+		return;
+	}
+
 	if (!libcharon_init("charon") ||
 		!charon->initialize(charon, PLUGINS))
 	{
 		libcharon_deinit();
+		libipsec_deinit();
 		libhydra_deinit();
 		library_deinit();
 		return;
@@ -107,6 +117,7 @@ JNI_METHOD(CharonVpnService, initializeCharon, void)
 JNI_METHOD(CharonVpnService, deinitializeCharon, void)
 {
 	libcharon_deinit();
+	libipsec_deinit();
 	libhydra_deinit();
 	library_deinit();
 }