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

Include peer config overtime in negotiated ISAKMP SA lifetime

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:32 +01:00
parent 4f49b06843
commit c9d68d17f0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/main_mode.c
+3 -2
View File
@@ -548,6 +548,7 @@ METHOD(task_t, build_i, status_t,
this->lifetime = this->peer_cfg->get_rekey_time(this->peer_cfg, this->lifetime = this->peer_cfg->get_rekey_time(this->peer_cfg,
FALSE); FALSE);
} }
this->lifetime += this->peer_cfg->get_over_time(this->peer_cfg);
proposals = this->ike_cfg->get_proposals(this->ike_cfg); proposals = this->ike_cfg->get_proposals(this->ike_cfg);
sa_payload = sa_payload_create_from_proposals_v1(proposals, sa_payload = sa_payload_create_from_proposals_v1(proposals,
this->lifetime, 0, this->auth_method, MODE_NONE, FALSE); this->lifetime, 0, this->auth_method, MODE_NONE, FALSE);
@@ -1006,9 +1007,9 @@ METHOD(task_t, process_i, status_t,
if (lifetime != this->lifetime) if (lifetime != this->lifetime)
{ {
DBG1(DBG_IKE, "received lifetime %us does not match configured " 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); auth_method = sa_payload->get_auth_method(sa_payload);
if (auth_method != this->auth_method) if (auth_method != this->auth_method)
{ {