Module Name: src
Committed By: knakahara
Date: Tue Sep 26 03:43:27 UTC 2023
Modified Files:
src/sys/net: if_ipsec.c
Log Message:
Use unit id instead of if_index to reduce fixed_reqid space.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/net/if_ipsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.34 src/sys/net/if_ipsec.c:1.35
--- src/sys/net/if_ipsec.c:1.34 Tue Oct 11 09:51:47 2022
+++ src/sys/net/if_ipsec.c Tue Sep 26 03:43:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.c,v 1.34 2022/10/11 09:51:47 knakahara Exp $ */
+/* $NetBSD: if_ipsec.c,v 1.35 2023/09/26 03:43:27 knakahara Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.34 2022/10/11 09:51:47 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.35 2023/09/26 03:43:27 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1798,9 +1798,10 @@ if_ipsec_get_reqids(struct ipsec_variant
mutex_enter(&ipsec_softcs.lock);
if (ipsec_softcs.use_fixed_reqid) {
- uint32_t reqid_base;
+ uint32_t unit, reqid_base;
- reqid_base = ipsec_softcs.reqid_base + ifp->if_index * 2;
+ unit = strtoul(ifp->if_xname + sizeof("ipsec") - 1, NULL, 10);
+ reqid_base = ipsec_softcs.reqid_base + unit * 2;
if (reqid_base + 1 > ipsec_softcs.reqid_last) {
log(LOG_ERR,
"%s: invalid fixed reqid(%"PRIu32"), "
