Module Name: src
Committed By: ozaki-r
Date: Fri Jun 2 03:39:29 UTC 2017
Modified Files:
src/sys/netipsec: ipsec.c ipsec.h
Log Message:
Rename IPSEC_PCBHINT_MAYBE to IPSEC_PCBHINT_UNKNOWN
MAYBE is maybe unclear.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.48 -r1.49 src/sys/netipsec/ipsec.h
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/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.97 src/sys/netipsec/ipsec.c:1.98
--- src/sys/netipsec/ipsec.c:1.97 Fri Jun 2 03:34:10 2017
+++ src/sys/netipsec/ipsec.c Fri Jun 2 03:39:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.97 2017/06/02 03:34:10 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.98 2017/06/02 03:39:28 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/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.97 2017/06/02 03:34:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.98 2017/06/02 03:39:28 ozaki-r Exp $");
/*
* IPsec controller part.
@@ -275,7 +275,7 @@ ipsec_fillpcbcache(struct inpcbpolicy *p
if (pcbsp->sp_cache[dir].cachesp)
KEY_FREESP(&pcbsp->sp_cache[dir].cachesp);
pcbsp->sp_cache[dir].cachesp = NULL;
- pcbsp->sp_cache[dir].cachehint = IPSEC_PCBHINT_MAYBE;
+ pcbsp->sp_cache[dir].cachehint = IPSEC_PCBHINT_UNKNOWN;
if (ipsec_setspidx(m, &pcbsp->sp_cache[dir].cacheidx, 1) != 0) {
return EINVAL;
}
@@ -322,7 +322,7 @@ ipsec_invalpcbcache(struct inpcbpolicy *
if (pcbsp->sp_cache[i].cachesp)
KEY_FREESP(&pcbsp->sp_cache[i].cachesp);
pcbsp->sp_cache[i].cachesp = NULL;
- pcbsp->sp_cache[i].cachehint = IPSEC_PCBHINT_MAYBE;
+ pcbsp->sp_cache[i].cachehint = IPSEC_PCBHINT_UNKNOWN;
pcbsp->sp_cache[i].cachegen = 0;
memset(&pcbsp->sp_cache[i].cacheidx, 0,
sizeof(pcbsp->sp_cache[i].cacheidx));
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.48 src/sys/netipsec/ipsec.h:1.49
--- src/sys/netipsec/ipsec.h:1.48 Fri May 19 04:34:09 2017
+++ src/sys/netipsec/ipsec.h Fri Jun 2 03:39:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.48 2017/05/19 04:34:09 ozaki-r Exp $ */
+/* $NetBSD: ipsec.h,v 1.49 2017/06/02 03:39:28 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -123,7 +123,7 @@ struct inpcbpolicy {
struct secpolicy *cachesp;
struct secpolicyindex cacheidx;
int cachehint; /* processing requirement hint: */
-#define IPSEC_PCBHINT_MAYBE 0 /* IPsec processing maybe required */
+#define IPSEC_PCBHINT_UNKNOWN 0 /* Unknown */
#define IPSEC_PCBHINT_YES 1 /* IPsec processing is required */
#define IPSEC_PCBHINT_NO 2 /* IPsec processing not required */
u_int cachegen; /* spdgen when cache filled */
