diff options
Diffstat (limited to 'src/frontends')
11 files changed, 7 insertions, 40 deletions
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java index e5241d5a7..84c44c123 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java @@ -848,7 +848,6 @@ public class CharonVpnService extends VpnService implements Runnable System.loadLibrary("imcv"); } - System.loadLibrary("hydra"); System.loadLibrary("charon"); System.loadLibrary("ipsec"); } diff --git a/src/frontends/android/app/src/main/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk index d2c648088..b295320f4 100644 --- a/src/frontends/android/app/src/main/jni/Android.mk +++ b/src/frontends/android/app/src/main/jni/Android.mk @@ -71,7 +71,6 @@ strongswan_BUILD := \ libandroidbridge \ strongswan/src/libipsec \ strongswan/src/libcharon \ - strongswan/src/libhydra \ strongswan/src/libstrongswan ifneq ($(strongswan_USE_BYOD),) diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk index c56b8d5f0..31eb27f96 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk @@ -25,7 +25,6 @@ endif LOCAL_C_INCLUDES += \ $(strongswan_PATH)/src/libipsec \ - $(strongswan_PATH)/src/libhydra \ $(strongswan_PATH)/src/libcharon \ $(strongswan_PATH)/src/libstrongswan @@ -54,7 +53,7 @@ LOCAL_PRELINK_MODULE := false LOCAL_LDLIBS := -llog -LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon +LOCAL_SHARED_LIBRARIES := libstrongswan libipsec libcharon ifneq ($(strongswan_USE_BYOD),) LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c index a6412bdf7..eaba85d4e 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c @@ -37,7 +37,6 @@ static struct { { "libtnccs.so", NULL }, { "libimcv.so", NULL }, #endif - { "libhydra.so", NULL }, { "libcharon.so", NULL }, { "libipsec.so", NULL }, }; diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.c index 645b3fa9b..8015b7c38 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.c @@ -18,7 +18,6 @@ #include "android_attr.h" #include "../charonservice.h" -#include <hydra.h> #include <utils/debug.h> #include <library.h> diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.c index 908e37238..7d71da208 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.c @@ -22,7 +22,7 @@ #include "android_dns_proxy.h" -#include <hydra.h> +#include <daemon.h> #include <threading/rwlock.h> #include <collections/hashtable.h> #include <processing/jobs/callback_job.h> @@ -121,8 +121,7 @@ static int open_socket(int family) DBG1(DBG_NET, "could not open proxy socket: %s", strerror(errno)); return -1; } - if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface, - skt, family)) + if (!charon->kernel->bypass_socket(charon->kernel, skt, family)) { DBG1(DBG_NET, "installing bypass policy for proxy socket failed"); close(skt); diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c index 2655f7361..3bed6eb4d 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c @@ -35,7 +35,6 @@ #endif #include <daemon.h> -#include <hydra.h> #include <ipsec.h> #include <library.h> #include <threading/thread.h> @@ -606,17 +605,9 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean, set_options(logfile); free(logfile); - if (!libhydra_init()) - { - libhydra_deinit(); - library_deinit(); - return FALSE; - } - if (!libipsec_init()) { libipsec_deinit(); - libhydra_deinit(); library_deinit(); return FALSE; } @@ -625,7 +616,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean, { libcharon_deinit(); libipsec_deinit(); - libhydra_deinit(); library_deinit(); return FALSE; } @@ -657,7 +647,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean, libcharon_deinit(); charonservice_deinit(env); libipsec_deinit(); - libhydra_deinit(); library_deinit(); return FALSE; } @@ -687,7 +676,6 @@ JNI_METHOD(CharonVpnService, deinitializeCharon, void) libcharon_deinit(); charonservice_deinit(env); libipsec_deinit(); - libhydra_deinit(); library_deinit(); } diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c index 1eb6084db..a740303b6 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c @@ -19,7 +19,7 @@ #include <utils/debug.h> #include <library.h> -#include <hydra.h> +#include <daemon.h> #include <ipsec.h> typedef struct private_kernel_android_ipsec_t private_kernel_android_ipsec_t; @@ -42,8 +42,7 @@ struct private_kernel_android_ipsec_t { */ static void expire(u_int8_t protocol, u_int32_t spi, host_t *dst, bool hard) { - hydra->kernel_interface->expire(hydra->kernel_interface, protocol, - spi, dst, hard); + charon->kernel->expire(charon->kernel, protocol, spi, dst, hard); } METHOD(kernel_ipsec_t, get_spi, status_t, diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.c b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.c index 2ce1bdfac..acc4b75e9 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.c @@ -20,7 +20,7 @@ #include "../android_jni.h" #include "../charonservice.h" -#include <hydra.h> +#include <daemon.h> #include <processing/jobs/callback_job.h> #include <threading/mutex.h> @@ -75,7 +75,7 @@ static job_requeue_t roam_event() { /* this will fail if no connection is up */ charonservice->bypass_socket(charonservice, -1, 0); - hydra->kernel_interface->roam(hydra->kernel_interface, TRUE); + charon->kernel->roam(charon->kernel, TRUE); return JOB_REQUEUE_NONE; } diff --git a/src/frontends/osx/charon-xpc/charon-xpc.c b/src/frontends/osx/charon-xpc/charon-xpc.c index 0d8f0f455..14ce2e215 100644 --- a/src/frontends/osx/charon-xpc/charon-xpc.c +++ b/src/frontends/osx/charon-xpc/charon-xpc.c @@ -22,7 +22,6 @@ #include <errno.h> #include <library.h> -#include <hydra.h> #include <daemon.h> #include <threading/thread.h> #include <utils/backtrace.h> @@ -170,11 +169,6 @@ int main(int argc, char *argv[]) exit(SS_RC_DAEMON_INTEGRITY); } } - atexit(libhydra_deinit); - if (!libhydra_init()) - { - exit(SS_RC_INITIALIZATION_FAILED); - } atexit(libcharon_deinit); if (!libcharon_init()) { diff --git a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj index e5f222834..90e233598 100644 --- a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj +++ b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj @@ -478,7 +478,6 @@ /usr/include, ../../libstrongswan, ../../libcharon, - ../../libhydra, ); INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist"; INSTALL_PATH = /; @@ -486,7 +485,6 @@ /usr/lib, ../../libstrongswan/.libs, ../../libcharon/.libs, - ../../libhydra/.libs, ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CFLAGS = ( @@ -500,8 +498,6 @@ "-force_load", ../../libipsec/.libs/libipsec.a, "-force_load", - ../../libhydra/.libs/libhydra.a, - "-force_load", ../../libcharon/.libs/libcharon.a, "-sectcreate", __TEXT, @@ -531,7 +527,6 @@ /usr/include, ../../libstrongswan, ../../libcharon, - ../../libhydra, ); INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist"; INSTALL_PATH = /; @@ -539,7 +534,6 @@ /usr/lib, ../../libstrongswan/.libs, ../../libcharon/.libs, - ../../libhydra/.libs, ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CFLAGS = ( @@ -553,8 +547,6 @@ "-force_load", ../../libipsec/.libs/libipsec.a, "-force_load", - ../../libhydra/.libs/libhydra.a, - "-force_load", ../../libcharon/.libs/libcharon.a, "-sectcreate", __TEXT, |