-/* $KAME: ipsec.c,v 1.56 2000/04/04 08:47:34 itojun Exp $ */
+/* $FreeBSD: src/sys/netinet6/ipsec.c,v 1.3.2.7 2001/07/19 06:37:23 kris Exp $ */
+/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
/*
* IPsec controller part.
*/
-#define _IP_VHL
-
-#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
-#include "opt_inet.h"
-#if __NetBSD__ /*XXX*/
-#include "opt_ipsec.h"
-#endif
-#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#ifdef __NetBSD__
-#include <vm/vm.h>
-#endif
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined (__APPLE__)
#include <sys/sysctl.h>
-#endif
#include <net/if.h>
#include <net/route.h>
#include <netinet/udp.h>
#include <netinet/udp_var.h>
#include <netinet/ip_ecn.h>
-
#if INET6
+#include <netinet6/ip6_ecn.h>
+#endif
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+
#include <netinet/ip6.h>
+#if INET6
#include <netinet6/ip6_var.h>
#endif
#include <netinet/in_pcb.h>
#if INET6
-#if !((defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__OpenBSD__) || (defined(__bsdi__) && _BSDI_VERSION >= 199802)) || defined (__APPLE__)
-#include <netinet6/in6_pcb.h>
-#endif
#include <netinet/icmp6.h>
#endif
#include <netinet6/ipsec.h>
+#if INET6
+#include <netinet6/ipsec6.h>
+#endif
#include <netinet6/ah.h>
+#if INET6
+#include <netinet6/ah6.h>
+#endif
#if IPSEC_ESP
#include <netinet6/esp.h>
+#if INET6
+#include <netinet6/esp6.h>
+#endif
#endif
#include <netinet6/ipcomp.h>
+#if INET6
+#include <netinet6/ipcomp6.h>
+#endif
#include <netkey/key.h>
#include <netkey/keydb.h>
#include <netkey/key_debug.h>
#include <net/net_osdep.h>
-#ifdef HAVE_NRL_INPCB
-#define in6pcb inpcb
-#define in6p_sp inp_sp
-#define in6p_fport inp_fport
-#define in6p_lport inp_lport
-#define in6p_socket inp_socket
-#define sotoin6pcb(so) ((struct inpcb *)(so)->so_pcb)
-#endif
-
-#ifdef __NetBSD__
-#define ovbcopy bcopy
-#endif
-
-#ifdef IPSEC_DEBUG
+#if IPSEC_DEBUG
int ipsec_debug = 1;
#else
int ipsec_debug = 0;
#endif
+#include <sys/kdebug.h>
+#define DBG_LAYER_BEG NETDBG_CODE(DBG_NETIPSEC, 1)
+#define DBG_LAYER_END NETDBG_CODE(DBG_NETIPSEC, 3)
+#define DBG_FNC_GETPOL_SOCK NETDBG_CODE(DBG_NETIPSEC, (1 << 8))
+#define DBG_FNC_GETPOL_ADDR NETDBG_CODE(DBG_NETIPSEC, (2 << 8))
+#define DBG_FNC_IPSEC_OUT NETDBG_CODE(DBG_NETIPSEC, (3 << 8))
+
+
struct ipsecstat ipsecstat;
-int ip4_inbound_call_ike = 0;
int ip4_ah_cleartos = 1;
int ip4_ah_offsetmask = 0; /* maybe IP_DF? */
int ip4_ipsec_dfbit = 0; /* DF bit on encap. 0: clear 1: set 2: copy */
int ip4_ah_net_deflev = IPSEC_LEVEL_USE;
struct secpolicy ip4_def_policy;
int ip4_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */
+int ip4_esp_randpad = -1;
+int esp_udp_encap_port = 0;
+static int sysctl_def_policy SYSCTL_HANDLER_ARGS;
+extern u_int32_t natt_now;
-#if defined(__FreeBSD__) || defined(__APPLE__)
SYSCTL_DECL(_net_inet_ipsec);
+#if INET6
+SYSCTL_DECL(_net_inet6_ipsec6);
+#endif
/* net.inet.ipsec */
SYSCTL_STRUCT(_net_inet_ipsec, IPSECCTL_STATS,
stats, CTLFLAG_RD, &ipsecstat, ipsecstat, "");
-SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_POLICY,
- def_policy, CTLFLAG_RW, &ip4_def_policy.policy, 0, "");
+SYSCTL_PROC(_net_inet_ipsec, IPSECCTL_DEF_POLICY, def_policy, CTLTYPE_INT|CTLFLAG_RW,
+ &ip4_def_policy.policy, 0, &sysctl_def_policy, "I", "");
SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_ESP_TRANSLEV, esp_trans_deflev,
CTLFLAG_RW, &ip4_esp_trans_deflev, 0, "");
SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_ESP_NETLEV, esp_net_deflev,
CTLFLAG_RW, &ip4_ah_trans_deflev, 0, "");
SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_AH_NETLEV, ah_net_deflev,
CTLFLAG_RW, &ip4_ah_net_deflev, 0, "");
-SYSCTL_INT(_net_inet_ipsec, IPSECCTL_INBOUND_CALL_IKE,
- inbound_call_ike, CTLFLAG_RW, &ip4_inbound_call_ike, 0, "");
SYSCTL_INT(_net_inet_ipsec, IPSECCTL_AH_CLEARTOS,
ah_cleartos, CTLFLAG_RW, &ip4_ah_cleartos, 0, "");
SYSCTL_INT(_net_inet_ipsec, IPSECCTL_AH_OFFSETMASK,
ecn, CTLFLAG_RW, &ip4_ipsec_ecn, 0, "");
SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEBUG,
debug, CTLFLAG_RW, &ipsec_debug, 0, "");
-#endif /* __FreeBSD__ */
+SYSCTL_INT(_net_inet_ipsec, IPSECCTL_ESP_RANDPAD,
+ esp_randpad, CTLFLAG_RW, &ip4_esp_randpad, 0, "");
+
+/* for performance, we bypass ipsec until a security policy is set */
+int ipsec_bypass = 1;
+SYSCTL_INT(_net_inet_ipsec, OID_AUTO, bypass, CTLFLAG_RD, &ipsec_bypass,0, "");
+
+/*
+ * NAT Traversal requires a UDP port for encapsulation,
+ * esp_udp_encap_port controls which port is used. Racoon
+ * must set this port to the port racoon is using locally
+ * for nat traversal.
+ */
+SYSCTL_INT(_net_inet_ipsec, OID_AUTO, esp_port,
+ CTLFLAG_RW, &esp_udp_encap_port, 0, "");
#if INET6
struct ipsecstat ipsec6stat;
-int ip6_inbound_call_ike = 0;
int ip6_esp_trans_deflev = IPSEC_LEVEL_USE;
int ip6_esp_net_deflev = IPSEC_LEVEL_USE;
int ip6_ah_trans_deflev = IPSEC_LEVEL_USE;
int ip6_ah_net_deflev = IPSEC_LEVEL_USE;
struct secpolicy ip6_def_policy;
int ip6_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */
+int ip6_esp_randpad = -1;
-#if defined(__FreeBSD__) || defined(__APPLE__)
-SYSCTL_DECL(_net_inet6_ipsec6);
/* net.inet6.ipsec6 */
SYSCTL_STRUCT(_net_inet6_ipsec6, IPSECCTL_STATS,
stats, CTLFLAG_RD, &ipsec6stat, ipsecstat, "");
CTLFLAG_RW, &ip6_ah_trans_deflev, 0, "");
SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_DEF_AH_NETLEV, ah_net_deflev,
CTLFLAG_RW, &ip6_ah_net_deflev, 0, "");
-SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_INBOUND_CALL_IKE,
- inbound_call_ike, CTLFLAG_RW, &ip6_inbound_call_ike, 0, "");
SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_ECN,
ecn, CTLFLAG_RW, &ip6_ipsec_ecn, 0, "");
SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_DEBUG,
debug, CTLFLAG_RW, &ipsec_debug, 0, "");
-#endif /*__FreeBSD__*/
+SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_ESP_RANDPAD,
+ esp_randpad, CTLFLAG_RW, &ip6_esp_randpad, 0, "");
#endif /* INET6 */
static int ipsec_setspidx_mbuf
- __P((struct secpolicyindex *, u_int, u_int, struct mbuf *));
-static void ipsec4_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb));
-static void ipsec4_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
+ __P((struct secpolicyindex *, u_int, u_int, struct mbuf *, int));
+static int ipsec4_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb));
+#if INET6
+static int ipsec6_setspidx_in6pcb __P((struct mbuf *, struct in6pcb *pcb));
+#endif
+static int ipsec_setspidx __P((struct mbuf *, struct secpolicyindex *, int));
+static void ipsec4_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int));
+static int ipsec4_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
#if INET6
-static void ipsec6_get_ulp __P((struct mbuf *m, struct secpolicyindex *));
-static void ipsec6_setspidx_in6pcb __P((struct mbuf *, struct in6pcb *pcb));
-static void ipsec6_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
+static void ipsec6_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int));
+static int ipsec6_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
#endif
static struct inpcbpolicy *ipsec_newpcbpolicy __P((void));
static void ipsec_delpcbpolicy __P((struct inpcbpolicy *));
static void vshiftl __P((unsigned char *, int, int));
static int ipsec_in_reject __P((struct secpolicy *, struct mbuf *));
static size_t ipsec_hdrsiz __P((struct secpolicy *));
+#if INET
static struct mbuf *ipsec4_splithdr __P((struct mbuf *));
+#endif
#if INET6
static struct mbuf *ipsec6_splithdr __P((struct mbuf *));
#endif
+#if INET
static int ipsec4_encapsulate __P((struct mbuf *, struct secasvar *));
+#endif
#if INET6
static int ipsec6_encapsulate __P((struct mbuf *, struct secasvar *));
#endif
+static struct mbuf *ipsec_addaux __P((struct mbuf *));
+static struct mbuf *ipsec_findaux __P((struct mbuf *));
+static void ipsec_optaux __P((struct mbuf *, struct mbuf *));
+void ipsec_send_natt_keepalive(struct secasvar *sav);
+
+static int
+sysctl_def_policy SYSCTL_HANDLER_ARGS
+{
+ int old_policy = ip4_def_policy.policy;
+ int error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+
+ if (ip4_def_policy.policy != IPSEC_POLICY_NONE &&
+ ip4_def_policy.policy != IPSEC_POLICY_DISCARD) {
+ ip4_def_policy.policy = old_policy;
+ return EINVAL;
+ }
+
+ /* Turn off the bypass if the default security policy changes */
+ if (ipsec_bypass != 0 && ip4_def_policy.policy != IPSEC_POLICY_NONE)
+ ipsec_bypass = 0;
+
+ return error;
+}
/*
* For OUTBOUND packet having a socket. Searching SPD for packet,
/* sanity check */
if (m == NULL || so == NULL || error == NULL)
panic("ipsec4_getpolicybysock: NULL pointer was passed.\n");
+
+ switch (so->so_proto->pr_domain->dom_family) {
+ case AF_INET:
+ pcbsp = sotoinpcb(so)->inp_sp;
+ break;
+#if INET6
+ case AF_INET6:
+ pcbsp = sotoin6pcb(so)->in6p_sp;
+ break;
+#endif
+ }
+
+ if (!pcbsp){
+ /* Socket has not specified an IPSEC policy */
+ return ipsec4_getpolicybyaddr(m, dir, 0, error);
+ }
+
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_START, 0,0,0,0,0);
switch (so->so_proto->pr_domain->dom_family) {
case AF_INET:
/* set spidx in pcb */
- ipsec4_setspidx_inpcb(m, sotoinpcb(so));
- pcbsp = sotoinpcb(so)->inp_sp;
+ *error = ipsec4_setspidx_inpcb(m, sotoinpcb(so));
break;
#if INET6
case AF_INET6:
/* set spidx in pcb */
- ipsec6_setspidx_in6pcb(m, sotoin6pcb(so));
- pcbsp = sotoin6pcb(so)->in6p_sp;
+ *error = ipsec6_setspidx_in6pcb(m, sotoin6pcb(so));
break;
#endif
default:
panic("ipsec4_getpolicybysock: unsupported address family\n");
}
+ if (*error) {
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 1,*error,0,0,0);
+ return NULL;
+ }
/* sanity check */
if (pcbsp == NULL)
panic("ipsec4_getpolicybysock: pcbsp is NULL.\n");
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 || defined(__APPLE__)
- KEYDEBUG(KEYDEBUG_IPSEC_DATA,
- printf("send: priv=%d ", pcbsp->priv);
- if (so->so_cred) {
- printf("p_ruid=%d ", so->so_cred->p_ruid);
- printf("p_svuid=%d ", so->so_cred->p_svuid);
- printf("cr_uid=%d\n", so->so_cred->pc_ucred->cr_uid);
- });
-#endif
switch (dir) {
case IPSEC_DIR_INBOUND:
currsp = pcbsp->sp_in;
case IPSEC_POLICY_BYPASS:
currsp->refcnt++;
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 2,*error,0,0,0);
return currsp;
case IPSEC_POLICY_ENTRUST:
printf("DP ipsec4_getpolicybysock called "
"to allocate SP:%p\n", kernsp));
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 3,*error,0,0,0);
return kernsp;
}
}
ip4_def_policy.refcnt++;
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 4,*error,0,0,0);
return &ip4_def_policy;
case IPSEC_POLICY_IPSEC:
currsp->refcnt++;
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 5,*error,0,0,0);
return currsp;
default:
ipseclog((LOG_ERR, "ipsec4_getpolicybysock: "
"Invalid policy for PCB %d\n", currsp->policy));
*error = EINVAL;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 6,*error,0,0,0);
return NULL;
}
/* NOTREACHED */
printf("DP ipsec4_getpolicybysock called "
"to allocate SP:%p\n", kernsp));
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 7,*error,0,0,0);
return kernsp;
}
"Illegal policy for non-priviliged defined %d\n",
currsp->policy));
*error = EINVAL;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 8,*error,0,0,0);
return NULL;
case IPSEC_POLICY_ENTRUST:
}
ip4_def_policy.refcnt++;
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 9,*error,0,0,0);
return &ip4_def_policy;
case IPSEC_POLICY_IPSEC:
currsp->refcnt++;
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 10,*error,0,0,0);
return currsp;
default:
ipseclog((LOG_ERR, "ipsec4_getpolicybysock: "
"Invalid policy for PCB %d\n", currsp->policy));
*error = EINVAL;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_SOCK | DBG_FUNC_END, 11,*error,0,0,0);
return NULL;
}
/* NOTREACHED */
{
struct secpolicy *sp = NULL;
+ if (ipsec_bypass != 0)
+ return 0;
+
/* sanity check */
if (m == NULL || error == NULL)
panic("ipsec4_getpolicybyaddr: NULL pointer was passed.\n");
{
struct secpolicyindex spidx;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_ADDR | DBG_FUNC_START, 0,0,0,0,0);
bzero(&spidx, sizeof(spidx));
/* make a index to look for a policy */
- *error = ipsec_setspidx_mbuf(&spidx, dir, AF_INET, m);
+ *error = ipsec_setspidx_mbuf(&spidx, dir, AF_INET, m,
+ (flag & IP_FORWARDING) ? 0 : 1);
- if (*error != 0)
+ if (*error != 0) {
+ KERNEL_DEBUG(DBG_FNC_GETPOL_ADDR | DBG_FUNC_END, 1,*error,0,0,0);
return NULL;
+ }
sp = key_allocsp(&spidx, dir);
}
printf("DP ipsec4_getpolicybyaddr called "
"to allocate SP:%p\n", sp));
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_ADDR | DBG_FUNC_END, 2,*error,0,0,0);
return sp;
}
}
ip4_def_policy.refcnt++;
*error = 0;
+ KERNEL_DEBUG(DBG_FNC_GETPOL_ADDR | DBG_FUNC_END, 3,*error,0,0,0);
return &ip4_def_policy;
}
if (m == NULL || so == NULL || error == NULL)
panic("ipsec6_getpolicybysock: NULL pointer was passed.\n");
- /* set spidx in pcb */
- ipsec6_setspidx_in6pcb(m, sotoin6pcb(so));
+#if DIAGNOSTIC
+ if (so->so_proto->pr_domain->dom_family != AF_INET6)
+ panic("ipsec6_getpolicybysock: socket domain != inet6\n");
+#endif
pcbsp = sotoin6pcb(so)->in6p_sp;
+
+ if (!pcbsp){
+ return ipsec6_getpolicybyaddr(m, dir, 0, error);
+ }
+
+ /* set spidx in pcb */
+ ipsec6_setspidx_in6pcb(m, sotoin6pcb(so));
/* sanity check */
if (pcbsp == NULL)
bzero(&spidx, sizeof(spidx));
/* make a index to look for a policy */
- *error = ipsec_setspidx_mbuf(&spidx, dir, AF_INET6, m);
+ *error = ipsec_setspidx_mbuf(&spidx, dir, AF_INET6, m,
+ (flag & IP_FORWARDING) ? 0 : 1);
if (*error != 0)
return NULL;
* other: failure, and set errno.
*/
int
-ipsec_setspidx_mbuf(spidx, dir, family, m)
+ipsec_setspidx_mbuf(spidx, dir, family, m, needport)
struct secpolicyindex *spidx;
u_int dir, family;
struct mbuf *m;
+ int needport;
{
- struct sockaddr *sa1, *sa2;
+ int error;
/* sanity check */
if (spidx == NULL || m == NULL)
panic("ipsec_setspidx_mbuf: NULL pointer was passed.\n");
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec_setspidx_mbuf: begin\n"); kdebug_mbuf(m));
-
- /* initialize */
bzero(spidx, sizeof(*spidx));
+ error = ipsec_setspidx(m, spidx, needport);
+ if (error)
+ goto bad;
spidx->dir = dir;
- sa1 = (struct sockaddr *)&spidx->src;
- sa2 = (struct sockaddr *)&spidx->dst;
- sa1->sa_len = sa2->sa_len = _SALENBYAF(family);
- sa1->sa_family = sa2->sa_family = family;
- spidx->prefs = spidx->prefd = _INALENBYAF(family) << 3;
- {
- /* sanity check for packet length. */
- struct mbuf *n;
- int tlen;
+ return 0;
- tlen = 0;
- for (n = m; n; n = n->m_next)
- tlen += n->m_len;
- if (m->m_pkthdr.len != tlen) {
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec_setspidx_mbuf: "
- "total of m_len(%d) != pkthdr.len(%d), "
- "ignored.\n",
- tlen, m->m_pkthdr.len));
- goto bad;
- }
- }
+ bad:
+ /* XXX initialize */
+ bzero(spidx, sizeof(*spidx));
+ return EINVAL;
+}
- switch (family) {
- case AF_INET:
- {
- struct ip *ip;
- struct ip ipbuf;
+static int
+ipsec4_setspidx_inpcb(m, pcb)
+ struct mbuf *m;
+ struct inpcb *pcb;
+{
+ struct secpolicyindex *spidx;
+ int error;
- /* sanity check 1 for minimum ip header length */
- if (m->m_pkthdr.len < sizeof(struct ip)) {
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec_setspidx_mbuf: "
- "pkthdr.len(%d) < sizeof(struct ip), "
- "ignored.\n",
- m->m_pkthdr.len));
- goto bad;
- }
+ if (ipsec_bypass != 0)
+ return 0;
- /*
- * get IPv4 header packet. usually the mbuf is contiguous
- * and we need no copies.
- */
- if (m->m_len >= sizeof(*ip))
- ip = mtod(m, struct ip *);
- else {
- m_copydata(m, 0, sizeof(ipbuf), (caddr_t)&ipbuf);
- ip = &ipbuf;
- }
+ /* sanity check */
+ if (pcb == NULL)
+ panic("ipsec4_setspidx_inpcb: no PCB found.\n");
+ if (pcb->inp_sp == NULL)
+ panic("ipsec4_setspidx_inpcb: no inp_sp found.\n");
+ if (pcb->inp_sp->sp_out == NULL || pcb->inp_sp->sp_in == NULL)
+ panic("ipsec4_setspidx_inpcb: no sp_in/out found.\n");
- /* some more checks on IPv4 header. */
- bcopy(&ip->ip_src, _INADDRBYSA(&spidx->src),
- sizeof(ip->ip_src));
- bcopy(&ip->ip_dst, _INADDRBYSA(&spidx->dst),
- sizeof(ip->ip_dst));
+ bzero(&pcb->inp_sp->sp_in->spidx, sizeof(*spidx));
+ bzero(&pcb->inp_sp->sp_out->spidx, sizeof(*spidx));
- spidx->ul_proto = ip->ip_p;
- _INPORTBYSA(&spidx->src) = IPSEC_PORT_ANY;
- _INPORTBYSA(&spidx->dst) = IPSEC_PORT_ANY;
- break;
- }
+ spidx = &pcb->inp_sp->sp_in->spidx;
+ error = ipsec_setspidx(m, spidx, 1);
+ if (error)
+ goto bad;
+ spidx->dir = IPSEC_DIR_INBOUND;
-#if INET6
- case AF_INET6:
- {
- struct ip6_hdr *ip6;
- struct ip6_hdr ip6buf;
+ spidx = &pcb->inp_sp->sp_out->spidx;
+ error = ipsec_setspidx(m, spidx, 1);
+ if (error)
+ goto bad;
+ spidx->dir = IPSEC_DIR_OUTBOUND;
- /* sanity check 1 for minimum ip header length */
- if (m->m_pkthdr.len < sizeof(struct ip6_hdr)) {
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec_setspidx_mbuf: "
- "pkthdr.len(%d) < sizeof(struct ip6_hdr), "
- "ignored.\n",
- m->m_pkthdr.len));
- goto bad;
- }
+ return 0;
- /*
- * get IPv6 header packet. usually the mbuf is contiguous
- * and we need no copies.
- */
- if (m->m_len >= sizeof(*ip6))
- ip6 = mtod(m, struct ip6_hdr *);
- else {
- m_copydata(m, 0, sizeof(ip6buf), (caddr_t)&ip6buf);
- ip6 = &ip6buf;
- }
+bad:
+ bzero(&pcb->inp_sp->sp_in->spidx, sizeof(*spidx));
+ bzero(&pcb->inp_sp->sp_out->spidx, sizeof(*spidx));
+ return error;
+}
- /* some more checks on IPv4 header. */
- if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) {
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec_setspidx_mbuf: "
- "wrong ip version on packet "
- "(expected IPv6), ignored.\n"));
- goto bad;
- }
+#if INET6
+static int
+ipsec6_setspidx_in6pcb(m, pcb)
+ struct mbuf *m;
+ struct in6pcb *pcb;
+{
+ struct secpolicyindex *spidx;
+ int error;
- bcopy(&ip6->ip6_src, _INADDRBYSA(&spidx->src),
- sizeof(ip6->ip6_src));
- bcopy(&ip6->ip6_dst, _INADDRBYSA(&spidx->dst),
- sizeof(ip6->ip6_dst));
+ /* sanity check */
+ if (pcb == NULL)
+ panic("ipsec6_setspidx_in6pcb: no PCB found.\n");
+ if (pcb->in6p_sp == NULL)
+ panic("ipsec6_setspidx_in6pcb: no in6p_sp found.\n");
+ if (pcb->in6p_sp->sp_out == NULL || pcb->in6p_sp->sp_in == NULL)
+ panic("ipsec6_setspidx_in6pcb: no sp_in/out found.\n");
- ipsec6_get_ulp(m, spidx);
- break;
- }
-#endif /* INET6 */
- default:
- panic("ipsec_secsecidx: no supported family passed.\n");
- }
+ bzero(&pcb->in6p_sp->sp_in->spidx, sizeof(*spidx));
+ bzero(&pcb->in6p_sp->sp_out->spidx, sizeof(*spidx));
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec_setspidx_mbuf: end\n");
- kdebug_secpolicyindex(spidx));
+ spidx = &pcb->in6p_sp->sp_in->spidx;
+ error = ipsec_setspidx(m, spidx, 1);
+ if (error)
+ goto bad;
+ spidx->dir = IPSEC_DIR_INBOUND;
+
+ spidx = &pcb->in6p_sp->sp_out->spidx;
+ error = ipsec_setspidx(m, spidx, 1);
+ if (error)
+ goto bad;
+ spidx->dir = IPSEC_DIR_OUTBOUND;
return 0;
- bad:
- /* XXX initialize */
- bzero(spidx, sizeof(*spidx));
- return EINVAL;
+bad:
+ bzero(&pcb->in6p_sp->sp_in->spidx, sizeof(*spidx));
+ bzero(&pcb->in6p_sp->sp_out->spidx, sizeof(*spidx));
+ return error;
}
+#endif
-#if INET6
/*
- * Get upper layer protocol number and port number if there.
- * Assumed all extension headers are in single mbuf.
+ * configure security policy index (src/dst/proto/sport/dport)
+ * by looking at the content of mbuf.
+ * the caller is responsible for error recovery (like clearing up spidx).
*/
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-static void
-ipsec6_get_ulp(m, spidx)
+static int
+ipsec_setspidx(m, spidx, needport)
struct mbuf *m;
struct secpolicyindex *spidx;
+ int needport;
{
- int off, nxt;
+ struct ip *ip = NULL;
+ struct ip ipbuf;
+ u_int v;
+ struct mbuf *n;
+ int len;
+ int error;
- /* sanity check */
if (m == NULL)
- panic("ipsec6_get_ulp: NULL pointer was passed.\n");
-
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec6_get_ulp:\n"); kdebug_mbuf(m));
+ panic("ipsec_setspidx: m == 0 passed.\n");
- /* set default */
- spidx->ul_proto = IPSEC_ULPROTO_ANY;
- _INPORTBYSA(&spidx->src) = IPSEC_PORT_ANY;
- _INPORTBYSA(&spidx->dst) = IPSEC_PORT_ANY;
+ /*
+ * validate m->m_pkthdr.len. we see incorrect length if we
+ * mistakenly call this function with inconsistent mbuf chain
+ * (like 4.4BSD tcp/udp processing). XXX should we panic here?
+ */
+ len = 0;
+ for (n = m; n; n = n->m_next)
+ len += n->m_len;
+ if (m->m_pkthdr.len != len) {
+ KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
+ printf("ipsec_setspidx: "
+ "total of m_len(%d) != pkthdr.len(%d), "
+ "ignored.\n",
+ len, m->m_pkthdr.len));
+ return EINVAL;
+ }
- nxt = -1;
- off = ip6_lasthdr(m, 0, IPPROTO_IPV6, &nxt);
- if (off < 0 || m->m_pkthdr.len < off)
- return;
+ if (m->m_pkthdr.len < sizeof(struct ip)) {
+ KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
+ printf("ipsec_setspidx: "
+ "pkthdr.len(%d) < sizeof(struct ip), ignored.\n",
+ m->m_pkthdr.len));
+ return EINVAL;
+ }
- switch (nxt) {
- case IPPROTO_TCP:
- spidx->ul_proto = nxt;
- if (off + sizeof(struct tcphdr) <= m->m_pkthdr.len) {
- struct tcphdr th;
- m_copydata(m, off, sizeof(th), (caddr_t)&th);
- _INPORTBYSA(&spidx->src) = th.th_sport;
- _INPORTBYSA(&spidx->dst) = th.th_dport;
- }
- break;
- case IPPROTO_UDP:
- spidx->ul_proto = nxt;
- if (off + sizeof(struct udphdr) <= m->m_pkthdr.len) {
- struct udphdr uh;
- m_copydata(m, off, sizeof(uh), (caddr_t)&uh);
- _INPORTBYSA(&spidx->src) = uh.uh_sport;
- _INPORTBYSA(&spidx->dst) = uh.uh_dport;
+ if (m->m_len >= sizeof(*ip))
+ ip = mtod(m, struct ip *);
+ else {
+ m_copydata(m, 0, sizeof(ipbuf), (caddr_t)&ipbuf);
+ ip = &ipbuf;
+ }
+#ifdef _IP_VHL
+ v = _IP_VHL_V(ip->ip_vhl);
+#else
+ v = ip->ip_v;
+#endif
+ switch (v) {
+ case 4:
+ error = ipsec4_setspidx_ipaddr(m, spidx);
+ if (error)
+ return error;
+ ipsec4_get_ulp(m, spidx, needport);
+ return 0;
+#ifdef INET6
+ case 6:
+ if (m->m_pkthdr.len < sizeof(struct ip6_hdr)) {
+ KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
+ printf("ipsec_setspidx: "
+ "pkthdr.len(%d) < sizeof(struct ip6_hdr), "
+ "ignored.\n", m->m_pkthdr.len));
+ return EINVAL;
}
- break;
- case IPPROTO_ICMPV6:
- spidx->ul_proto = nxt;
- break;
+ error = ipsec6_setspidx_ipaddr(m, spidx);
+ if (error)
+ return error;
+ ipsec6_get_ulp(m, spidx, needport);
+ return 0;
+#endif
default:
- break;
+ KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
+ printf("ipsec_setspidx: "
+ "unknown IP version %u, ignored.\n", v));
+ return EINVAL;
}
}
-#endif
static void
-ipsec4_setspidx_inpcb(m, pcb)
+ipsec4_get_ulp(m, spidx, needport)
struct mbuf *m;
- struct inpcb *pcb;
-{
struct secpolicyindex *spidx;
- struct sockaddr *sa1, *sa2;
+ int needport;
+{
+ struct ip ip;
+ struct ip6_ext ip6e;
+ u_int8_t nxt;
+ int off;
+ struct tcphdr th;
+ struct udphdr uh;
/* sanity check */
- if (pcb == NULL)
- panic("ipsec4_setspidx_inpcb: no PCB found.\n");
- if (pcb->inp_sp == NULL)
- panic("ipsec4_setspidx_inpcb: no inp_sp found.\n");
- if (pcb->inp_sp->sp_out ==NULL || pcb->inp_sp->sp_in == NULL)
- panic("ipsec4_setspidx_inpcb: no sp_in/out found.\n");
-
- bzero(&pcb->inp_sp->sp_in->spidx, sizeof(*spidx));
- bzero(&pcb->inp_sp->sp_out->spidx, sizeof(*spidx));
+ if (m == NULL)
+ panic("ipsec4_get_ulp: NULL pointer was passed.\n");
+ if (m->m_pkthdr.len < sizeof(ip))
+ panic("ipsec4_get_ulp: too short\n");
- spidx = &pcb->inp_sp->sp_in->spidx;
- spidx->dir = IPSEC_DIR_INBOUND;
- sa1 = (struct sockaddr *)&spidx->src;
- sa2 = (struct sockaddr *)&spidx->dst;
- sa1->sa_len = sa2->sa_len = _SALENBYAF(AF_INET);
- sa1->sa_family = sa2->sa_family = AF_INET;
- spidx->prefs = _INALENBYAF(AF_INET) << 3;
- spidx->prefd = _INALENBYAF(AF_INET) << 3;
- spidx->ul_proto = pcb->inp_socket->so_proto->pr_protocol;
- _INPORTBYSA(&spidx->src) = pcb->inp_fport;
- _INPORTBYSA(&spidx->dst) = pcb->inp_lport;
- ipsec4_setspidx_ipaddr(m, spidx);
+ /* set default */
+ spidx->ul_proto = IPSEC_ULPROTO_ANY;
+ ((struct sockaddr_in *)&spidx->src)->sin_port = IPSEC_PORT_ANY;
+ ((struct sockaddr_in *)&spidx->dst)->sin_port = IPSEC_PORT_ANY;
- spidx = &pcb->inp_sp->sp_out->spidx;
- spidx->dir = IPSEC_DIR_OUTBOUND;
- sa1 = (struct sockaddr *)&spidx->src;
- sa2 = (struct sockaddr *)&spidx->dst;
- sa1->sa_len = sa2->sa_len = _SALENBYAF(AF_INET);
- sa1->sa_family = sa2->sa_family = AF_INET;
- spidx->prefs = _INALENBYAF(AF_INET) << 3;
- spidx->prefd = _INALENBYAF(AF_INET) << 3;
- spidx->ul_proto = pcb->inp_socket->so_proto->pr_protocol;
- _INPORTBYSA(&spidx->src) = pcb->inp_lport;
- _INPORTBYSA(&spidx->dst) = pcb->inp_fport;
- ipsec4_setspidx_ipaddr(m, spidx);
+ m_copydata(m, 0, sizeof(ip), (caddr_t)&ip);
+ /* ip_input() flips it into host endian XXX need more checking */
+ if (ip.ip_off & (IP_MF | IP_OFFMASK))
+ return;
- return;
+ nxt = ip.ip_p;
+#ifdef _IP_VHL
+ off = _IP_VHL_HL(ip->ip_vhl) << 2;
+#else
+ off = ip.ip_hl << 2;
+#endif
+ while (off < m->m_pkthdr.len) {
+ switch (nxt) {
+ case IPPROTO_TCP:
+ spidx->ul_proto = nxt;
+ if (!needport)
+ return;
+ if (off + sizeof(struct tcphdr) > m->m_pkthdr.len)
+ return;
+ m_copydata(m, off, sizeof(th), (caddr_t)&th);
+ ((struct sockaddr_in *)&spidx->src)->sin_port =
+ th.th_sport;
+ ((struct sockaddr_in *)&spidx->dst)->sin_port =
+ th.th_dport;
+ return;
+ case IPPROTO_UDP:
+ spidx->ul_proto = nxt;
+ if (!needport)
+ return;
+ if (off + sizeof(struct udphdr) > m->m_pkthdr.len)
+ return;
+ m_copydata(m, off, sizeof(uh), (caddr_t)&uh);
+ ((struct sockaddr_in *)&spidx->src)->sin_port =
+ uh.uh_sport;
+ ((struct sockaddr_in *)&spidx->dst)->sin_port =
+ uh.uh_dport;
+ return;
+ case IPPROTO_AH:
+ if (m->m_pkthdr.len > off + sizeof(ip6e))
+ return;
+ m_copydata(m, off, sizeof(ip6e), (caddr_t)&ip6e);
+ off += (ip6e.ip6e_len + 2) << 2;
+ nxt = ip6e.ip6e_nxt;
+ break;
+ case IPPROTO_ICMP:
+ default:
+ /* XXX intermediate headers??? */
+ spidx->ul_proto = nxt;
+ return;
+ }
+ }
}
-static void
+/* assumes that m is sane */
+static int
ipsec4_setspidx_ipaddr(m, spidx)
struct mbuf *m;
struct secpolicyindex *spidx;
{
struct ip *ip = NULL;
struct ip ipbuf;
+ struct sockaddr_in *sin;
- /* sanity check 1 for minimum ip header length */
- if (m == NULL)
- panic("ipsec4_setspidx_ipaddr: m == 0 passed.\n");
-
- if (m->m_pkthdr.len < sizeof(struct ip)) {
- printf("ipsec4_setspidx_ipaddr: "
- "pkthdr.len(%d) < sizeof(struct ip), "
- "ignored.\n",
- m->m_pkthdr.len);
- return;
- }
-
- if (m && m->m_len >= sizeof(*ip))
+ if (m->m_len >= sizeof(*ip))
ip = mtod(m, struct ip *);
else {
m_copydata(m, 0, sizeof(ipbuf), (caddr_t)&ipbuf);
ip = &ipbuf;
}
- bcopy(&ip->ip_src, _INADDRBYSA(&spidx->src), sizeof(ip->ip_src));
- bcopy(&ip->ip_dst, _INADDRBYSA(&spidx->dst), sizeof(ip->ip_dst));
+ sin = (struct sockaddr_in *)&spidx->src;
+ bzero(sin, sizeof(*sin));
+ sin->sin_family = AF_INET;
+ sin->sin_len = sizeof(struct sockaddr_in);
+ bcopy(&ip->ip_src, &sin->sin_addr, sizeof(ip->ip_src));
+ spidx->prefs = sizeof(struct in_addr) << 3;
- return;
+ sin = (struct sockaddr_in *)&spidx->dst;
+ bzero(sin, sizeof(*sin));
+ sin->sin_family = AF_INET;
+ sin->sin_len = sizeof(struct sockaddr_in);
+ bcopy(&ip->ip_dst, &sin->sin_addr, sizeof(ip->ip_dst));
+ spidx->prefd = sizeof(struct in_addr) << 3;
+ return 0;
}
#if INET6
static void
-ipsec6_setspidx_in6pcb(m, pcb)
+ipsec6_get_ulp(m, spidx, needport)
struct mbuf *m;
- struct in6pcb *pcb;
-{
struct secpolicyindex *spidx;
- struct sockaddr *sa1, *sa2;
+ int needport;
+{
+ int off, nxt;
+ struct tcphdr th;
+ struct udphdr uh;
/* sanity check */
- if (pcb == NULL)
- panic("ipsec6_setspidx_in6pcb: no PCB found.\n");
- if (pcb->in6p_sp == NULL)
- panic("ipsec6_setspidx_in6pcb: no in6p_sp found.\n");
- if (pcb->in6p_sp->sp_out ==NULL || pcb->in6p_sp->sp_in == NULL)
- panic("ipsec6_setspidx_in6pcb: no sp_in/out found.\n");
+ if (m == NULL)
+ panic("ipsec6_get_ulp: NULL pointer was passed.\n");
- bzero(&pcb->in6p_sp->sp_in->spidx, sizeof(*spidx));
- bzero(&pcb->in6p_sp->sp_out->spidx, sizeof(*spidx));
+ KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
+ printf("ipsec6_get_ulp:\n"); kdebug_mbuf(m));
- spidx = &pcb->in6p_sp->sp_in->spidx;
- spidx->dir = IPSEC_DIR_INBOUND;
- sa1 = (struct sockaddr *)&spidx->src;
- sa2 = (struct sockaddr *)&spidx->dst;
- sa1->sa_len = sa2->sa_len = _SALENBYAF(AF_INET6);
- sa1->sa_family = sa2->sa_family = AF_INET6;
- spidx->prefs = _INALENBYAF(AF_INET6) << 3;
- spidx->prefd = _INALENBYAF(AF_INET6) << 3;
- spidx->ul_proto = pcb->in6p_socket->so_proto->pr_protocol;
- _INPORTBYSA(&spidx->src) = pcb->in6p_fport;
- _INPORTBYSA(&spidx->dst) = pcb->in6p_lport;
- ipsec6_setspidx_ipaddr(m, spidx);
+ /* set default */
+ spidx->ul_proto = IPSEC_ULPROTO_ANY;
+ ((struct sockaddr_in6 *)&spidx->src)->sin6_port = IPSEC_PORT_ANY;
+ ((struct sockaddr_in6 *)&spidx->dst)->sin6_port = IPSEC_PORT_ANY;
- spidx = &pcb->in6p_sp->sp_out->spidx;
- spidx->dir = IPSEC_DIR_OUTBOUND;
- sa1 = (struct sockaddr *)&spidx->src;
- sa2 = (struct sockaddr *)&spidx->dst;
- sa1->sa_len = sa2->sa_len = _SALENBYAF(AF_INET6);
- sa1->sa_family = sa2->sa_family = AF_INET6;
- spidx->prefs = _INALENBYAF(AF_INET6) << 3;
- spidx->prefd = _INALENBYAF(AF_INET6) << 3;
- spidx->ul_proto = pcb->in6p_socket->so_proto->pr_protocol;
- _INPORTBYSA(&spidx->src) = pcb->in6p_lport;
- _INPORTBYSA(&spidx->dst) = pcb->in6p_fport;
- ipsec6_setspidx_ipaddr(m, spidx);
+ nxt = -1;
+ off = ip6_lasthdr(m, 0, IPPROTO_IPV6, &nxt);
+ if (off < 0 || m->m_pkthdr.len < off)
+ return;
- return;
+ switch (nxt) {
+ case IPPROTO_TCP:
+ spidx->ul_proto = nxt;
+ if (!needport)
+ break;
+ if (off + sizeof(struct tcphdr) > m->m_pkthdr.len)
+ break;
+ m_copydata(m, off, sizeof(th), (caddr_t)&th);
+ ((struct sockaddr_in6 *)&spidx->src)->sin6_port = th.th_sport;
+ ((struct sockaddr_in6 *)&spidx->dst)->sin6_port = th.th_dport;
+ break;
+ case IPPROTO_UDP:
+ spidx->ul_proto = nxt;
+ if (!needport)
+ break;
+ if (off + sizeof(struct udphdr) > m->m_pkthdr.len)
+ break;
+ m_copydata(m, off, sizeof(uh), (caddr_t)&uh);
+ ((struct sockaddr_in6 *)&spidx->src)->sin6_port = uh.uh_sport;
+ ((struct sockaddr_in6 *)&spidx->dst)->sin6_port = uh.uh_dport;
+ break;
+ case IPPROTO_ICMPV6:
+ default:
+ /* XXX intermediate headers??? */
+ spidx->ul_proto = nxt;
+ break;
+ }
}
-static void
+/* assumes that m is sane */
+static int
ipsec6_setspidx_ipaddr(m, spidx)
struct mbuf *m;
struct secpolicyindex *spidx;
{
struct ip6_hdr *ip6 = NULL;
struct ip6_hdr ip6buf;
-
- /* sanity check 1 for minimum ip header length */
- if (m == NULL)
- panic("ipsec6_setspidx_in6pcb: m == 0 passed.\n");
-
- if (m->m_pkthdr.len < sizeof(struct ip6_hdr)) {
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec6_setspidx_ipaddr: "
- "pkthdr.len(%d) < sizeof(struct ip6_hdr), "
- "ignored.\n",
- m->m_pkthdr.len));
- return;
- }
+ struct sockaddr_in6 *sin6;
if (m->m_len >= sizeof(*ip6))
ip6 = mtod(m, struct ip6_hdr *);
ip6 = &ip6buf;
}
- if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) {
- KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
- printf("ipsec_setspidx_mbuf: "
- "wrong ip version on packet "
- "(expected IPv6), ignored.\n"));
- return;
+ sin6 = (struct sockaddr_in6 *)&spidx->src;
+ bzero(sin6, sizeof(*sin6));
+ sin6->sin6_family = AF_INET6;
+ sin6->sin6_len = sizeof(struct sockaddr_in6);
+ bcopy(&ip6->ip6_src, &sin6->sin6_addr, sizeof(ip6->ip6_src));
+ if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) {
+ sin6->sin6_addr.s6_addr16[1] = 0;
+ sin6->sin6_scope_id = ntohs(ip6->ip6_src.s6_addr16[1]);
}
+ spidx->prefs = sizeof(struct in6_addr) << 3;
- bcopy(&ip6->ip6_src, _INADDRBYSA(&spidx->src), sizeof(ip6->ip6_src));
- bcopy(&ip6->ip6_dst, _INADDRBYSA(&spidx->dst), sizeof(ip6->ip6_dst));
+ sin6 = (struct sockaddr_in6 *)&spidx->dst;
+ bzero(sin6, sizeof(*sin6));
+ sin6->sin6_family = AF_INET6;
+ sin6->sin6_len = sizeof(struct sockaddr_in6);
+ bcopy(&ip6->ip6_dst, &sin6->sin6_addr, sizeof(ip6->ip6_dst));
+ if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) {
+ sin6->sin6_addr.s6_addr16[1] = 0;
+ sin6->sin6_scope_id = ntohs(ip6->ip6_dst.s6_addr16[1]);
+ }
+ spidx->prefd = sizeof(struct in6_addr) << 3;
- return;
+ return 0;
}
#endif
ipsec_delpcbpolicy(p)
struct inpcbpolicy *p;
{
- _FREE(p, M_SECA);
+ FREE(p, M_SECA);
}
/* initialize policy in PCB */
}
bzero(new, sizeof(*new));
-#if defined(__NetBSD__) || defined (__APPLE__)
- if (so->so_uid == 0) /*XXX*/
- new->priv = 1;
- else
- new->priv = 0;
-#elif defined(__FreeBSD__) && __FreeBSD__ >= 3
+#ifdef __APPLE__
+ if (so->so_uid == 0)
+#else
if (so->so_cred != 0 && so->so_cred->pc_ucred->cr_uid == 0)
+#endif
new->priv = 1;
else
new->priv = 0;
- KEYDEBUG(KEYDEBUG_IPSEC_DATA,
- printf("init: priv=%d ", new->priv);
- if (so->so_cred) {
- printf("p_ruid=%d ", so->so_cred->p_ruid);
- printf("p_svuid=%d ", so->so_cred->p_svuid);
- printf("cr_uid=%d\n", so->so_cred->pc_ucred->cr_uid);
- } else
- printf("so_cred is NULL\n");
- );
-#else
- new->priv = so->so_state & SS_PRIV;
-#endif
-
if ((new->sp_in = key_newsp()) == NULL) {
ipsec_delpcbpolicy(new);
return ENOBUFS;
{
struct secpolicy *sp;
+ if (ipsec_bypass != 0)
+ return 0;
+
sp = ipsec_deepcopy_policy(old->sp_in);
if (sp) {
key_freesp(new->sp_in);
fail:
for (p = newchain; p; p = r) {
r = p->next;
- _FREE(p, M_SECA);
+ FREE(p, M_SECA);
p = NULL;
}
return NULL;
return ENOBUFS;
}
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 || defined (__APPLE__)
(*mp)->m_type = MT_DATA;
-#else
- (*mp)->m_type = MT_SOOPTS;
-#endif
KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
printf("ipsec_get_policy:\n");
kdebug_mbuf(*mp));
{
struct sadb_x_policy *xpl;
struct secpolicy **pcb_sp;
+ int error = 0;
/* sanity check. */
if (inp == NULL || request == NULL)
return EINVAL;
xpl = (struct sadb_x_policy *)request;
+ if (inp->inp_sp == NULL) {
+ error = ipsec_init_policy(inp->inp_socket, &inp->inp_sp);
+ if (error)
+ return error;
+ }
+
/* select direction */
switch (xpl->sadb_x_policy_dir) {
case IPSEC_DIR_INBOUND:
return EINVAL;
}
+ /* turn bypass off */
+ if (ipsec_bypass != 0)
+ ipsec_bypass = 0;
+
return ipsec_set_policy(pcb_sp, optname, request, len, priv);
}
{
struct sadb_x_policy *xpl;
struct secpolicy *pcb_sp;
+ int error = 0;
/* sanity check. */
if (inp == NULL || request == NULL || mp == NULL)
return EINVAL;
- if (inp->inp_sp == NULL)
- panic("policy in PCB is NULL\n");
if (len < sizeof(*xpl))
return EINVAL;
xpl = (struct sadb_x_policy *)request;
+
+ if (inp->inp_sp == NULL) {
+ error = ipsec_init_policy(inp->inp_socket, &inp->inp_sp);
+ if (error)
+ return error;
+ }
/* select direction */
switch (xpl->sadb_x_policy_dir) {
{
struct sadb_x_policy *xpl;
struct secpolicy **pcb_sp;
+ int error = 0;
/* sanity check. */
if (in6p == NULL || request == NULL)
if (len < sizeof(*xpl))
return EINVAL;
xpl = (struct sadb_x_policy *)request;
+
+ if (in6p->in6p_sp == NULL) {
+ error = ipsec_init_policy(in6p->inp_socket, &in6p->in6p_sp);
+ if (error)
+ return error;
+ }
/* select direction */
switch (xpl->sadb_x_policy_dir) {
return EINVAL;
}
+ /* turn bypass off */
+ if (ipsec_bypass != 0)
+ ipsec_bypass = 0;
+
return ipsec_set_policy(pcb_sp, optname, request, len, priv);
}
{
struct sadb_x_policy *xpl;
struct secpolicy *pcb_sp;
+ int error = 0;
/* sanity check. */
if (in6p == NULL || request == NULL || mp == NULL)
return EINVAL;
- if (in6p->in6p_sp == NULL)
- panic("policy in PCB is NULL\n");
if (len < sizeof(*xpl))
return EINVAL;
xpl = (struct sadb_x_policy *)request;
+
+ if (in6p->in6p_sp == NULL) {
+ error = ipsec_init_policy(in6p->inp_socket, &in6p->in6p_sp);
+ if (error)
+ return error;
+ }
/* select direction */
switch (xpl->sadb_x_policy_dir) {
((struct sockaddr *)&isr->sp->spidx.src)->sa_family);
}
-#undef IPSEC_CHECK_DEFAULT(lev)
+#undef IPSEC_CHECK_DEFAULT
/* set level */
switch (isr->level) {
need_conf = 0;
need_icv = 0;
+ /* XXX should compare policy against ipsec header history */
+
for (isr = sp->req; isr != NULL; isr = isr->next) {
/* get current level */
case IPPROTO_IPCOMP:
/*
* we don't really care, as IPcomp document says that
- * we shouldn't compress small packets
+ * we shouldn't compress small packets, IPComp policy
+ * should always be treated as being in "use" level.
*/
break;
}
{
if (inp == NULL)
return ipsec4_in_reject_so(m, NULL);
- else {
- if (inp->inp_socket)
- return ipsec4_in_reject_so(m, inp->inp_socket);
- else
- panic("ipsec4_in_reject: invalid inpcb/socket");
- }
+ if (inp->inp_socket)
+ return ipsec4_in_reject_so(m, inp->inp_socket);
+ else
+ panic("ipsec4_in_reject: invalid inpcb/socket");
}
#if INET6
{
if (in6p == NULL)
return ipsec6_in_reject_so(m, NULL);
- else {
- if (in6p->in6p_socket)
- return ipsec6_in_reject_so(m, in6p->in6p_socket);
- else
- panic("ipsec6_in_reject: invalid in6p/socket");
- }
+ if (in6p->in6p_socket)
+ return ipsec6_in_reject_so(m, in6p->in6p_socket);
+ else
+ panic("ipsec6_in_reject: invalid in6p/socket");
}
#endif
size_t siz, clen;
KEYDEBUG(KEYDEBUG_IPSEC_DATA,
- printf("ipsec_in_reject: using SP\n");
+ printf("ipsec_hdrsiz: using SP\n");
kdebug_secpolicy(sp));
/* check policy */
}
#if 0
/* XXX if the dst is myself, perform nothing. */
- if (key_ismyaddr(AF_INET, _INADDRBYSA(&sav->sah->saidx.dst))) {
+ if (key_ismyaddr((struct sockaddr *)&sav->sah->saidx.dst)) {
m_freem(m);
return EINVAL;
}
ip = mtod(m, struct ip *);
#ifdef _IP_VHL
- hlen = IP_VHL_HL(ip->ip_vhl) << 2;
+ hlen = _IP_VHL_HL(ip->ip_vhl) << 2;
#else
hlen = ip->ip_hl << 2;
#endif
ip->ip_off &= htons(~IP_OFFMASK);
ip->ip_off &= htons(~IP_MF);
switch (ip4_ipsec_dfbit) {
- case 0: /*clear DF bit*/
+ case 0: /* clear DF bit */
ip->ip_off &= htons(~IP_DF);
break;
- case 1: /*set DF bit*/
+ case 1: /* set DF bit */
ip->ip_off |= htons(IP_DF);
break;
- default: /*copy DF bit*/
+ default: /* copy DF bit */
break;
}
ip->ip_p = IPPROTO_IPIP;
ipseclog((LOG_ERR, "IPv4 ipsec: size exceeds limit: "
"leave ip_len as is (invalid packet)\n"));
}
+#ifdef RANDOM_IP_ID
+ ip->ip_id = ip_randomid();
+#else
ip->ip_id = htons(ip_id++);
+#endif
bcopy(&((struct sockaddr_in *)&sav->sah->saidx.src)->sin_addr,
&ip->ip_src, sizeof(ip->ip_src));
bcopy(&((struct sockaddr_in *)&sav->sah->saidx.dst)->sin_addr,
&ip->ip_dst, sizeof(ip->ip_dst));
+ ip->ip_ttl = IPDEFTTL;
/* XXX Should ip_src be updated later ? */
}
#if 0
/* XXX if the dst is myself, perform nothing. */
- if (key_ismyaddr(AF_INET6, _INADDRBYSA(&sav->sah->saidx.dst))) {
+ if (key_ismyaddr((struct sockaddr *)&sav->sah->saidx.dst)) {
m_freem(m);
return EINVAL;
}
&ip6->ip6_src, sizeof(ip6->ip6_src));
bcopy(&((struct sockaddr_in6 *)&sav->sah->saidx.dst)->sin6_addr,
&ip6->ip6_dst, sizeof(ip6->ip6_dst));
+ ip6->ip6_hlim = IPV6_DEFHLIM;
/* XXX Should ip6_src be updated later ? */
}
/*
- * shift variable length bunffer to left.
+ * shift variable length buffer to left.
* IN: bitmap: pointer to the buffer
* nbit: the number of to shift.
* wsize: buffer size (bytes).
snprintf(buf, sizeof(buf), "packet(SPI=%u ", (u_int32_t)ntohl(spi));
while (p && *p)
p++;
- snprintf(p, sizeof(buf) - (p - buf), "src=%d.%d.%d.%d",
+ snprintf(p, sizeof(buf) - (p - buf), "src=%u.%u.%u.%u",
s[0], s[1], s[2], s[3]);
while (p && *p)
p++;
- snprintf(p, sizeof(buf) - (p - buf), " dst=%d.%d.%d.%d",
+ snprintf(p, sizeof(buf) - (p - buf), " dst=%u.%u.%u.%u",
d[0], d[1], d[2], d[3]);
while (p && *p)
p++;
printf("---\n");
}
+#if INET
/*
* IPsec output logic for IPv4.
*/
struct secasindex saidx;
int s;
int error;
-#if IPSEC_SRCSEL
- struct in_ifaddr *ia;
-#endif
struct sockaddr_in *dst4;
- struct sockaddr *sa;
+ struct sockaddr_in *sin;
if (!state)
panic("state == NULL in ipsec4_output");
if (!state->dst)
panic("state->dst == NULL in ipsec4_output");
+ KERNEL_DEBUG(DBG_FNC_IPSEC_OUT | DBG_FUNC_START, 0,0,0,0,0);
+
KEYDEBUG(KEYDEBUG_IPSEC_DATA,
printf("ipsec4_output: applyed SP\n");
kdebug_secpolicy(sp));
/* make SA index for search proper SA */
ip = mtod(state->m, struct ip *);
bcopy(&isr->saidx, &saidx, sizeof(saidx));
- sa = (struct sockaddr *)&saidx.src;
- if (sa->sa_len == 0) {
- sa->sa_len = _SALENBYAF(AF_INET);
- sa->sa_family = AF_INET;
- _INPORTBYSA(&saidx.src) = IPSEC_PORT_ANY;
- bcopy(&ip->ip_src, _INADDRBYSA(&saidx.src),
- sizeof(ip->ip_src));
+ saidx.mode = isr->saidx.mode;
+ saidx.reqid = isr->saidx.reqid;
+ sin = (struct sockaddr_in *)&saidx.src;
+ if (sin->sin_len == 0) {
+ sin->sin_len = sizeof(*sin);
+ sin->sin_family = AF_INET;
+ sin->sin_port = IPSEC_PORT_ANY;
+ bcopy(&ip->ip_src, &sin->sin_addr,
+ sizeof(sin->sin_addr));
}
- sa = (struct sockaddr *)&saidx.dst;
- if (sa->sa_len == 0) {
- sa->sa_len = _SALENBYAF(AF_INET);
- sa->sa_family = AF_INET;
- _INPORTBYSA(&saidx.dst) = IPSEC_PORT_ANY;
- bcopy(&ip->ip_dst, _INADDRBYSA(&saidx.dst),
- sizeof(ip->ip_dst));
+ sin = (struct sockaddr_in *)&saidx.dst;
+ if (sin->sin_len == 0) {
+ sin->sin_len = sizeof(*sin);
+ sin->sin_family = AF_INET;
+ sin->sin_port = IPSEC_PORT_ANY;
+ bcopy(&ip->ip_dst, &sin->sin_addr,
+ sizeof(sin->sin_addr));
}
if ((error = key_checkrequest(isr, &saidx)) != 0) {
* There may be the case that SA status will be changed when
* we are refering to one. So calling splsoftnet().
*/
-#if __NetBSD__
- s = splsoftnet();
-#else
s = splnet();
-#endif
if (isr->saidx.mode == IPSEC_MODE_TUNNEL) {
/*
goto bad;
}
- ip = mtod(state->m, struct ip *);
-
state->m = ipsec4_splithdr(state->m);
if (!state->m) {
splx(s);
if (state->ro->ro_rt
&& ((state->ro->ro_rt->rt_flags & RTF_UP) == 0
|| dst4->sin_addr.s_addr != ip->ip_dst.s_addr)) {
- RTFREE(state->ro->ro_rt);
- bzero((caddr_t)state->ro, sizeof (*state->ro));
+ rtfree(state->ro->ro_rt);
+ state->ro->ro_rt = NULL;
}
if (state->ro->ro_rt == 0) {
dst4->sin_family = AF_INET;
goto bad;
}
-#if IPSEC_SRCSEL
- /*
- * Which address in SA or in routing table should I
- * select from ? But I had set from SA at
- * ipsec4_encapsulate().
- */
- ia = (struct in_ifaddr *)(state->ro->ro_rt->rt_ifa);
+ /* adjust state->dst if tunnel endpoint is offlink */
if (state->ro->ro_rt->rt_flags & RTF_GATEWAY) {
state->dst = (struct sockaddr *)state->ro->ro_rt->rt_gateway;
dst4 = (struct sockaddr_in *)state->dst;
}
- ip->ip_src = IA_SIN(ia)->sin_addr;
-#endif
} else
splx(s);
ip = mtod(state->m, struct ip *);
}
+ KERNEL_DEBUG(DBG_FNC_IPSEC_OUT | DBG_FUNC_END, 0,0,0,0,0);
return 0;
bad:
m_freem(state->m);
state->m = NULL;
+ KERNEL_DEBUG(DBG_FNC_IPSEC_OUT | DBG_FUNC_END, error,0,0,0,0);
return error;
}
+#endif
#if INET6
/*
struct secasindex saidx;
int error = 0;
int plen;
- struct sockaddr *sa;
+ struct sockaddr_in6 *sin6;
if (!state)
- panic("state == NULL in ipsec6_output");
+ panic("state == NULL in ipsec6_output_trans");
if (!state->m)
- panic("state->m == NULL in ipsec6_output");
+ panic("state->m == NULL in ipsec6_output_trans");
if (!nexthdrp)
- panic("nexthdrp == NULL in ipsec6_output");
+ panic("nexthdrp == NULL in ipsec6_output_trans");
if (!mprev)
- panic("mprev == NULL in ipsec6_output");
+ panic("mprev == NULL in ipsec6_output_trans");
if (!sp)
- panic("sp == NULL in ipsec6_output");
+ panic("sp == NULL in ipsec6_output_trans");
if (!tun)
- panic("tun == NULL in ipsec6_output");
+ panic("tun == NULL in ipsec6_output_trans");
KEYDEBUG(KEYDEBUG_IPSEC_DATA,
printf("ipsec6_output_trans: applyed SP\n");
/* make SA index for search proper SA */
ip6 = mtod(state->m, struct ip6_hdr *);
bcopy(&isr->saidx, &saidx, sizeof(saidx));
- sa = (struct sockaddr *)&saidx.src;
- if (sa->sa_len == 0) {
- sa->sa_len = _SALENBYAF(AF_INET6);
- sa->sa_family = AF_INET6;
- _INPORTBYSA(&saidx.src) = IPSEC_PORT_ANY;
- bcopy(&ip6->ip6_src, _INADDRBYSA(&saidx.src),
- sizeof(ip6->ip6_src));
+ saidx.mode = isr->saidx.mode;
+ saidx.reqid = isr->saidx.reqid;
+ sin6 = (struct sockaddr_in6 *)&saidx.src;
+ if (sin6->sin6_len == 0) {
+ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_family = AF_INET6;
+ sin6->sin6_port = IPSEC_PORT_ANY;
+ bcopy(&ip6->ip6_src, &sin6->sin6_addr,
+ sizeof(ip6->ip6_src));
+ if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) {
+ /* fix scope id for comparing SPD */
+ sin6->sin6_addr.s6_addr16[1] = 0;
+ sin6->sin6_scope_id = ntohs(ip6->ip6_src.s6_addr16[1]);
+ }
}
- sa = (struct sockaddr *)&saidx.dst;
- if (sa->sa_len == 0) {
- sa->sa_len = _SALENBYAF(AF_INET6);
- sa->sa_family = AF_INET6;
- _INPORTBYSA(&saidx.dst) = IPSEC_PORT_ANY;
- bcopy(&ip6->ip6_dst, _INADDRBYSA(&saidx.dst),
- sizeof(ip6->ip6_dst));
+ sin6 = (struct sockaddr_in6 *)&saidx.dst;
+ if (sin6->sin6_len == 0) {
+ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_family = AF_INET6;
+ sin6->sin6_port = IPSEC_PORT_ANY;
+ bcopy(&ip6->ip6_dst, &sin6->sin6_addr,
+ sizeof(ip6->ip6_dst));
+ if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) {
+ /* fix scope id for comparing SPD */
+ sin6->sin6_addr.s6_addr16[1] = 0;
+ sin6->sin6_scope_id = ntohs(ip6->ip6_dst.s6_addr16[1]);
+ }
}
if (key_checkrequest(isr, &saidx) == ENOENT) {
*/
ipsec6stat.out_nosa++;
error = ENOENT;
+
+ /*
+ * Notify the fact that the packet is discarded
+ * to ourselves. I believe this is better than
+ * just silently discarding. (jinmei@kame.net)
+ * XXX: should we restrict the error to TCP packets?
+ * XXX: should we directly notify sockets via
+ * pfctlinputs?
+ */
+ icmp6_error(state->m, ICMP6_DST_UNREACH,
+ ICMP6_DST_UNREACH_ADMIN, 0);
+ state->m = NULL; /* icmp6_error freed the mbuf */
goto bad;
}
struct secasindex saidx;
int error = 0;
int plen;
-#if IPSEC_SRCSEL
- struct in6_addr *ia6;
-#endif
struct sockaddr_in6* dst6;
int s;
if (!state)
- panic("state == NULL in ipsec6_output");
+ panic("state == NULL in ipsec6_output_tunnel");
if (!state->m)
- panic("state->m == NULL in ipsec6_output");
+ panic("state->m == NULL in ipsec6_output_tunnel");
if (!sp)
- panic("sp == NULL in ipsec6_output");
+ panic("sp == NULL in ipsec6_output_tunnel");
KEYDEBUG(KEYDEBUG_IPSEC_DATA,
printf("ipsec6_output_tunnel: applyed SP\n");
break;
}
- for (/*already initialized*/; isr; isr = isr->next) {
- /* When tunnel mode, SA peers must be specified. */
- bcopy(&isr->saidx, &saidx, sizeof(saidx));
+ for (/* already initialized */; isr; isr = isr->next) {
+ if (isr->saidx.mode == IPSEC_MODE_TUNNEL) {
+ /* When tunnel mode, SA peers must be specified. */
+ bcopy(&isr->saidx, &saidx, sizeof(saidx));
+ } else {
+ /* make SA index to look for a proper SA */
+ struct sockaddr_in6 *sin6;
+
+ bzero(&saidx, sizeof(saidx));
+ saidx.proto = isr->saidx.proto;
+ saidx.mode = isr->saidx.mode;
+ saidx.reqid = isr->saidx.reqid;
+
+ ip6 = mtod(state->m, struct ip6_hdr *);
+ sin6 = (struct sockaddr_in6 *)&saidx.src;
+ if (sin6->sin6_len == 0) {
+ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_family = AF_INET6;
+ sin6->sin6_port = IPSEC_PORT_ANY;
+ bcopy(&ip6->ip6_src, &sin6->sin6_addr,
+ sizeof(ip6->ip6_src));
+ if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) {
+ /* fix scope id for comparing SPD */
+ sin6->sin6_addr.s6_addr16[1] = 0;
+ sin6->sin6_scope_id = ntohs(ip6->ip6_src.s6_addr16[1]);
+ }
+ }
+ sin6 = (struct sockaddr_in6 *)&saidx.dst;
+ if (sin6->sin6_len == 0) {
+ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_family = AF_INET6;
+ sin6->sin6_port = IPSEC_PORT_ANY;
+ bcopy(&ip6->ip6_dst, &sin6->sin6_addr,
+ sizeof(ip6->ip6_dst));
+ if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) {
+ /* fix scope id for comparing SPD */
+ sin6->sin6_addr.s6_addr16[1] = 0;
+ sin6->sin6_scope_id = ntohs(ip6->ip6_dst.s6_addr16[1]);
+ }
+ }
+ }
+
if (key_checkrequest(isr, &saidx) == ENOENT) {
/*
* IPsec processing is required, but no SA found.
* There may be the case that SA status will be changed when
* we are refering to one. So calling splsoftnet().
*/
-#if __NetBSD__
- s = splsoftnet();
-#else
s = splnet();
-#endif
if (isr->saidx.mode == IPSEC_MODE_TUNNEL) {
/*
goto bad;
}
- ip6 = mtod(state->m, struct ip6_hdr *);
-
state->m = ipsec6_splithdr(state->m);
if (!state->m) {
splx(s);
if (state->ro->ro_rt
&& ((state->ro->ro_rt->rt_flags & RTF_UP) == 0
|| !IN6_ARE_ADDR_EQUAL(&dst6->sin6_addr, &ip6->ip6_dst))) {
- RTFREE(state->ro->ro_rt);
- bzero((caddr_t)state->ro, sizeof (*state->ro));
+ rtfree(state->ro->ro_rt);
+ state->ro->ro_rt = NULL;
}
if (state->ro->ro_rt == 0) {
bzero(dst6, sizeof(*dst6));
error = EHOSTUNREACH;
goto bad;
}
-#if 0 /* XXX Is the following need ? */
+
+ /* adjust state->dst if tunnel endpoint is offlink */
if (state->ro->ro_rt->rt_flags & RTF_GATEWAY) {
state->dst = (struct sockaddr *)state->ro->ro_rt->rt_gateway;
dst6 = (struct sockaddr_in6 *)state->dst;
}
-#endif
-#if IPSEC_SRCSEL
- /*
- * Which address in SA or in routing table should I
- * select from ? But I had set from SA at
- * ipsec6_encapsulate().
- */
- ia6 = in6_selectsrc(dst6, NULL, NULL,
- (struct route_in6 *)state->ro,
- NULL, &error);
- if (ia6 == NULL) {
- ip6stat.ip6s_noroute++;
- ipsec6stat.out_noroute++;
- goto bad;
- }
- ip6->ip6_src = *ia6;
-#endif
} else
splx(s);
}
#endif /*INET6*/
+#if INET
/*
* Chop IP header and option off from the payload.
*/
panic("ipsec4_splithdr: first mbuf too short");
ip = mtod(m, struct ip *);
#ifdef _IP_VHL
- hlen = IP_VHL_HL(ip->ip_vhl) << 2;
+ hlen = _IP_VHL_HL(ip->ip_vhl) << 2;
#else
hlen = ip->ip_hl << 2;
#endif
}
return m;
}
+#endif
#if INET6
static struct mbuf *
/* validate inbound IPsec tunnel packet. */
int
-ipsec4_tunnel_validate(ip, nxt0, sav)
- struct ip *ip;
+ipsec4_tunnel_validate(m, off, nxt0, sav)
+ struct mbuf *m; /* no pullup permitted, m->m_len >= ip */
+ int off;
u_int nxt0;
struct secasvar *sav;
{
u_int8_t nxt = nxt0 & 0xff;
struct sockaddr_in *sin;
+ struct sockaddr_in osrc, odst, isrc, idst;
int hlen;
+ struct secpolicy *sp;
+ struct ip *oip;
+#if DIAGNOSTIC
+ if (m->m_len < sizeof(struct ip))
+ panic("too short mbuf on ipsec4_tunnel_validate");
+#endif
if (nxt != IPPROTO_IPV4)
return 0;
+ if (m->m_pkthdr.len < off + sizeof(struct ip))
+ return 0;
+ /* do not decapsulate if the SA is for transport mode only */
+ if (sav->sah->saidx.mode == IPSEC_MODE_TRANSPORT)
+ return 0;
+
+ oip = mtod(m, struct ip *);
#ifdef _IP_VHL
- hlen = IP_VHL_HL(ip->ip_vhl) << 2;
+ hlen = _IP_VHL_HL(oip->ip_vhl) << 2;
#else
- hlen = ip->ip_hl << 2;
+ hlen = oip->ip_hl << 2;
#endif
if (hlen != sizeof(struct ip))
return 0;
- switch (((struct sockaddr *)&sav->sah->saidx.dst)->sa_family) {
- case AF_INET:
- sin = (struct sockaddr_in *)&sav->sah->saidx.dst;
- if (bcmp(&ip->ip_dst, &sin->sin_addr, sizeof(ip->ip_dst)) != 0)
- return 0;
- break;
-#if INET6
- case AF_INET6:
- /* should be supported, but at this moment we don't. */
- /*FALLTHROUGH*/
-#endif
- default:
+
+ /* AF_INET6 should be supported, but at this moment we don't. */
+ sin = (struct sockaddr_in *)&sav->sah->saidx.dst;
+ if (sin->sin_family != AF_INET)
return 0;
- }
+ if (bcmp(&oip->ip_dst, &sin->sin_addr, sizeof(oip->ip_dst)) != 0)
+ return 0;
+
+ /* XXX slow */
+ bzero(&osrc, sizeof(osrc));
+ bzero(&odst, sizeof(odst));
+ bzero(&isrc, sizeof(isrc));
+ bzero(&idst, sizeof(idst));
+ osrc.sin_family = odst.sin_family = isrc.sin_family = idst.sin_family =
+ AF_INET;
+ osrc.sin_len = odst.sin_len = isrc.sin_len = idst.sin_len =
+ sizeof(struct sockaddr_in);
+ osrc.sin_addr = oip->ip_src;
+ odst.sin_addr = oip->ip_dst;
+ m_copydata(m, off + offsetof(struct ip, ip_src), sizeof(isrc.sin_addr),
+ (caddr_t)&isrc.sin_addr);
+ m_copydata(m, off + offsetof(struct ip, ip_dst), sizeof(idst.sin_addr),
+ (caddr_t)&idst.sin_addr);
+
+ /*
+ * RFC2401 5.2.1 (b): (assume that we are using tunnel mode)
+ * - if the inner destination is multicast address, there can be
+ * multiple permissible inner source address. implementation
+ * may want to skip verification of inner source address against
+ * SPD selector.
+ * - if the inner protocol is ICMP, the packet may be an error report
+ * from routers on the other side of the VPN cloud (R in the
+ * following diagram). in this case, we cannot verify inner source
+ * address against SPD selector.
+ * me -- gw === gw -- R -- you
+ *
+ * we consider the first bullet to be users responsibility on SPD entry
+ * configuration (if you need to encrypt multicast traffic, set
+ * the source range of SPD selector to 0.0.0.0/0, or have explicit
+ * address ranges for possible senders).
+ * the second bullet is not taken care of (yet).
+ *
+ * therefore, we do not do anything special about inner source.
+ */
+
+ sp = key_gettunnel((struct sockaddr *)&osrc, (struct sockaddr *)&odst,
+ (struct sockaddr *)&isrc, (struct sockaddr *)&idst);
+ if (!sp)
+ return 0;
+ key_freesp(sp);
return 1;
}
#if INET6
/* validate inbound IPsec tunnel packet. */
int
-ipsec6_tunnel_validate(ip6, nxt0, sav)
- struct ip6_hdr *ip6;
+ipsec6_tunnel_validate(m, off, nxt0, sav)
+ struct mbuf *m; /* no pullup permitted, m->m_len >= ip */
+ int off;
u_int nxt0;
struct secasvar *sav;
{
u_int8_t nxt = nxt0 & 0xff;
struct sockaddr_in6 *sin6;
+ struct sockaddr_in6 osrc, odst, isrc, idst;
+ struct secpolicy *sp;
+ struct ip6_hdr *oip6;
+#if DIAGNOSTIC
+ if (m->m_len < sizeof(struct ip6_hdr))
+ panic("too short mbuf on ipsec6_tunnel_validate");
+#endif
if (nxt != IPPROTO_IPV6)
return 0;
- switch (((struct sockaddr *)&sav->sah->saidx.dst)->sa_family) {
- case AF_INET6:
- sin6 = ((struct sockaddr_in6 *)&sav->sah->saidx.dst);
- if (!IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &sin6->sin6_addr))
- return 0;
- break;
- case AF_INET:
- /* should be supported, but at this moment we don't. */
- /*FALLTHROUGH*/
- default:
+ if (m->m_pkthdr.len < off + sizeof(struct ip6_hdr))
return 0;
- }
+ /* do not decapsulate if the SA is for transport mode only */
+ if (sav->sah->saidx.mode == IPSEC_MODE_TRANSPORT)
+ return 0;
+
+ oip6 = mtod(m, struct ip6_hdr *);
+ /* AF_INET should be supported, but at this moment we don't. */
+ sin6 = (struct sockaddr_in6 *)&sav->sah->saidx.dst;
+ if (sin6->sin6_family != AF_INET6)
+ return 0;
+ if (!IN6_ARE_ADDR_EQUAL(&oip6->ip6_dst, &sin6->sin6_addr))
+ return 0;
+
+ /* XXX slow */
+ bzero(&osrc, sizeof(osrc));
+ bzero(&odst, sizeof(odst));
+ bzero(&isrc, sizeof(isrc));
+ bzero(&idst, sizeof(idst));
+ osrc.sin6_family = odst.sin6_family = isrc.sin6_family =
+ idst.sin6_family = AF_INET6;
+ osrc.sin6_len = odst.sin6_len = isrc.sin6_len = idst.sin6_len =
+ sizeof(struct sockaddr_in6);
+ osrc.sin6_addr = oip6->ip6_src;
+ odst.sin6_addr = oip6->ip6_dst;
+ m_copydata(m, off + offsetof(struct ip6_hdr, ip6_src),
+ sizeof(isrc.sin6_addr), (caddr_t)&isrc.sin6_addr);
+ m_copydata(m, off + offsetof(struct ip6_hdr, ip6_dst),
+ sizeof(idst.sin6_addr), (caddr_t)&idst.sin6_addr);
+
+ /*
+ * regarding to inner source address validation, see a long comment
+ * in ipsec4_tunnel_validate.
+ */
+
+ sp = key_gettunnel((struct sockaddr *)&osrc, (struct sockaddr *)&odst,
+ (struct sockaddr *)&isrc, (struct sockaddr *)&idst);
+ /*
+ * when there is no suitable inbound policy for the packet of the ipsec
+ * tunnel mode, the kernel never decapsulate the tunneled packet
+ * as the ipsec tunnel mode even when the system wide policy is "none".
+ * then the kernel leaves the generic tunnel module to process this
+ * packet. if there is no rule of the generic tunnel, the packet
+ * is rejected and the statistics will be counted up.
+ */
+ if (!sp)
+ return 0;
+ key_freesp(sp);
return 1;
}
* XXX: is this approach effective?
*/
if (
-#if __bsdi__
- n->m_ext.ext_func ||
-#else
n->m_ext.ext_free ||
-#endif
-#if __NetBSD__
- MCLISREFERENCED(n)
-#else
- mclrefcnt[mtocl(n->m_ext.ext_buf)] > 1
-#endif
+ m_mclhasreference(n)
)
{
int remain, copied;
*/
remain = n->m_len;
copied = 0;
- while(1) {
+ while (1) {
int len;
struct mbuf *mn;
MGETHDR(mn, M_DONTWAIT, MT_HEADER);
if (mn == NULL)
goto fail;
+ mn->m_pkthdr.rcvif = NULL;
mm->m_next = mn;
mm = mn;
}
return(NULL);
}
-void
-ipsec_setsocket(m, so)
+static struct mbuf *
+ipsec_addaux(m)
struct mbuf *m;
- struct socket *so;
{
struct mbuf *n;
n = m_aux_find(m, AF_INET, IPPROTO_ESP);
- if (so && !n)
+ if (!n)
n = m_aux_add(m, AF_INET, IPPROTO_ESP);
- if (n) {
- if (so) {
- *mtod(n, struct socket **) = so;
- /*
- * XXX think again about it when we put decryption
- * histrory into aux mbuf
- */
- n->m_len = sizeof(struct socket *);
- } else
- m_aux_delete(m, n);
- }
+ if (!n)
+ return n; /* ENOBUFS */
+ n->m_len = sizeof(struct socket *);
+ bzero(mtod(n, void *), n->m_len);
+ return n;
}
-struct socket *
-ipsec_getsocket(m)
+static struct mbuf *
+ipsec_findaux(m)
struct mbuf *m;
{
struct mbuf *n;
n = m_aux_find(m, AF_INET, IPPROTO_ESP);
- if (n && n->m_len >= sizeof(struct socket *))
- return *mtod(n, struct socket **);
- else
- return NULL;
+#if DIAGNOSTIC
+ if (n && n->m_len < sizeof(struct socket *))
+ panic("invalid ipsec m_aux");
+#endif
+ return n;
}
-#ifdef __bsdi__
-/*
- * System control for IP
- */
-u_char ipsecctlerrmap[PRC_NCMDS] = {
- 0, 0, 0, 0,
- 0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH,
- EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED,
- EMSGSIZE, EHOSTUNREACH, 0, 0,
- 0, 0, 0, 0,
- ENOPROTOOPT
-};
-
-int *ipsec_sysvars[] = IPSECCTL_VARS;
-
-int
-ipsec_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
- int *name;
- u_int namelen;
- void *oldp;
- size_t *oldlenp;
- void *newp;
- size_t newlen;
+void
+ipsec_delaux(m)
+ struct mbuf *m;
{
- if (name[0] >= IPSECCTL_MAXID)
- return (EOPNOTSUPP);
-
- switch (name[0]) {
- case IPSECCTL_STATS:
- return sysctl_rdtrunc(oldp, oldlenp, newp, &ipsecstat,
- sizeof(ipsecstat));
- case IPSECCTL_DEF_POLICY:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_POLICY_DISCARD:
- case IPSEC_POLICY_NONE:
- break;
- default:
- return EINVAL;
- }
- }
- return (sysctl_int_arr(ipsec_sysvars, name, namelen,
- oldp, oldlenp, newp, newlen));
- case IPSECCTL_DEF_ESP_TRANSLEV:
- case IPSECCTL_DEF_ESP_NETLEV:
- case IPSECCTL_DEF_AH_TRANSLEV:
- case IPSECCTL_DEF_AH_NETLEV:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_LEVEL_USE:
- case IPSEC_LEVEL_REQUIRE:
- break;
- default:
- return EINVAL;
- }
- }
- return (sysctl_int_arr(ipsec_sysvars, name, namelen,
- oldp, oldlenp, newp, newlen));
- default:
- return (sysctl_int_arr(ipsec_sysvars, name, namelen,
- oldp, oldlenp, newp, newlen));
- }
+ struct mbuf *n;
+
+ n = m_aux_find(m, AF_INET, IPPROTO_ESP);
+ if (n)
+ m_aux_delete(m, n);
}
-#if INET6
-/*
- * System control for IP6
- */
-u_char ipsec6ctlerrmap[PRC_NCMDS] = {
- 0, 0, 0, 0,
- 0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH,
- EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED,
- EMSGSIZE, EHOSTUNREACH, 0, 0,
- 0, 0, 0, 0,
- ENOPROTOOPT
-};
+/* if the aux buffer is unnecessary, nuke it. */
+static void
+ipsec_optaux(m, n)
+ struct mbuf *m;
+ struct mbuf *n;
+{
-int *ipsec6_sysvars[] = IPSEC6CTL_VARS;
+ if (!n)
+ return;
+ if (n->m_len == sizeof(struct socket *) && !*mtod(n, struct socket **))
+ ipsec_delaux(m);
+}
int
-ipsec6_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
- int *name;
- u_int namelen;
- void *oldp;
- size_t *oldlenp;
- void *newp;
- size_t newlen;
+ipsec_setsocket(m, so)
+ struct mbuf *m;
+ struct socket *so;
{
- if (name[0] >= IPSECCTL_MAXID) /* xxx no 6 in this definition */
- return (EOPNOTSUPP);
-
- switch (name[0]) {
- case IPSECCTL_STATS: /* xxx no 6 in this definition */
- return sysctl_rdtrunc(oldp, oldlenp, newp, &ipsec6stat,
- sizeof(ipsec6stat));
- case IPSECCTL_DEF_POLICY:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_POLICY_DISCARD:
- case IPSEC_POLICY_NONE:
- break;
- default:
- return EINVAL;
- }
- }
- return (sysctl_int_arr(ipsec6_sysvars, name, namelen,
- oldp, oldlenp, newp, newlen));
- case IPSECCTL_DEF_ESP_TRANSLEV:
- case IPSECCTL_DEF_ESP_NETLEV:
- case IPSECCTL_DEF_AH_TRANSLEV:
- case IPSECCTL_DEF_AH_NETLEV:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_LEVEL_USE:
- case IPSEC_LEVEL_REQUIRE:
- break;
- default:
- return EINVAL;
- }
- }
- return (sysctl_int_arr(ipsec6_sysvars, name, namelen,
- oldp, oldlenp, newp, newlen));
- default:
- return (sysctl_int_arr(ipsec6_sysvars, name, namelen,
- oldp, oldlenp, newp, newlen));
- }
-}
-#endif /*INET6*/
-#endif /*__bsdi__*/
+ struct mbuf *n;
+ /* if so == NULL, don't insist on getting the aux mbuf */
+ if (so) {
+ n = ipsec_addaux(m);
+ if (!n)
+ return ENOBUFS;
+ } else
+ n = ipsec_findaux(m);
+ if (n && n->m_len >= sizeof(struct socket *))
+ *mtod(n, struct socket **) = so;
+ ipsec_optaux(m, n);
+ return 0;
+}
-#if __NetBSD__
-/*
- * System control for IPSEC
- */
-u_char ipsecctlermap[PRC_NCMDS] = {
- 0, 0, 0, 0,
- 0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH,
- EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED,
- EMSGSIZE, EHOSTUNREACH, 0, 0,
- 0, 0, 0, 0,
- ENOPROTOOPT
-};
+struct socket *
+ipsec_getsocket(m)
+ struct mbuf *m;
+{
+ struct mbuf *n;
-int *ipsec_sysvars[] = IPSECCTL_VARS;
+ n = ipsec_findaux(m);
+ if (n && n->m_len >= sizeof(struct socket *))
+ return *mtod(n, struct socket **);
+ else
+ return NULL;
+}
int
-ipsec_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
- int *name;
- u_int namelen;
- void *oldp;
- size_t *oldlenp;
- void *newp;
- size_t newlen;
+ipsec_addhist(m, proto, spi)
+ struct mbuf *m;
+ int proto;
+ u_int32_t spi;
{
- /* All sysctl names at this level are terminal. */
- if (namelen != 1)
- return ENOTDIR;
-
- /* common sanity checks */
- switch (name[0]) {
- case IPSECCTL_DEF_ESP_TRANSLEV:
- case IPSECCTL_DEF_ESP_NETLEV:
- case IPSECCTL_DEF_AH_TRANSLEV:
- case IPSECCTL_DEF_AH_NETLEV:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_LEVEL_USE:
- case IPSEC_LEVEL_REQUIRE:
- break;
- default:
- return EINVAL;
- }
- }
- }
-
- switch (name[0]) {
+ struct mbuf *n;
+ struct ipsec_history *p;
- case IPSECCTL_STATS:
- return sysctl_struct(oldp, oldlenp, newp, newlen,
- &ipsecstat, sizeof(ipsecstat));
- case IPSECCTL_DEF_POLICY:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_POLICY_DISCARD:
- case IPSEC_POLICY_NONE:
- break;
- default:
- return EINVAL;
- }
- }
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_def_policy.policy);
- case IPSECCTL_DEF_ESP_TRANSLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_esp_trans_deflev);
- case IPSECCTL_DEF_ESP_NETLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_esp_net_deflev);
- case IPSECCTL_DEF_AH_TRANSLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_ah_trans_deflev);
- case IPSECCTL_DEF_AH_NETLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_ah_net_deflev);
- case IPSECCTL_INBOUND_CALL_IKE:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_inbound_call_ike);
- case IPSECCTL_AH_CLEARTOS:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_ah_cleartos);
- case IPSECCTL_AH_OFFSETMASK:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_ah_offsetmask);
- case IPSECCTL_DFBIT:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip4_ipsec_dfbit);
- case IPSECCTL_ECN:
- return sysctl_int(oldp, oldlenp, newp, newlen, &ip4_ipsec_ecn);
- case IPSECCTL_DEBUG:
- return sysctl_int(oldp, oldlenp, newp, newlen, &ipsec_debug);
- default:
- return EOPNOTSUPP;
- }
- /* NOTREACHED */
+ n = ipsec_addaux(m);
+ if (!n)
+ return ENOBUFS;
+ if (M_TRAILINGSPACE(n) < sizeof(*p))
+ return ENOSPC; /* XXX */
+ p = (struct ipsec_history *)(mtod(n, caddr_t) + n->m_len);
+ n->m_len += sizeof(*p);
+ bzero(p, sizeof(*p));
+ p->ih_proto = proto;
+ p->ih_spi = spi;
+ return 0;
}
-#if INET6
-/*
- * System control for IPSEC6
- */
-u_char ipsec6ctlermap[PRC_NCMDS] = {
- 0, 0, 0, 0,
- 0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH,
- EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED,
- EMSGSIZE, EHOSTUNREACH, 0, 0,
- 0, 0, 0, 0,
- ENOPROTOOPT
-};
+struct ipsec_history *
+ipsec_gethist(m, lenp)
+ struct mbuf *m;
+ int *lenp;
+{
+ struct mbuf *n;
+ int l;
-int *ipsec6_sysvars[] = IPSEC6CTL_VARS;
+ n = ipsec_findaux(m);
+ if (!n)
+ return NULL;
+ l = n->m_len;
+ if (sizeof(struct socket *) > l)
+ return NULL;
+ if ((l - sizeof(struct socket *)) % sizeof(struct ipsec_history))
+ return NULL;
+ /* XXX does it make more sense to divide by sizeof(ipsec_history)? */
+ if (lenp)
+ *lenp = l - sizeof(struct socket *);
+ return (struct ipsec_history *)
+ (mtod(n, caddr_t) + sizeof(struct socket *));
+}
-int
-ipsec6_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
- int *name;
- u_int namelen;
- void *oldp;
- size_t *oldlenp;
- void *newp;
- size_t newlen;
+void
+ipsec_clearhist(m)
+ struct mbuf *m;
{
- /* All sysctl names at this level are terminal. */
- if (namelen != 1)
- return ENOTDIR;
-
- /* common sanity checks */
- switch (name[0]) {
- case IPSECCTL_DEF_ESP_TRANSLEV:
- case IPSECCTL_DEF_ESP_NETLEV:
- case IPSECCTL_DEF_AH_TRANSLEV:
- case IPSECCTL_DEF_AH_NETLEV:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_LEVEL_USE:
- case IPSEC_LEVEL_REQUIRE:
- break;
- default:
- return EINVAL;
- }
- }
- }
-
- switch (name[0]) {
+ struct mbuf *n;
- case IPSECCTL_STATS:
- return sysctl_struct(oldp, oldlenp, newp, newlen,
- &ipsec6stat, sizeof(ipsec6stat));
- case IPSECCTL_DEF_POLICY:
- if (newp != NULL && newlen == sizeof(int)) {
- switch (*(int *)newp) {
- case IPSEC_POLICY_DISCARD:
- case IPSEC_POLICY_NONE:
- break;
- default:
- return EINVAL;
- }
- }
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip6_def_policy.policy);
- case IPSECCTL_DEF_ESP_TRANSLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip6_esp_trans_deflev);
- case IPSECCTL_DEF_ESP_NETLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip6_esp_net_deflev);
- case IPSECCTL_DEF_AH_TRANSLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip6_ah_trans_deflev);
- case IPSECCTL_DEF_AH_NETLEV:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip6_ah_net_deflev);
- case IPSECCTL_INBOUND_CALL_IKE:
- return sysctl_int(oldp, oldlenp, newp, newlen,
- &ip6_inbound_call_ike);
- case IPSECCTL_ECN:
- return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_ipsec_ecn);
- case IPSECCTL_DEBUG:
- return sysctl_int(oldp, oldlenp, newp, newlen, &ipsec_debug);
- default:
- return EOPNOTSUPP;
- }
- /* NOTREACHED */
+ n = ipsec_findaux(m);
+ if ((n) && n->m_len > sizeof(struct socket *))
+ n->m_len = sizeof(struct socket *);
+ ipsec_optaux(m, n);
}
-#endif /*INET6*/
-#endif /* __NetBSD__ */
+__private_extern__ void
+ipsec_send_natt_keepalive(
+ struct secasvar *sav)
+{
+ struct mbuf *m;
+ struct udphdr *uh;
+ struct ip *ip;
+
+ if ((esp_udp_encap_port & 0xFFFF) == 0 || sav->remote_ike_port == 0) return;
+
+ m = m_gethdr(M_NOWAIT, MT_DATA);
+ if (m == NULL) return;
+
+ /*
+ * Create a UDP packet complete with IP header.
+ * We must do this because UDP output requires
+ * an inpcb which we don't have. UDP packet
+ * contains one byte payload. The byte is set
+ * to 0xFF.
+ */
+ ip = (struct ip*)m_mtod(m);
+ uh = (struct udphdr*)((char*)m_mtod(m) + sizeof(struct ip));
+ m->m_len = sizeof(struct udpiphdr) + 1;
+ bzero(m_mtod(m), m->m_len);
+ ip->ip_len = ntohs(m->m_len);
+ ip->ip_ttl = ip_defttl;
+ ip->ip_p = IPPROTO_UDP;
+ ip->ip_src = ((struct sockaddr_in*)&sav->sah->saidx.src)->sin_addr;
+ ip->ip_dst = ((struct sockaddr_in*)&sav->sah->saidx.dst)->sin_addr;
+ uh->uh_sport = ntohs((u_short)esp_udp_encap_port);
+ uh->uh_dport = ntohs(sav->remote_ike_port);
+ uh->uh_ulen = htons(1 + sizeof(struct udphdr));
+ uh->uh_sum = 0;
+ *(u_int8_t*)((char*)m_mtod(m) + sizeof(struct ip) + sizeof(struct udphdr)) = 0xFF;
+
+ if (ip_output(m, NULL, &sav->sah->sa_route, IP_NOIPSEC, NULL) == 0)
+ sav->natt_last_activity = natt_now;
+}
projects / apple / xnu.git / blobdiff