denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tobias Brunner
2014-02-12 14:34:34 +01:00
parent 505a69eba4
commit abd5c7bea2
7 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtnccs/plugins/tnc_imc/tnc_imc.c
+1 -1
View File
@@ -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);
}
src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c
+1 -1
View 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,
"libtnccs.plugins.tnc-imc.preferred_language", "en");
"%s.plugins.tnc-imc.preferred_language", "en", lib->ns);
}
METHOD(imc_manager_t, notify_connection_change, void,
src/libtnccs/plugins/tnc_imv/tnc_imv.c
+1 -1
View File
@@ -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);
}
src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c
+2 -1
View File
@@ -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);
src/libtnccs/plugins/tnccs_11/tnccs_11.c
+1 -1
View File
@@ -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,
);
src/libtnccs/plugins/tnccs_20/tnccs_20.c
+2 -2
View File
@@ -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,
);
src/libtnccs/tnc/tnc.c
+4 -2
View File
@@ -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);
}
}