libtnccs: Move settings to <ns>.tnc and <ns>.plugins with fallback

diff --git a/src/libtnccs/plugins/tnc_imc/tnc_imc.c b/src/libtnccs/plugins/tnc_imc/tnc_imc.c
index 7c52ab384d89df05672078991b5754629e7d1854..2d556d9d9f71462ea59699489b6cd70d4436e5c6 100644 (file)
--- a/src/libtnccs/plugins/tnc_imc/tnc_imc.c
+++ b/src/libtnccs/plugins/tnc_imc/tnc_imc.c
@@ -302,7 +302,7 @@ METHOD(imc_t, destroy, void,
        private_tnc_imc_t *this)
 {
        if (this->handle && lib->settings->get_bool(lib->settings,
-               "libtnccs.plugins.tnc-imc.dlclose", TRUE))
+               "%s.plugins.tnc-imc.dlclose", TRUE, lib->ns))
        {
                dlclose(this->handle);
        }

diff --git a/src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c b/src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c
index 311598fa96a5275d57bc3e83764b483848c9db6c..459b6d710ddf794c4eb9e5dcba38e66a82e94e85 100644 (file)
--- a/src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c
+++ b/src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c
@@ -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,
-                               "libtnccs.plugins.tnc-imc.preferred_language", "en");
+                               "%s.plugins.tnc-imc.preferred_language", "en", lib->ns);
 }
 
 METHOD(imc_manager_t, notify_connection_change, void,

diff --git a/src/libtnccs/plugins/tnc_imv/tnc_imv.c b/src/libtnccs/plugins/tnc_imv/tnc_imv.c
index ebf90451311c67bdab6134e834e8bcd8b52538eb..ab2e55253121f5972e8c6f7139f5a7f079c7230a 100644 (file)
--- a/src/libtnccs/plugins/tnc_imv/tnc_imv.c
+++ b/src/libtnccs/plugins/tnc_imv/tnc_imv.c
@@ -298,7 +298,7 @@ METHOD(imv_t, destroy, void,
        private_tnc_imv_t *this)
 {
        if (this->handle && lib->settings->get_bool(lib->settings,
-                               "libtnccs.plugins.tnc-imv.dlclose", TRUE))
+                               "%s.plugins.tnc-imv.dlclose", TRUE, lib->ns))
        {
                dlclose(this->handle);
        }

diff --git a/src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c b/src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c
index 12ea20319d28abe0258174013d48032d82379beb..56245015b95155b301bf8edd217eea4e0e05afa5 100644 (file)
--- a/src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c
+++ b/src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c
@@ -460,7 +460,8 @@ imv_manager_t* tnc_imv_manager_create(void)
 
        policy = enum_from_name(recommendation_policy_names,
                                lib->settings->get_str(lib->settings,
-                                       "libtnccs.plugins.tnc-imv.recommendation_policy", "default"));
+                                       "%s.plugins.tnc-imv.recommendation_policy",
+                                       "default", lib->ns));
        this->policy = (policy != -1) ? policy : RECOMMENDATION_POLICY_DEFAULT;
        DBG1(DBG_TNC, "TNC recommendation policy is '%N'",
                                   recommendation_policy_names, this->policy);

diff --git a/src/libtnccs/plugins/tnccs_11/tnccs_11.c b/src/libtnccs/plugins/tnccs_11/tnccs_11.c
index 91854b58757a64432d54f27079041b3128837a35..28c5e52b7b7f13da993f28de08337fa50c668794 100644 (file)
--- a/src/libtnccs/plugins/tnccs_11/tnccs_11.c
+++ b/src/libtnccs/plugins/tnccs_11/tnccs_11.c
@@ -662,7 +662,7 @@ tnccs_t* tnccs_11_create(bool is_server,
                .callback = cb,
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
                .max_msg_len = lib->settings->get_int(lib->settings,
-                                                       "libtnccs.plugins.tnccs-11.max_message_size", 45000),
+                                               "%s.plugins.tnccs-11.max_message_size", 45000, lib->ns),
                .ref = 1,
        );
 

diff --git a/src/libtnccs/plugins/tnccs_20/tnccs_20.c b/src/libtnccs/plugins/tnccs_20/tnccs_20.c
index b631ef57944e819148ab6791d437bc1fd4197b35..f78b85a684d7f2dfc5ac020c8a364b40e00a543d 100644 (file)
--- a/src/libtnccs/plugins/tnccs_20/tnccs_20.c
+++ b/src/libtnccs/plugins/tnccs_20/tnccs_20.c
@@ -1063,9 +1063,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,
-                                                       "libtnccs.plugins.tnccs-20.max_batch_size", 65522),
+                                               "%s.plugins.tnccs-20.max_batch_size", 65522, lib->ns),
                .max_msg_len = lib->settings->get_int(lib->settings,
-                                                       "libtnccs.plugins.tnccs-20.max_message_size", 65490),
+                                               "%s.plugins.tnccs-20.max_message_size", 65490, lib->ns),
                .ref = 1,
        );
 

diff --git a/src/libtnccs/tnc/tnc.c b/src/libtnccs/tnc/tnc.c
index fdf0412d1105bba789e85cd4712755f59036ee1b..7cdd363b3c755ca1cadb6c440d5888df89cbb70d 100644 (file)
--- a/src/libtnccs/tnc/tnc.c
+++ b/src/libtnccs/tnc/tnc.c
@@ -70,8 +70,10 @@ void libtnccs_init(void)
                },
                .ref = 1,
        );
-
        tnc = &this->public;
+       lib->settings->add_fallback(lib->settings, "%s.tnc", "libtnccs", lib->ns);
+       lib->settings->add_fallback(lib->settings, "%s.plugins", "libtnccs.plugins",
+                                                               lib->ns);
 }
 
 /**
@@ -247,7 +249,7 @@ bool tnc_manager_register(plugin_t *plugin, plugin_feature_t *feature,
                {
                        load_imcvs_from_config(
                                                lib->settings->get_str(lib->settings,
-                                                                       "libtnccs.tnc_config", "/etc/tnc_config"),
+                                                               "%s.tnc.tnc_config", "/etc/tnc_config", lib->ns),
                                                is_imc);
                }
        }