From dec9e1957feb56c854bc24a657a6a378d74317f6 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 12 Feb 2016 15:21:54 +0100 Subject: [PATCH] libhydra: Move all kernel plugins to libcharon --- configure.ac | 25 ++++++++----------- src/libcharon/Android.mk | 4 +++ src/libcharon/Makefile.am | 21 ++++++++++++++++ .../plugins/kernel_netlink/.gitignore | 0 .../plugins/kernel_netlink/Makefile.am | 0 .../kernel_netlink/kernel_netlink_ipsec.c | 0 .../kernel_netlink/kernel_netlink_ipsec.h | 0 .../kernel_netlink/kernel_netlink_net.c | 0 .../kernel_netlink/kernel_netlink_net.h | 0 .../kernel_netlink/kernel_netlink_plugin.c | 0 .../kernel_netlink/kernel_netlink_plugin.h | 2 +- .../kernel_netlink/kernel_netlink_shared.c | 0 .../kernel_netlink/kernel_netlink_shared.h | 0 .../kernel_netlink/suites/test_socket.c | 0 .../plugins/kernel_netlink/tests.c | 0 .../plugins/kernel_netlink/tests.h | 0 .../plugins/kernel_pfkey/Makefile.am | 0 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 0 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.h | 0 .../kernel_pfkey/kernel_pfkey_plugin.c | 0 .../kernel_pfkey/kernel_pfkey_plugin.h | 2 +- .../plugins/kernel_pfroute/Makefile.am | 0 .../kernel_pfroute/kernel_pfroute_net.c | 0 .../kernel_pfroute/kernel_pfroute_net.h | 0 .../kernel_pfroute/kernel_pfroute_plugin.c | 0 .../kernel_pfroute/kernel_pfroute_plugin.h | 2 +- src/libhydra/Android.mk | 4 --- src/libhydra/Makefile.am | 21 ---------------- 28 files changed, 38 insertions(+), 43 deletions(-) rename src/{libhydra => libcharon}/plugins/kernel_netlink/.gitignore (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/Makefile.am (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_ipsec.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_ipsec.h (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_net.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_net.h (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_plugin.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_plugin.h (98%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_shared.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/kernel_netlink_shared.h (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/suites/test_socket.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/tests.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_netlink/tests.h (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfkey/Makefile.am (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfkey/kernel_pfkey_ipsec.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfkey/kernel_pfkey_ipsec.h (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfkey/kernel_pfkey_plugin.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfkey/kernel_pfkey_plugin.h (98%) rename src/{libhydra => libcharon}/plugins/kernel_pfroute/Makefile.am (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfroute/kernel_pfroute_net.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfroute/kernel_pfroute_net.h (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfroute/kernel_pfroute_plugin.c (100%) rename src/{libhydra => libcharon}/plugins/kernel_pfroute/kernel_pfroute_plugin.h (98%) diff --git a/configure.ac b/configure.ac index 6278076bf..b1c91e2ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1280,9 +1280,8 @@ cmd_plugins= aikgen_plugins= # location specific lists for checksumming, -# for src/libcharon, src/libhydra, src/libstrongswan and src/libtnccs +# for src/libcharon, src/libstrongswan and src/libtnccs c_plugins= -h_plugins= s_plugins= t_plugins= @@ -1347,9 +1346,9 @@ ADD_PLUGIN([load-tester], [c charon]) ADD_PLUGIN([kernel-libipsec], [c charon cmd]) ADD_PLUGIN([kernel-wfp], [c charon]) ADD_PLUGIN([kernel-iph], [c charon]) -ADD_PLUGIN([kernel-pfkey], [h charon starter nm cmd]) -ADD_PLUGIN([kernel-pfroute], [h charon starter nm cmd]) -ADD_PLUGIN([kernel-netlink], [h charon starter nm cmd]) +ADD_PLUGIN([kernel-pfkey], [c charon starter nm cmd]) +ADD_PLUGIN([kernel-pfroute], [c charon starter nm cmd]) +ADD_PLUGIN([kernel-netlink], [c charon starter nm cmd]) ADD_PLUGIN([resolve], [c charon cmd]) ADD_PLUGIN([socket-default], [c charon nm cmd]) ADD_PLUGIN([socket-dynamic], [c charon cmd]) @@ -1511,6 +1510,9 @@ AM_CONDITIONAL(USE_UPDOWN, test x$updown = xtrue) AM_CONDITIONAL(USE_DHCP, test x$dhcp = xtrue) AM_CONDITIONAL(USE_LOAD_TESTER, test x$load_tester = xtrue) AM_CONDITIONAL(USE_HA, test x$ha = xtrue) +AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue) +AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue) +AM_CONDITIONAL(USE_KERNEL_PFROUTE, test x$kernel_pfroute = xtrue) AM_CONDITIONAL(USE_KERNEL_LIBIPSEC, test x$kernel_libipsec = xtrue) AM_CONDITIONAL(USE_KERNEL_WFP, test x$kernel_wfp = xtrue) AM_CONDITIONAL(USE_KERNEL_IPH, test x$kernel_iph = xtrue) @@ -1578,12 +1580,6 @@ AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue) AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue) AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue) -# hydra plugins -# --------------- -AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue) -AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue) -AM_CONDITIONAL(USE_KERNEL_PFROUTE, test x$kernel_pfroute = xtrue) - # other options # --------------- AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue) @@ -1749,9 +1745,6 @@ AC_CONFIG_FILES([ src/libstrongswan/plugins/test_vectors/Makefile src/libstrongswan/tests/Makefile src/libhydra/Makefile - src/libhydra/plugins/kernel_netlink/Makefile - src/libhydra/plugins/kernel_pfkey/Makefile - src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/tests/Makefile src/libipsec/Makefile src/libipsec/tests/Makefile @@ -1828,6 +1821,9 @@ AC_CONFIG_FILES([ src/libcharon/plugins/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile + src/libcharon/plugins/kernel_netlink/Makefile + src/libcharon/plugins/kernel_pfkey/Makefile + src/libcharon/plugins/kernel_pfroute/Makefile src/libcharon/plugins/kernel_libipsec/Makefile src/libcharon/plugins/kernel_wfp/Makefile src/libcharon/plugins/kernel_iph/Makefile @@ -1922,6 +1918,5 @@ AC_MSG_RESULT([-----------------------------------------------------]) AC_MSG_RESULT([libstrongswan:$s_plugins]) AC_MSG_RESULT([libcharon: $c_plugins]) -AC_MSG_RESULT([libhydra: $h_plugins]) AC_MSG_RESULT([libtnccs: $t_plugins]) AC_MSG_RESULT([]) diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk index 10085794b..65d0e2b11 100644 --- a/src/libcharon/Android.mk +++ b/src/libcharon/Android.mk @@ -216,6 +216,10 @@ endif LOCAL_SRC_FILES += $(call add_plugin, load-tester) +LOCAL_SRC_FILES += $(call add_plugin, kernel-pfkey) + +LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink) + LOCAL_SRC_FILES += $(call add_plugin, socket-default) LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic) diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index 66fce811e..0eee3c28d 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -512,6 +512,27 @@ if MONOLITHIC endif endif +if USE_KERNEL_PFKEY + SUBDIRS += plugins/kernel_pfkey +if MONOLITHIC + libcharon_la_LIBADD += plugins/kernel_pfkey/libstrongswan-kernel-pfkey.la +endif +endif + +if USE_KERNEL_PFROUTE + SUBDIRS += plugins/kernel_pfroute +if MONOLITHIC + libcharon_la_LIBADD += plugins/kernel_pfroute/libstrongswan-kernel-pfroute.la +endif +endif + +if USE_KERNEL_NETLINK + SUBDIRS += plugins/kernel_netlink +if MONOLITHIC + libcharon_la_LIBADD += plugins/kernel_netlink/libstrongswan-kernel-netlink.la +endif +endif + if USE_KERNEL_LIBIPSEC SUBDIRS += plugins/kernel_libipsec if MONOLITHIC diff --git a/src/libhydra/plugins/kernel_netlink/.gitignore b/src/libcharon/plugins/kernel_netlink/.gitignore similarity index 100% rename from src/libhydra/plugins/kernel_netlink/.gitignore rename to src/libcharon/plugins/kernel_netlink/.gitignore diff --git a/src/libhydra/plugins/kernel_netlink/Makefile.am b/src/libcharon/plugins/kernel_netlink/Makefile.am similarity index 100% rename from src/libhydra/plugins/kernel_netlink/Makefile.am rename to src/libcharon/plugins/kernel_netlink/Makefile.am diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c similarity index 100% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.h similarity index 100% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.h rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.h diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c similarity index 100% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.h similarity index 100% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_net.h rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_net.h diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c similarity index 100% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.c rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.h similarity index 98% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.h rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.h index a795486ca..74c9ae24f 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.h +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.h @@ -15,7 +15,7 @@ /** * @defgroup kernel_netlink kernel_netlink - * @ingroup hplugins + * @ingroup cplugins * * @defgroup kernel_netlink_plugin kernel_netlink_plugin * @{ @ingroup kernel_netlink diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c similarity index 100% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h similarity index 100% rename from src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.h rename to src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h diff --git a/src/libhydra/plugins/kernel_netlink/suites/test_socket.c b/src/libcharon/plugins/kernel_netlink/suites/test_socket.c similarity index 100% rename from src/libhydra/plugins/kernel_netlink/suites/test_socket.c rename to src/libcharon/plugins/kernel_netlink/suites/test_socket.c diff --git a/src/libhydra/plugins/kernel_netlink/tests.c b/src/libcharon/plugins/kernel_netlink/tests.c similarity index 100% rename from src/libhydra/plugins/kernel_netlink/tests.c rename to src/libcharon/plugins/kernel_netlink/tests.c diff --git a/src/libhydra/plugins/kernel_netlink/tests.h b/src/libcharon/plugins/kernel_netlink/tests.h similarity index 100% rename from src/libhydra/plugins/kernel_netlink/tests.h rename to src/libcharon/plugins/kernel_netlink/tests.h diff --git a/src/libhydra/plugins/kernel_pfkey/Makefile.am b/src/libcharon/plugins/kernel_pfkey/Makefile.am similarity index 100% rename from src/libhydra/plugins/kernel_pfkey/Makefile.am rename to src/libcharon/plugins/kernel_pfkey/Makefile.am diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c similarity index 100% rename from src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.h b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.h similarity index 100% rename from src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.h rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.h diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c similarity index 100% rename from src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.h b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.h similarity index 98% rename from src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.h rename to src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.h index 51db4d8d3..ecccc6303 100644 --- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.h +++ b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.h @@ -15,7 +15,7 @@ /** * @defgroup kernel_pfkey kernel_pfkey - * @ingroup hplugins + * @ingroup cplugins * * @defgroup kernel_pfkey_plugin kernel_pfkey_plugin * @{ @ingroup kernel_pfkey diff --git a/src/libhydra/plugins/kernel_pfroute/Makefile.am b/src/libcharon/plugins/kernel_pfroute/Makefile.am similarity index 100% rename from src/libhydra/plugins/kernel_pfroute/Makefile.am rename to src/libcharon/plugins/kernel_pfroute/Makefile.am diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c similarity index 100% rename from src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.h b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.h similarity index 100% rename from src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.h rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.h diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_plugin.c b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c similarity index 100% rename from src/libhydra/plugins/kernel_pfroute/kernel_pfroute_plugin.c rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_plugin.h b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.h similarity index 98% rename from src/libhydra/plugins/kernel_pfroute/kernel_pfroute_plugin.h rename to src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.h index b8ee31a1d..50642a572 100644 --- a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_plugin.h +++ b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.h @@ -15,7 +15,7 @@ /** * @defgroup kernel_pfroute kernel_pfroute - * @ingroup hplugins + * @ingroup cplugins * * @defgroup kernel_pfroute_plugin kernel_pfroute_plugin * @{ @ingroup kernel_pfroute diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk index 7b62e9529..938f5ec96 100644 --- a/src/libhydra/Android.mk +++ b/src/libhydra/Android.mk @@ -13,10 +13,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(libhydra_la_SOURCES)) # adding the plugin source files -LOCAL_SRC_FILES += $(call add_plugin, kernel-pfkey) - -LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink) - # build libhydra --------------------------------------------------------------- LOCAL_C_INCLUDES += \ diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am index 9cdbc0147..28303fc70 100644 --- a/src/libhydra/Makefile.am +++ b/src/libhydra/Makefile.am @@ -33,27 +33,6 @@ else SUBDIRS = . endif -if USE_KERNEL_PFKEY - SUBDIRS += plugins/kernel_pfkey -if MONOLITHIC - libhydra_la_LIBADD += plugins/kernel_pfkey/libstrongswan-kernel-pfkey.la -endif -endif - -if USE_KERNEL_PFROUTE - SUBDIRS += plugins/kernel_pfroute -if MONOLITHIC - libhydra_la_LIBADD += plugins/kernel_pfroute/libstrongswan-kernel-pfroute.la -endif -endif - -if USE_KERNEL_NETLINK - SUBDIRS += plugins/kernel_netlink -if MONOLITHIC - libhydra_la_LIBADD += plugins/kernel_netlink/libstrongswan-kernel-netlink.la -endif -endif - if MONOLITHIC SUBDIRS += . endif