Reply quick mode with the same SA lifetime that we received
authorMartin Willi <martin@revosec.ch>
Mon, 2 Jan 2012 14:49:20 +0000 (15:49 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 20 Mar 2012 16:31:31 +0000 (17:31 +0100)
src/libcharon/sa/ikev1/tasks/quick_mode.c

index dc0a010..ff52204 100644 (file)
@@ -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;
        }
 }