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

libcharon: Use lib->ns instead of charon->name

Browse Source
This commit is contained in:
Tobias Brunner
2014-02-12 14:34:32 +01:00
parent 10c4f4e1fd
commit d223fe807a
72 changed files with 255 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ha/ha_attribute.c
+1 -1
View File
@@ -309,7 +309,7 @@ static void load_pools(private_ha_attribute_t *this)
pool_t *pool;
enumerator = lib->settings->create_key_value_enumerator(lib->settings,
"%s.plugins.ha.pools", charon->name);
"%s.plugins.ha.pools", lib->ns);
while (enumerator->enumerate(enumerator, &name, &net))
{
net = strdup(net);
src/libcharon/plugins/ha/ha_plugin.c
+7 -7
View File
@@ -160,19 +160,19 @@ plugin_t *ha_plugin_create()
bool fifo, monitor, resync;
local = lib->settings->get_str(lib->settings,
"%s.plugins.ha.local", NULL, charon->name);
"%s.plugins.ha.local", NULL, lib->ns);
remote = lib->settings->get_str(lib->settings,
"%s.plugins.ha.remote", NULL, charon->name);
"%s.plugins.ha.remote", NULL, lib->ns);
secret = lib->settings->get_str(lib->settings,
"%s.plugins.ha.secret", NULL, charon->name);
"%s.plugins.ha.secret", NULL, lib->ns);
fifo = lib->settings->get_bool(lib->settings,
"%s.plugins.ha.fifo_interface", TRUE, charon->name);
"%s.plugins.ha.fifo_interface", TRUE, lib->ns);
monitor = lib->settings->get_bool(lib->settings,
"%s.plugins.ha.monitor", TRUE, charon->name);
"%s.plugins.ha.monitor", TRUE, lib->ns);
resync = lib->settings->get_bool(lib->settings,
"%s.plugins.ha.resync", TRUE, charon->name);
"%s.plugins.ha.resync", TRUE, lib->ns);
count = min(SEGMENTS_MAX, lib->settings->get_int(lib->settings,
"%s.plugins.ha.segment_count", 1, charon->name));
"%s.plugins.ha.segment_count", 1, lib->ns));
if (!local || !remote)
{
DBG1(DBG_CFG, "HA config misses local/remote address");
src/libcharon/plugins/ha/ha_segments.c
+3 -3
View File
@@ -470,12 +470,12 @@ ha_segments_t *ha_segments_create(ha_socket_t *socket, ha_kernel_t *kernel,
.condvar = condvar_create(CONDVAR_TYPE_DEFAULT),
.heartbeat_delay = lib->settings->get_int(lib->settings,
"%s.plugins.ha.heartbeat_delay", DEFAULT_HEARTBEAT_DELAY,
charon->name),
lib->ns),
.heartbeat_timeout = lib->settings->get_int(lib->settings,
"%s.plugins.ha.heartbeat_timeout", DEFAULT_HEARTBEAT_TIMEOUT,
charon->name),
lib->ns),
.autobalance = lib->settings->get_int(lib->settings,
"%s.plugins.ha.autobalance", 0, charon->name),
"%s.plugins.ha.autobalance", 0, lib->ns),
);
if (monitor)