Module Name: src
Committed By: ozaki-r
Date: Wed May 31 09:50:04 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Move key_init_spidx_bymsghdr to just before spidx is used (NFC)
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.155 src/sys/netipsec/key.c:1.156
--- src/sys/netipsec/key.c:1.155 Wed May 31 05:05:38 2017
+++ src/sys/netipsec/key.c Wed May 31 09:50:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.155 2017/05/31 05:05:38 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.156 2017/05/31 09:50:04 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/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.155 2017/05/31 05:05:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.156 2017/05/31 09:50:04 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -2106,9 +2106,6 @@ key_spddelete(struct socket *so, struct
return key_senderror(so, m, EINVAL);
}
- /* make secindex */
- key_init_spidx_bymsghdr(&spidx, mhp);
-
xpl0 = (struct sadb_x_policy *)mhp->ext[SADB_X_EXT_POLICY];
/* checking the direciton. */
@@ -2121,6 +2118,9 @@ key_spddelete(struct socket *so, struct
return key_senderror(so, m, EINVAL);
}
+ /* make secindex */
+ key_init_spidx_bymsghdr(&spidx, mhp);
+
/* Is there SP in SPD ? */
sp = key_getsp(&spidx);
if (sp == NULL) {
