diff options
| author | Martin Willi <martin@strongswan.org> | 2007-03-20 14:56:41 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2007-03-20 14:56:41 +0000 |
| commit | e70d5576fa89e62ef7499e7398e5dc07739921c1 (patch) | |
| tree | d2b3fc9b8672ca7661c35b4eabd67efc6a5c4fb4 | |
| parent | 39a268b86762c88ba660af4ab9291d38413c83ea (diff) | |
| download | strongswan-e70d5576fa89e62ef7499e7398e5dc07739921c1.tar.bz2 strongswan-e70d5576fa89e62ef7499e7398e5dc07739921c1.tar.xz | |
fixed statusall rekey time jitter bug (again)
| -rw-r--r-- | src/charon/sa/child_sa.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/charon/sa/child_sa.c b/src/charon/sa/child_sa.c index ea7590ceb..19131389d 100644 --- a/src/charon/sa/child_sa.c +++ b/src/charon/sa/child_sa.c @@ -129,6 +129,11 @@ struct private_child_sa_t { time_t install_time; /** + * absolute time when rekeying is sceduled + */ + time_t rekey_time; + + /** * state of the CHILD_SA */ child_sa_state_t state; @@ -537,6 +542,7 @@ static status_t install(private_child_sa_t *this, proposal_t *proposal, this->encryption = *enc_algo; this->integrity = *int_algo; this->install_time = time(NULL); + this->rekey_time = soft; return status; } @@ -743,7 +749,7 @@ static int print(FILE *stream, const struct printf_info *info, private_child_sa_t *this = *((private_child_sa_t**)(args[0])); iterator_t *iterator; sa_policy_t *policy; - u_int32_t now, rekeying, soft; + u_int32_t now, rekeying; u_int32_t use, use_in, use_fwd; status_t status; size_t written = 0; @@ -792,11 +798,10 @@ static int print(FILE *stream, const struct printf_info *info, } written += fprintf(stream, ", rekeying "); - soft = this->policy->get_soft_lifetime(this->policy); /* calculate rekey times */ - if (soft) + if (this->rekey_time) { - rekeying = this->install_time + soft - now; + rekeying = this->install_time + this->rekey_time - now; written += fprintf(stream, "in %ds", rekeying); } else |