aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2012-01-02 15:49:20 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:31:31 +0100
commit31bd5c8c0e3a913fec42b775acd250147cd5fca8 (patch)
tree10ae8ce4579ec2539dc1e3f26e579c4c6d52015d /src
parent3a925f74ab3cc43bafa409b89feaa32caeb33364 (diff)
downloadstrongswan-31bd5c8c0e3a913fec42b775acd250147cd5fca8.tar.bz2
strongswan-31bd5c8c0e3a913fec42b775acd250147cd5fca8.tar.xz
Reply quick mode with the same SA lifetime that we received
Diffstat (limited to 'src')
-rw-r--r--src/libcharon/sa/ikev1/tasks/quick_mode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index dc0a01099..ff52204a9 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -510,15 +510,15 @@ static void apply_lifetimes(private_quick_mode_t *this, sa_payload_t *sa_payload
lifebytes = sa_payload->get_lifebytes(sa_payload);
if (this->lifetime != lifetime)
{
- DBG1(DBG_IKE, "received %us lifetime, configured %us, using lower",
+ DBG1(DBG_IKE, "received %us lifetime, configured %us",
lifetime, this->lifetime);
- this->lifetime = min(this->lifetime, lifetime);
+ this->lifetime = lifetime;
}
if (this->lifebytes != lifebytes)
{
- DBG1(DBG_IKE, "received %llu lifebytes, configured %llu, using lower",
+ DBG1(DBG_IKE, "received %llu lifebytes, configured %llu",
lifebytes, this->lifebytes);
- this->lifebytes = min(this->lifebytes, lifebytes);
+ this->lifebytes = lifebytes;
}
}