summaryrefslogtreecommitdiffstats
path: root/sys/netipsec
diff options
context:
space:
mode:
authorae <ae@FreeBSD.org>2015-05-19 08:37:03 +0000
committerae <ae@FreeBSD.org>2015-05-19 08:37:03 +0000
commitc2b339d22562ef3e50640cebc0fcf30e20f0b27c (patch)
treedf97e86c8f703e23967b5a8a96defaf435655870 /sys/netipsec
parenta7c61420eddd68df464b2459cd3297b704a86d5c (diff)
downloadFreeBSD-src-c2b339d22562ef3e50640cebc0fcf30e20f0b27c.zip
FreeBSD-src-c2b339d22562ef3e50640cebc0fcf30e20f0b27c.tar.gz
Change SA's state before sending SADB_EXPIRE message. This state will
be reported to keying daemon. MFC after: 2 weeks
Diffstat (limited to 'sys/netipsec')
-rw-r--r--sys/netipsec/key.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 24a1696..6eae0f5 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -4283,8 +4283,8 @@ key_flush_sad(time_t now)
if (sav->lft_h->addtime != 0 &&
now - sav->created > sav->lft_h->addtime) {
- key_expire(sav, 1);
key_sa_chgstate(sav, SADB_SASTATE_DEAD);
+ key_expire(sav, 1);
KEY_FREESAV(&sav);
}
#if 0 /* XXX Should we keep to send expire message until HARD lifetime ? */
@@ -4306,8 +4306,8 @@ key_flush_sad(time_t now)
/* check HARD lifetime by bytes */
else if (sav->lft_h->bytes != 0 &&
sav->lft_h->bytes < sav->lft_c->bytes) {
- key_expire(sav, 1);
key_sa_chgstate(sav, SADB_SASTATE_DEAD);
+ key_expire(sav, 1);
KEY_FREESAV(&sav);
}
}
OpenPOWER on IntegriCloud