]> git.ipfire.org Git - people/ms/strongswan.git/commitdiff
Moved tnc-tnccs, tnc-imc, tnccs-11, tnccs-20 and tnccs-dynamic libcharon plugins...
authorAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 8 Aug 2013 09:02:17 +0000 (11:02 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 15 Aug 2013 21:34:22 +0000 (23:34 +0200)
73 files changed:
configure.ac
src/checksum/Makefile.am
src/checksum/checksum_builder.c
src/libcharon/Makefile.am
src/libpttls/pt_tls.c
src/libpttls/pt_tls.h
src/libtnccs/Makefile.am
src/libtnccs/plugins/tnc_imc/Makefile.am [moved from src/libcharon/plugins/tnc_imc/Makefile.am with 90% similarity]
src/libtnccs/plugins/tnc_imc/tnc_imc.c [moved from src/libcharon/plugins/tnc_imc/tnc_imc.c with 99% similarity]
src/libtnccs/plugins/tnc_imc/tnc_imc.h [moved from src/libcharon/plugins/tnc_imc/tnc_imc.h with 100% similarity]
src/libtnccs/plugins/tnc_imc/tnc_imc_bind_function.c [moved from src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c with 100% similarity]
src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c [moved from src/libcharon/plugins/tnc_imc/tnc_imc_manager.c with 99% similarity]
src/libtnccs/plugins/tnc_imc/tnc_imc_manager.h [moved from src/libcharon/plugins/tnc_imc/tnc_imc_manager.h with 100% similarity]
src/libtnccs/plugins/tnc_imc/tnc_imc_plugin.c [moved from src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c with 100% similarity]
src/libtnccs/plugins/tnc_imc/tnc_imc_plugin.h [moved from src/libcharon/plugins/tnc_imc/tnc_imc_plugin.h with 100% similarity]
src/libtnccs/plugins/tnc_tnccs/Makefile.am [moved from src/libcharon/plugins/tnc_tnccs/Makefile.am with 100% similarity]
src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_manager.c [moved from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c with 100% similarity]
src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_manager.h [moved from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.h with 100% similarity]
src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_plugin.c [moved from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c with 100% similarity]
src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_plugin.h [moved from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/Makefile.am [moved from src/libcharon/plugins/tnccs_11/Makefile.am with 94% similarity]
src/libtnccs/plugins/tnccs_11/batch/tnccs_batch.c [moved from src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/batch/tnccs_batch.h [moved from src/libcharon/plugins/tnccs_11/batch/tnccs_batch.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/imc_imv_msg.c [moved from src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/imc_imv_msg.h [moved from src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_error_msg.c [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_error_msg.h [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.c [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.h [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_recommendation_msg.c [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_recommendation_msg.h [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h [moved from src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/tnccs_11.c [moved from src/libcharon/plugins/tnccs_11/tnccs_11.c with 99% similarity]
src/libtnccs/plugins/tnccs_11/tnccs_11.h [moved from src/libcharon/plugins/tnccs_11/tnccs_11.h with 100% similarity]
src/libtnccs/plugins/tnccs_11/tnccs_11_plugin.c [moved from src/libcharon/plugins/tnccs_11/tnccs_11_plugin.c with 100% similarity]
src/libtnccs/plugins/tnccs_11/tnccs_11_plugin.h [moved from src/libcharon/plugins/tnccs_11/tnccs_11_plugin.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/Makefile.am [moved from src/libcharon/plugins/tnccs_20/Makefile.am with 95% similarity]
src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c [moved from src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.h [moved from src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_access_recommendation_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_access_recommendation_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_assessment_result_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_assessment_result_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_error_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_error_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_error_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_experimental_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_experimental_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_language_preference_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_language_preference_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_pa_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_pa_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_reason_string_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_reason_string_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.c [moved from src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.h [moved from src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c [moved from src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h [moved from src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/tnccs_20.c [moved from src/libcharon/plugins/tnccs_20/tnccs_20.c with 99% similarity]
src/libtnccs/plugins/tnccs_20/tnccs_20.h [moved from src/libcharon/plugins/tnccs_20/tnccs_20.h with 100% similarity]
src/libtnccs/plugins/tnccs_20/tnccs_20_plugin.c [moved from src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c with 100% similarity]
src/libtnccs/plugins/tnccs_20/tnccs_20_plugin.h [moved from src/libcharon/plugins/tnccs_20/tnccs_20_plugin.h with 100% similarity]
src/libtnccs/plugins/tnccs_dynamic/Makefile.am [moved from src/libcharon/plugins/tnccs_dynamic/Makefile.am with 100% similarity]
src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic.c [moved from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c with 100% similarity]
src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic.h [moved from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.h with 100% similarity]
src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c [moved from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c with 100% similarity]
src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h [moved from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h with 100% similarity]

index 7b23a9cb513da900e82e58fd28b1f489f51eecd7..fb91ddd827fb9036631914e419b618d412c7513a 100644 (file)
@@ -969,10 +969,11 @@ nm_plugins=
 cmd_plugins=
 
 # location specific lists for checksumming,
-# for src/libcharon, src/libhydra and src/libstrongswan
+# for src/libcharon, src/libhydra, src/libstrongswan and src/libtnccs
 c_plugins=
 h_plugins=
 s_plugins=
+t_plugins=
 
 ADD_PLUGIN([test-vectors],         [s charon openac scepclient pki])
 ADD_PLUGIN([curl],                 [s charon scepclient scripts nm cmd])
@@ -1060,12 +1061,12 @@ ADD_PLUGIN([xauth-pam],            [c charon])
 ADD_PLUGIN([xauth-noauth],         [c charon])
 ADD_PLUGIN([tnc-ifmap],            [c charon])
 ADD_PLUGIN([tnc-pdp],              [c charon])
-ADD_PLUGIN([tnc-imc],              [c charon])
+ADD_PLUGIN([tnc-imc],              [t charon])
 ADD_PLUGIN([tnc-imv],              [c charon])
-ADD_PLUGIN([tnc-tnccs],            [c charon])
-ADD_PLUGIN([tnccs-20],             [c charon])
-ADD_PLUGIN([tnccs-11],             [c charon])
-ADD_PLUGIN([tnccs-dynamic],        [c charon])
+ADD_PLUGIN([tnc-tnccs],            [t charon])
+ADD_PLUGIN([tnccs-20],             [t charon])
+ADD_PLUGIN([tnccs-11],             [t charon])
+ADD_PLUGIN([tnccs-dynamic],        [t charon])
 ADD_PLUGIN([medsrv],               [c charon])
 ADD_PLUGIN([medcli],               [c charon])
 ADD_PLUGIN([dhcp],                 [c charon])
@@ -1104,6 +1105,7 @@ AC_SUBST(cmd_plugins)
 AC_SUBST(c_plugins)
 AC_SUBST(h_plugins)
 AC_SUBST(s_plugins)
+AC_SUBST(t_plugins)
 
 # ======================
 #  set Makefile.am vars
@@ -1374,6 +1376,11 @@ AC_CONFIG_FILES([
        src/libradius/Makefile
        src/libtncif/Makefile
        src/libtnccs/Makefile
+       src/libtnccs/plugins/tnc_tnccs/Makefile
+       src/libtnccs/plugins/tnc_imc/Makefile
+       src/libtnccs/plugins/tnccs_11/Makefile
+       src/libtnccs/plugins/tnccs_20/Makefile
+       src/libtnccs/plugins/tnccs_dynamic/Makefile
        src/libpttls/Makefile
        src/libpts/Makefile
        src/libpts/plugins/imc_attestation/Makefile
@@ -1414,12 +1421,7 @@ AC_CONFIG_FILES([
        src/libcharon/plugins/xauth_noauth/Makefile
        src/libcharon/plugins/tnc_ifmap/Makefile
        src/libcharon/plugins/tnc_pdp/Makefile
-       src/libcharon/plugins/tnc_imc/Makefile
        src/libcharon/plugins/tnc_imv/Makefile
-       src/libcharon/plugins/tnc_tnccs/Makefile
-       src/libcharon/plugins/tnccs_11/Makefile
-       src/libcharon/plugins/tnccs_20/Makefile
-       src/libcharon/plugins/tnccs_dynamic/Makefile
        src/libcharon/plugins/socket_default/Makefile
        src/libcharon/plugins/socket_dynamic/Makefile
        src/libcharon/plugins/farp/Makefile
@@ -1484,4 +1486,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([])
index ddb0ea65b8e1033c6cb59be83acdb48b5c48ff8f..0ab66c6c8baf55cd121c3f10f99534c5c3a0b371 100644 (file)
@@ -57,9 +57,17 @@ if USE_RADIUS
   libs += $(DESTDIR)$(ipseclibdir)/libradius.so
 endif
 
+if USE_LIBPTTLS
+  deps += $(top_builddir)/src/libpttls/libpttls.la
+  libs += $(DESTDIR)$(ipseclibdir)/libpttls.so
+endif
+
 if USE_LIBTNCCS
   deps += $(top_builddir)/src/libtnccs/libtnccs.la
   libs += $(DESTDIR)$(ipseclibdir)/libtnccs.so
+if !MONOLITHIC
+  AM_CPPFLAGS += -DT_PLUGINS=\""${t_plugins}\""
+endif
 endif
 
 if USE_SIMAKA
index 0d9e8fd85c5ef7c0bfa50e5ac1fe0ef4d581d42b..bccd269cf14b5d91dc2c5d5fc979b058b8993caf 100644 (file)
@@ -165,8 +165,8 @@ int main(int argc, char* argv[])
 #ifdef H_PLUGINS
        build_plugin_checksums(H_PLUGINS);
 #endif
-#ifdef P_PLUGINS
-       build_plugin_checksums(P_PLUGINS);
+#ifdef T_PLUGINS
+       build_plugin_checksums(T_PLUGINS);
 #endif
 #ifdef C_PLUGINS
        build_plugin_checksums(C_PLUGINS);
index 10d0b04cbe7f7883f8101fe8f672715d00c73956..65e344a70f56fd883221f15408e7cda1143313d5 100644 (file)
@@ -385,13 +385,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_TNC_IMC
-  SUBDIRS += plugins/tnc_imc
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/tnc_imc/libstrongswan-tnc-imc.la
-endif
-endif
-
 if USE_TNC_IMV
   SUBDIRS += plugins/tnc_imv
 if MONOLITHIC
@@ -399,34 +392,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_TNC_TNCCS
-  SUBDIRS += plugins/tnc_tnccs
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/tnc_tnccs/libstrongswan-tnc-tnccs.la
-endif
-endif
-
-if USE_TNCCS_11
-  SUBDIRS += plugins/tnccs_11
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/tnccs_11/libstrongswan-tnccs-11.la
-endif
-endif
-
-if USE_TNCCS_20
-  SUBDIRS += plugins/tnccs_20
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/tnccs_20/libstrongswan-tnccs-20.la
-endif
-endif
-
-if USE_TNCCS_DYNAMIC
-  SUBDIRS += plugins/tnccs_dynamic
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/tnccs_dynamic/libstrongswan-tnccs-dynamic.la
-endif
-endif
-
 if USE_LIBTNCCS
 if MONOLITHIC
   # otherwise this library is linked to the respective plugins
index 0fee343b88c7fd1debd6147a92db1517ddaac969..034bf6c50752586bced81c4a551f990aac69b56c 100644 (file)
 
 #include <utils/debug.h>
 
+/**
+ * Described in header.
+ */
+void libpttls_init(void)
+{
+       /* empty */
+}
+
 /*
  * PT-TNC Message format:
  *                       1                   2                   3
index 7384cf2d5b08cace8447ddb2cc016e95c6735eb7..0f1f124a80502c6f61bf1c07daae3ac5ca50a988 100644 (file)
@@ -111,4 +111,13 @@ bio_reader_t* pt_tls_read(tls_socket_t *tls, u_int32_t *vendor,
 bool pt_tls_write(tls_socket_t *tls, bio_writer_t *writer,
                                  pt_tls_message_type_t type, u_int32_t identifier);
 
+/**
+ * @}
+ * @addtogroup libpttls
+ * @{
+ *
+ * Dummy libpttls initialization function needed for integrity test
+ */
+void libpttls_init(void);
+
 #endif /** PT_TLS_H_ @}*/
index 720505757fb730b8bc3269a51b5abcd0bc56c167..8d618c3f8bebdb6a3cbce9593988e3a58c686b0b 100644 (file)
@@ -16,3 +16,49 @@ tnc/tnccs/tnccs.h tnc/tnccs/tnccs.c \
 tnc/tnccs/tnccs_manager.h tnc/tnccs/tnccs_manager.c
 
 EXTRA_DIST = Android.mk
+
+# build optional plugins
+########################
+
+if MONOLITHIC
+SUBDIRS =
+else
+SUBDIRS = .
+endif
+
+if USE_TNC_TNCCS
+  SUBDIRS += plugins/tnc_tnccs
+if MONOLITHIC
+  libtnccs_la_LIBADD += plugins/tnc_tnccs/libstrongswan-tnc-tnccs.la
+endif
+endif
+
+if USE_TNC_IMC
+  SUBDIRS += plugins/tnc_imc
+if MONOLITHIC
+  libtnccs_la_LIBADD += plugins/tnc_imc/libstrongswan-tnc-imc.la
+endif
+endif
+
+if USE_TNCCS_11
+  SUBDIRS += plugins/tnccs_11
+if MONOLITHIC
+  libtnccs_la_LIBADD += plugins/tnccs_11/libstrongswan-tnccs-11.la
+endif
+endif
+
+if USE_TNCCS_20
+  SUBDIRS += plugins/tnccs_20
+if MONOLITHIC
+  libtnccs_la_LIBADD += plugins/tnccs_20/libstrongswan-tnccs-20.la
+endif
+endif
+
+if USE_TNCCS_DYNAMIC
+  SUBDIRS += plugins/tnccs_dynamic
+if MONOLITHIC
+  libtnccs_la_LIBADD += plugins/tnccs_dynamic/libstrongswan-tnccs-dynamic.la
+endif
+endif
+
+
similarity index 90%
rename from src/libcharon/plugins/tnc_imc/Makefile.am
rename to src/libtnccs/plugins/tnc_imc/Makefile.am
index 6e2b83fa0024c0941308d73cb386fe39baa67868..b2c26cbffb9a5c5a97ed56f714fea38236ca043e 100644 (file)
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtnccs \
        -I$(top_srcdir)/src/libtls
similarity index 99%
rename from src/libcharon/plugins/tnc_imc/tnc_imc.c
rename to src/libtnccs/plugins/tnc_imc/tnc_imc.c
index 122554abe76c810a0eca008ac84f51c94eb83796..cbecf14c7f76e4e45114700e9b35c1bddd011351 100644 (file)
@@ -303,7 +303,7 @@ METHOD(imc_t, destroy, void,
        private_tnc_imc_t *this)
 {
        if (this->handle && lib->settings->get_bool(lib->settings,
-               "%s.plugins.tnc-imc.dlclose", TRUE, "charon"))
+               "libtnccs.plugins.tnc-imc.dlclose", TRUE))
        {
                dlclose(this->handle);
        }
similarity index 99%
rename from src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
rename to src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c
index b34a6ffd8f75c3d114b07a05f99c19a263de1e59..311598fa96a5275d57bc3e83764b483848c9db6c 100644 (file)
@@ -224,7 +224,7 @@ METHOD(imc_manager_t, get_preferred_language, char*,
        private_tnc_imc_manager_t *this)
 {
        return lib->settings->get_str(lib->settings,
-                               "%s.plugins.tnc-imc.preferred_language", "en", "charon");
+                               "libtnccs.plugins.tnc-imc.preferred_language", "en");
 }
 
 METHOD(imc_manager_t, notify_connection_change, void,
similarity index 94%
rename from src/libcharon/plugins/tnccs_11/Makefile.am
rename to src/libtnccs/plugins/tnccs_11/Makefile.am
index 4c0e0f7c8b8f9d6f25f63b8edc2e8fa21f4285aa..cbe0b8e1943a856760282f537e7134bec23bfe9d 100644 (file)
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libcharon \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtnccs
similarity index 99%
rename from src/libcharon/plugins/tnccs_11/tnccs_11.c
rename to src/libtnccs/plugins/tnccs_11/tnccs_11.c
index 53817c7102568de601eb9a7735c285fd875d1f28..b19a048fedb19b916d45cad1b93cb5d04dabaa01 100644 (file)
@@ -32,7 +32,6 @@
 #include <tnc/tnccs/tnccs_manager.h>
 
 #include <utils/debug.h>
-#include <daemon.h>
 #include <threading/mutex.h>
 
 typedef struct private_tnccs_11_t private_tnccs_11_t;
@@ -625,8 +624,7 @@ tnccs_t* tnccs_11_create(bool is_server,
                .transport = transport,
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
                .max_msg_len = lib->settings->get_int(lib->settings,
-                                                               "%s.plugins.tnccs-11.max_message_size", 45000,
-                                                               charon->name),
+                                                       "libtnccs.plugins.tnccs-11.max_message_size", 45000),
        );
 
        return &this->public;
similarity index 95%
rename from src/libcharon/plugins/tnccs_20/Makefile.am
rename to src/libtnccs/plugins/tnccs_20/Makefile.am
index 7a2b6c9c2060607671fadd9a205c9473b4bb158d..c268f5971ee6c9d4917647f23971af6d0b205a5e 100644 (file)
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libcharon \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtnccs
similarity index 99%
rename from src/libcharon/plugins/tnccs_20/tnccs_20.c
rename to src/libtnccs/plugins/tnccs_20/tnccs_20.c
index 55f33c14370b004693a48b459dd4391f18caee02..09900ade966d246f7b2e81ffa929b75cbb3e2ed7 100644 (file)
@@ -932,11 +932,9 @@ tnccs_t* tnccs_20_create(bool is_server,
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
                .messages = linked_list_create(),
                .max_batch_len = lib->settings->get_int(lib->settings,
-                                                               "%s.plugins.tnccs-20.max_batch_size", 65522,
-                                                               "charon"),
+                                                       "libtnccs.plugins.tnccs-20.max_batch_size", 65522),
                .max_msg_len = lib->settings->get_int(lib->settings,
-                                                               "%s.plugins.tnccs-20.max_message_size", 65490,
-                                                               "charon"),
+                                                       "libtnccs.plugins.tnccs-20.max_message_size", 65490),
        );
 
        return &this->public;