libimcv: Move settings to <ns>.imcv and <ns>.plugins with fallback

diff --git a/src/libimcv/imcv.c b/src/libimcv/imcv.c
index aa55746fc9a41fc1aa485f299b3f696fb2120a0e..2a4fd33dfed2f96b2d2d8fec4d0144f7023ccf9b 100644 (file)
--- a/src/libimcv/imcv.c
+++ b/src/libimcv/imcv.c
@@ -134,6 +134,10 @@ bool libimcv_init(bool is_imv)
        }
        ref_get(&libstrongswan_ref);
 
+       lib->settings->add_fallback(lib->settings, "%s.imcv", "libimcv", lib->ns);
+       lib->settings->add_fallback(lib->settings, "%s.plugins", "libimcv.plugins",
+                                                               lib->ns);
+
        if (libimcv_ref == 0)
        {
                char *uri, *script;
@@ -149,9 +153,10 @@ bool libimcv_init(bool is_imv)
                if (is_imv)
                {
                        uri = lib->settings->get_str(lib->settings,
-                                               "libimcv.database", NULL);
+                                               "%s.imcv.database", NULL, lib->ns);
                        script = lib->settings->get_str(lib->settings,
-                                               "libimcv.policy_script", IMCV_DEFAULT_POLICY_SCRIPT);
+                                               "%s.imcv.policy_script", IMCV_DEFAULT_POLICY_SCRIPT,
+                                               lib->ns);
                        if (uri)
                        {
                                imcv_db = imv_database_create(uri, script);

diff --git a/src/libimcv/imv/imv_msg.c b/src/libimcv/imv/imv_msg.c
index 642b47935b67a5986af0acc5c9e67ca591e021cb..e7181750ccb22f36b35b8cc6cb8070153096e59b 100644 (file)
--- a/src/libimcv/imv/imv_msg.c
+++ b/src/libimcv/imv/imv_msg.c
@@ -208,8 +208,8 @@ METHOD(imv_msg_t, send_assessment, TNC_Result,
        }
 
        /* Send an IETF Assessment Result attribute if enabled */
-       if (lib->settings->get_bool(lib->settings, "libimcv.assessment_result",
-                                                               TRUE))
+       if (lib->settings->get_bool(lib->settings, "%s.imcv.assessment_result",
+                                                               TRUE, lib->ns))
        {
                this->state->get_recommendation(this->state, &rec, &eval);
                attr = ietf_attr_assess_result_create(eval);

diff --git a/src/libimcv/imv/imv_policy_manager.c b/src/libimcv/imv/imv_policy_manager.c
index 15d291adf9a89111a1e2d0e27bf2602b590775fb..afb54d6ecab4bab325a45540b0912ac774928528 100644 (file)
--- a/src/libimcv/imv/imv_policy_manager.c
+++ b/src/libimcv/imv/imv_policy_manager.c
@@ -328,7 +328,12 @@ int main(int argc, char *argv[])
        session_id = atoi(tnc_session_id);
 
        /* attach IMV database */
-       uri = lib->settings->get_str(lib->settings, "libimcv.database", NULL);
+       uri = lib->settings->get_str(lib->settings,
+                       "imv_policy_manager.database",
+                       lib->settings->get_str(lib->settings,
+                               "charon.imcv.database",
+                               lib->settings->get_str(lib->settings,
+                                       "libimcv.database", NULL)));
        if (!uri)
        {
                fprintf(stderr, "database uri not defined.\n");

diff --git a/src/libimcv/os_info/os_info.c b/src/libimcv/os_info/os_info.c
index 17000cd2772daa46de9a63918af43a84eb0743bf..06427575c3b96955b967d14e50b696f5380bdd06 100644 (file)
--- a/src/libimcv/os_info/os_info.c
+++ b/src/libimcv/os_info/os_info.c
@@ -560,9 +560,9 @@ os_info_t *os_info_create(void)
 
        /* As an option OS name and OS version can be configured manually */
        name.ptr = lib->settings->get_str(lib->settings,
-                                                                         "libimcv.os_info.name", NULL);
+                                                                         "%s.imcv.os_info.name", NULL, lib->ns);
        version.ptr = lib->settings->get_str(lib->settings,
-                                                                         "libimcv.os_info.version", NULL);
+                                                                         "%s.imcv.os_info.version", NULL, lib->ns);
        if (name.ptr && version.ptr)
        {
                name.len = strlen(name.ptr);

diff --git a/src/libimcv/plugins/imc_os/imc_os.c b/src/libimcv/plugins/imc_os/imc_os.c
index 2558be9f84e6adcf4a7c101342d5ea0ce6c2e523..647a449575ab0bec5c9326885639e092fa026270 100644 (file)
--- a/src/libimcv/plugins/imc_os/imc_os.c
+++ b/src/libimcv/plugins/imc_os/imc_os.c
@@ -387,7 +387,7 @@ TNC_Result TNC_IMC_BeginHandshake(TNC_IMCID imc_id,
                return TNC_RESULT_FATAL;
        }
        if (lib->settings->get_bool(lib->settings,
-                                                               "libimcv.plugins.imc-os.push_info", TRUE))
+                                                               "%s.plugins.imc-os.push_info", TRUE, lib->ns))
        {
                out_msg = imc_msg_create(imc_os, state, connection_id, imc_id,
                                                                 TNC_IMVID_ANY, msg_types[0]);

diff --git a/src/libimcv/plugins/imc_scanner/imc_scanner.c b/src/libimcv/plugins/imc_scanner/imc_scanner.c
index c87e827cd0e6f54fb8a86ae2d6d6d1b8aef6f6a1..2be6a87df189d9f31f3335a737ed0898e4e41906 100644 (file)
--- a/src/libimcv/plugins/imc_scanner/imc_scanner.c
+++ b/src/libimcv/plugins/imc_scanner/imc_scanner.c
@@ -274,7 +274,7 @@ TNC_Result TNC_IMC_BeginHandshake(TNC_IMCID imc_id,
                return TNC_RESULT_FATAL;
        }
        if (lib->settings->get_bool(lib->settings,
-                                                               "libimcv.plugins.imc-scanner.push_info", TRUE))
+                                                       "%s.plugins.imc-scanner.push_info", TRUE, lib->ns))
        {
                out_msg = imc_msg_create(imc_scanner, state, connection_id, imc_id,
                                                                 TNC_IMVID_ANY, msg_types[0]);

diff --git a/src/libimcv/plugins/imc_test/imc_test.c b/src/libimcv/plugins/imc_test/imc_test.c
index c97d4162870c25804116422806b109a05d723a1e..ee982d93bc81deb2230f76732c67684e29563f65 100644 (file)
--- a/src/libimcv/plugins/imc_test/imc_test.c
+++ b/src/libimcv/plugins/imc_test/imc_test.c
@@ -91,11 +91,11 @@ TNC_Result TNC_IMC_NotifyConnectionChange(TNC_IMCID imc_id,
        {
                case TNC_CONNECTION_STATE_CREATE:
                        command = lib->settings->get_str(lib->settings,
-                                                               "libimcv.plugins.imc-test.command", "none");
+                                                               "%s.plugins.imc-test.command", "none", lib->ns);
                        dummy_size = lib->settings->get_int(lib->settings,
-                                                               "libimcv.plugins.imc-test.dummy_size", 0);
+                                                               "%s.plugins.imc-test.dummy_size", 0, lib->ns);
                        retry = lib->settings->get_bool(lib->settings,
-                                                               "libimcv.plugins.imc-test.retry", FALSE);
+                                                               "%s.plugins.imc-test.retry", FALSE, lib->ns);
                        state = imc_test_state_create(connection_id, command, dummy_size,
                                                                                  retry);
 
@@ -107,7 +107,7 @@ TNC_Result TNC_IMC_NotifyConnectionChange(TNC_IMCID imc_id,
 
                        /* Optionally reserve additional IMC IDs */
                        additional_ids = lib->settings->get_int(lib->settings,
-                                                               "libimcv.plugins.imc-test.additional_ids", 0);
+                                                       "%s.plugins.imc-test.additional_ids", 0, lib->ns);
                        imc_test->reserve_additional_ids(imc_test, additional_ids -
                                                                imc_test->count_additional_ids(imc_test));
 
@@ -127,8 +127,8 @@ TNC_Result TNC_IMC_NotifyConnectionChange(TNC_IMCID imc_id,
                        if (!test_state->is_first_handshake(test_state))
                        {
                                command = lib->settings->get_str(lib->settings,
-                                                               "libimcv.plugins.imc-test.retry_command",
-                                                               test_state->get_command(test_state));
+                                                               "%s.plugins.imc-test.retry_command",
+                                                               test_state->get_command(test_state), lib->ns);
                                test_state->set_command(test_state, command);
                        }
 

diff --git a/src/libimcv/plugins/imv_os/imv_os_state.c b/src/libimcv/plugins/imv_os/imv_os_state.c
index f7e9a6bc632031589a7981fa29c88395f761a30d..4f5a4b03970fcfb85321364512ae87e462dfc1ce 100644 (file)
--- a/src/libimcv/plugins/imv_os/imv_os_state.c
+++ b/src/libimcv/plugins/imv_os/imv_os_state.c
@@ -494,7 +494,7 @@ METHOD(imv_state_t, get_remediation_instructions, bool,
 
        *string = this->remediation_string->get_encoding(this->remediation_string);
        *uri = lib->settings->get_str(lib->settings,
-                                                       "libimcv.plugins.imv-os.remediation_uri", NULL);
+                                                       "%s.plugins.imv-os.remediation_uri", NULL, lib->ns);
 
        return TRUE;
 }

diff --git a/src/libimcv/plugins/imv_scanner/imv_scanner_state.c b/src/libimcv/plugins/imv_scanner/imv_scanner_state.c
index 6658683e6c7ce853d4ad395384a2440691590789..90475d34d474d48d6f58e9e56719e542c6a95870 100644 (file)
--- a/src/libimcv/plugins/imv_scanner/imv_scanner_state.c
+++ b/src/libimcv/plugins/imv_scanner/imv_scanner_state.c
@@ -314,7 +314,7 @@ METHOD(imv_state_t, get_remediation_instructions, bool,
                                                                        this->violating_ports);
        *string = this->remediation_string->get_encoding(this->remediation_string);
        *uri = lib->settings->get_str(lib->settings,
-                               "libimcv.plugins.imv-scanner.remediation_uri", NULL);
+                                       "%s.plugins.imv-scanner.remediation_uri", NULL, lib->ns);
 
        return TRUE;
 }

diff --git a/src/libimcv/plugins/imv_test/imv_test_agent.c b/src/libimcv/plugins/imv_test/imv_test_agent.c
index cdf0e18cde6a52560f66f6e9446f937904d20687..42630003b17122262150fecd1340e076fd024a68 100644 (file)
--- a/src/libimcv/plugins/imv_test/imv_test_agent.c
+++ b/src/libimcv/plugins/imv_test/imv_test_agent.c
@@ -103,7 +103,7 @@ static TNC_Result receive_msg(private_imv_test_agent_t *this, imv_state_t *state
 
        /* add any new IMC and set its number of rounds */
        rounds = lib->settings->get_int(lib->settings,
-                                                               "libimcv.plugins.imv-test.rounds", 0);
+                                                                       "%s.plugins.imv-test.rounds", 0, lib->ns);
        test_state = (imv_test_state_t*)state;
        test_state->add_imc(test_state, in_msg->get_src_id(in_msg), rounds);
 
@@ -178,7 +178,7 @@ static TNC_Result receive_msg(private_imv_test_agent_t *this, imv_state_t *state
                if (result != TNC_RESULT_SUCCESS)
                {
                        return result;
-               }  
+               }
                return this->agent->provide_recommendation(this->agent, state);
        }
 
@@ -200,7 +200,7 @@ static TNC_Result receive_msg(private_imv_test_agent_t *this, imv_state_t *state
                out_msg->add_attribute(out_msg, attr);
 
                /* send PA-TNC message with excl flag set */
-               result = out_msg->send(out_msg, TRUE);  
+               result = out_msg->send(out_msg, TRUE);
                out_msg->destroy(out_msg);
 
                return result;
@@ -214,11 +214,11 @@ static TNC_Result receive_msg(private_imv_test_agent_t *this, imv_state_t *state
                if (result != TNC_RESULT_SUCCESS)
                {
                        return result;
-               }  
+               }
                return this->agent->provide_recommendation(this->agent, state);
        }
        else
-       {       
+       {
                return TNC_RESULT_SUCCESS;
        }
  }