Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache pcb policy as much as possible. in fact, if policy is not

Browse Source 
IPSEC_POLICY_IPSEC we don't need to compare spidx.  sync w/kame
This commit is contained in:
itojun 2002-06-14 14:47:24 +00:00
parent 813344bfbe
commit c1808f02bf
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet6/ipsec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.c,v 1.56 2002/06/14 14:17:55 itojun Exp $ */
/* $NetBSD: ipsec.c,v 1.57 2002/06/14 14:47:24 itojun Exp $ */
/* $KAME: ipsec.c,v 1.136 2002/05/19 00:36:39 itojun Exp $ */
/*
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.56 2002/06/14 14:17:55 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.57 2002/06/14 14:47:24 itojun Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@ -176,6 +176,7 @@ ipsec_checkpcbcache(m, pcbsp, dir)
switch (dir) {
case IPSEC_DIR_INBOUND:
case IPSEC_DIR_OUTBOUND:
case IPSEC_DIR_ANY:
break;
default:
return NULL;
@ -201,7 +202,8 @@ ipsec_checkpcbcache(m, pcbsp, dir)
if (ipsec_setspidx(m, &spidx, 1) != 0)
return NULL;
if (bcmp(&pcbsp->cacheidx[dir], &spidx, sizeof(spidx))) {
if (pcbsp->cache[dir]->spidx &&
if (pcbsp->cache[dir]->policy == IPSEC_POLICY_IPSEC &&
pcbsp->cache[dir]->spidx &&
!key_cmpspidx_withmask(pcbsp->cache[dir]->spidx,
&spidx))
return NULL;

8
sys/netkey/key.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: key.c,v 1.70 2002/06/12 17:56:46 itojun Exp $ */
/* $NetBSD: key.c,v 1.71 2002/06/14 14:47:25 itojun Exp $ */
/* $KAME: key.c,v 1.234 2002/05/13 03:21:17 itojun Exp $ */
/*
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.70 2002/06/12 17:56:46 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.71 2002/06/14 14:47:25 itojun Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@ -6993,14 +6993,18 @@ key_init()
ip4_def_policy = key_newsp();
if (!ip4_def_policy)
panic("could not initialize IPv4 default security policy");
ip4_def_policy->state = IPSEC_SPSTATE_ALIVE;
ip4_def_policy->policy = IPSEC_POLICY_NONE;
ip4_def_policy->dir = IPSEC_DIR_ANY;
ip4_def_policy->readonly = 1;
#endif
#ifdef INET6
ip6_def_policy = key_newsp();
if (!ip6_def_policy)
panic("could not initialize IPv6 default security policy");
ip6_def_policy->state = IPSEC_SPSTATE_ALIVE;
ip6_def_policy->policy = IPSEC_POLICY_NONE;
ip6_def_policy->dir = IPSEC_DIR_ANY;
ip6_def_policy->readonly = 1;
#endif