[src/trunk]: src/sys/netipsec Fix: sp->lastused should be updated by time_upt...

[knakahara <knakahara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/519923536224
branches:  trunk
changeset: 372561:519923536224
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Thu Dec 08 08:07:07 2022 +0000

description:
Fix: sp->lastused should be updated by time_uptime, and refactor a little.

diffstat:

 sys/netipsec/ipsec.c |  6 +++---
 sys/netipsec/key.c   |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 4ee8805916e7 -r 519923536224 sys/netipsec/ipsec.c
--- a/sys/netipsec/ipsec.c      Thu Dec 08 08:05:03 2022 +0000
+++ b/sys/netipsec/ipsec.c      Thu Dec 08 08:07:07 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.176 2022/11/09 08:18:52 knakahara Exp $ */
+/* $NetBSD: ipsec.c,v 1.177 2022/12/08 08:07:07 knakahara Exp $ */
 /* $FreeBSD: ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
 /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.176 2022/11/09 08:18:52 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.177 2022/12/08 08:07:07 knakahara Exp $");
 
 /*
  * IPsec controller part.
@@ -248,7 +248,7 @@
                 */
        }
 
-       sp->lastused = time_second;
+       key_sp_touch(sp);
        KEY_SP_REF(sp);
        KEYDEBUG_PRINTF(KEYDEBUG_IPSEC_STAMP,
            "DP cause refcnt++:%d SP:%p\n",
diff -r 4ee8805916e7 -r 519923536224 sys/netipsec/key.c
--- a/sys/netipsec/key.c        Thu Dec 08 08:05:03 2022 +0000
+++ b/sys/netipsec/key.c        Thu Dec 08 08:07:07 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.279 2022/12/08 08:05:03 knakahara Exp $      */
+/*     $NetBSD: key.c,v 1.280 2022/12/08 08:07:07 knakahara Exp $      */
 /*     $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
 /*     $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $   */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.279 2022/12/08 08:05:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.280 2022/12/08 08:07:07 knakahara Exp $");
 
 /*
  * This code is referred to RFC 2367
@@ -972,7 +972,7 @@
                KEY_CHKSPDIR(sp->spidx.dir, dir);
 
                /* found a SPD entry */
-               sp->lastused = time_uptime;
+               key_sp_touch(sp);
                key_sp_ref(sp, where, tag);
        }
        pserialize_read_exit(s);
@@ -1049,7 +1049,7 @@
        sp = NULL;
 found:
        if (sp) {
-               sp->lastused = time_uptime;
+               key_sp_touch(sp);
                key_sp_ref(sp, where, tag);
        }
        pserialize_read_exit(s);