From 37974979bcd8d8f7c4afb2472dacff73aaa37a41 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 12 May 2009 10:55:13 +0200 Subject: [PATCH] do not report a CHILD_SA rekey time if rekeying disabled --- src/charon/sa/child_sa.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/charon/sa/child_sa.c b/src/charon/sa/child_sa.c index d506db754..c05b44b85 100644 --- a/src/charon/sa/child_sa.c +++ b/src/charon/sa/child_sa.c @@ -502,8 +502,14 @@ static status_t install(private_child_sa_t *this, chunk_t encr, chunk_t integ, this->mode, this->ipcomp, cpi, this->encap, update); now = time(NULL); - this->rekey_time = now + soft; - this->expire_time = now + hard; + if (soft) + { + this->rekey_time = now + soft; + } + if (hard) + { + this->expire_time = now + hard; + } return status; } @@ -814,6 +820,8 @@ child_sa_t * child_sa_create(host_t *me, host_t* other, this->protocol = PROTO_NONE; this->mode = MODE_TUNNEL; this->proposal = NULL; + this->rekey_time = 0; + this->expire_time = 0; this->config = config; config->get_ref(config);