diff options
| author | Martin Willi <martin@revosec.ch> | 2012-01-03 13:33:18 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:32 +0100 |
| commit | c9d68d17f0a004e36b57fcf46f87d8254263deb5 (patch) | |
| tree | 8da88c841472a6cf4e6d58e4cdbd9063f51c6406 /src | |
| parent | 4f49b06843038f933e69bf480ece37350f80b1fb (diff) | |
| download | strongswan-c9d68d17f0a004e36b57fcf46f87d8254263deb5.tar.bz2 strongswan-c9d68d17f0a004e36b57fcf46f87d8254263deb5.tar.xz | |
Include peer config overtime in negotiated ISAKMP SA lifetime
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/sa/ikev1/tasks/main_mode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c index a9486e839..75f167b1d 100644 --- a/src/libcharon/sa/ikev1/tasks/main_mode.c +++ b/src/libcharon/sa/ikev1/tasks/main_mode.c @@ -548,6 +548,7 @@ METHOD(task_t, build_i, status_t, this->lifetime = this->peer_cfg->get_rekey_time(this->peer_cfg, FALSE); } + this->lifetime += this->peer_cfg->get_over_time(this->peer_cfg); proposals = this->ike_cfg->get_proposals(this->ike_cfg); sa_payload = sa_payload_create_from_proposals_v1(proposals, this->lifetime, 0, this->auth_method, MODE_NONE, FALSE); @@ -1006,9 +1007,9 @@ METHOD(task_t, process_i, status_t, if (lifetime != this->lifetime) { DBG1(DBG_IKE, "received lifetime %us does not match configured " - "%us, using lower value", lifetime, this->lifetime); + "lifetime %us", lifetime, this->lifetime); } - this->lifetime = min(this->lifetime, lifetime); + this->lifetime = lifetime; auth_method = sa_payload->get_auth_method(sa_payload); if (auth_method != this->auth_method) { |