diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-08-03 12:23:14 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-09-02 19:04:22 +0200 |
| commit | 06cdeac25f3f45b950cf169add66359c82ce8c7c (patch) | |
| tree | d709a821d96fac7cd062246d874b99777b6eced2 /src/libhydra/plugins/kernel_netlink | |
| parent | c6fd7549e869cbbe9f25a86d660035346030753a (diff) | |
| download | strongswan-06cdeac25f3f45b950cf169add66359c82ce8c7c.tar.bz2 strongswan-06cdeac25f3f45b950cf169add66359c82ce8c7c.tar.xz | |
Charon specific strongswan.conf options generalized.
Diffstat (limited to 'src/libhydra/plugins/kernel_netlink')
| -rw-r--r-- | src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c | 3 | ||||
| -rw-r--r-- | src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c index 55158af48..25878addf 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -2167,7 +2167,8 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create() (hashtable_equals_t)policy_equals, 32), .mutex = mutex_create(MUTEX_TYPE_DEFAULT), .install_routes = lib->settings->get_bool(lib->settings, - "charon.install_routes", TRUE), + "%s.install_routes", TRUE, + hydra->daemon), ); /* disable lifetimes for allocated SPIs in kernel */ diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c index f509d8286..90e97899d 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c @@ -1437,17 +1437,17 @@ kernel_netlink_net_t *kernel_netlink_net_create() this->condvar = condvar_create(CONDVAR_TYPE_DEFAULT); timerclear(&this->last_roam); this->routing_table = lib->settings->get_int(lib->settings, - "charon.routing_table", ROUTING_TABLE); + "%s.routing_table", ROUTING_TABLE, hydra->daemon); this->routing_table_prio = lib->settings->get_int(lib->settings, - "charon.routing_table_prio", ROUTING_TABLE_PRIO); + "%s.routing_table_prio", ROUTING_TABLE_PRIO, hydra->daemon); this->process_route = lib->settings->get_bool(lib->settings, - "charon.process_route", TRUE); + "%s.process_route", TRUE, hydra->daemon); this->install_virtual_ip = lib->settings->get_bool(lib->settings, - "charon.install_virtual_ip", TRUE); + "%s.install_virtual_ip", TRUE, hydra->daemon); this->rt_exclude = linked_list_create(); exclude = lib->settings->get_str(lib->settings, - "charon.ignore_routing_tables", NULL); + "%s.ignore_routing_tables", NULL, hydra->daemon); if (exclude) { char *token; |