diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-04-24 14:10:06 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-05-03 13:57:04 +0200 |
| commit | 42500c274a0858ee27fc5d54b02b90809f2ecd87 (patch) | |
| tree | b9e95d636311a08fc4639e73a4d12ab7273afc91 /src/libcharon/sa/ikev2/tasks/child_create.c | |
| parent | 18758e3d2ea173b798a827917e4f8a1f9c4bc9a2 (diff) | |
| download | strongswan-42500c274a0858ee27fc5d54b02b90809f2ecd87.tar.bz2 strongswan-42500c274a0858ee27fc5d54b02b90809f2ecd87.tar.xz | |
Use name from initialization to access settings in libcharon.
Also fixes several whitespace errors.
Diffstat (limited to 'src/libcharon/sa/ikev2/tasks/child_create.c')
| -rw-r--r-- | src/libcharon/sa/ikev2/tasks/child_create.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c index 023334bd4..eeb92099b 100644 --- a/src/libcharon/sa/ikev2/tasks/child_create.c +++ b/src/libcharon/sa/ikev2/tasks/child_create.c @@ -266,7 +266,7 @@ static void schedule_inactivity_timeout(private_child_create_t *this) if (timeout) { close_ike = lib->settings->get_bool(lib->settings, - "charon.inactivity_close_ike", FALSE); + "%s.inactivity_close_ike", FALSE, charon->name); lib->scheduler->schedule_job(lib->scheduler, (job_t*) inactivity_job_create(this->child_sa->get_reqid(this->child_sa), timeout, close_ike), timeout); @@ -881,7 +881,7 @@ static void handle_child_sa_failure(private_child_create_t *this, { if (message->get_exchange_type(message) == IKE_AUTH && lib->settings->get_bool(lib->settings, - "charon.close_ike_on_child_failure", FALSE)) + "%s.close_ike_on_child_failure", FALSE, charon->name)) { /* we delay the delete for 100ms, as the IKE_AUTH response must arrive * first */ |