X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..ebb1b9f42b62218f29061826217bb0f71cd375a6:/bsd/netinet6/ah_input.c

diff --git a/bsd/netinet6/ah_input.c b/bsd/netinet6/ah_input.c
index b79bf0895..a448295b7 100644
--- a/bsd/netinet6/ah_input.c
+++ b/bsd/netinet6/ah_input.c
@@ -1,3 +1,31 @@
+/*
+ * Copyright (c) 2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
 /*	$FreeBSD: src/sys/netinet6/ah_input.c,v 1.1.2.6 2002/04/28 05:40:26 suz Exp $	*/
 /*	$KAME: ah_input.c,v 1.67 2002/01/07 11:39:56 kjc Exp $	*/
 
@@ -88,6 +116,7 @@
 
 #include <net/kpi_protocol.h>
 #include <netinet/kpi_ipfilter_var.h>
+#include <mach/sdt.h>
 
 #include <net/net_osdep.h>
 
@@ -209,7 +238,7 @@ ah4_input(struct mbuf *m, int off)
 	if (siz1 < siz) {
 		ipseclog((LOG_NOTICE, "sum length too short in IPv4 AH input "
 		    "(%lu, should be at least %lu): %s\n",
-		    (u_long)siz1, (u_long)siz,
+		    (u_int32_t)siz1, (u_int32_t)siz,
 		    ipsec4_logpacketstr(ip, spi)));
 		IPSEC_STAT_INCREMENT(ipsecstat.in_inval);
 		goto fail;
@@ -217,7 +246,7 @@ ah4_input(struct mbuf *m, int off)
 	if ((ah->ah_len << 2) - sizoff != siz1) {
 		ipseclog((LOG_NOTICE, "sum length mismatch in IPv4 AH input "
 		    "(%d should be %lu): %s\n",
-		    (ah->ah_len << 2) - sizoff, (u_long)siz1,
+		    (ah->ah_len << 2) - sizoff, (u_int32_t)siz1,
 		    ipsec4_logpacketstr(ip, spi)));
 		IPSEC_STAT_INCREMENT(ipsecstat.in_inval);
 		goto fail;
@@ -388,6 +417,9 @@ ah4_input(struct mbuf *m, int off)
 		stripsiz = sizeof(struct newah) + siz1;
 	}
 	if (ipsec4_tunnel_validate(m, off + stripsiz, nxt, sav, &ifamily)) {
+		ifaddr_t ifa;
+		struct sockaddr_storage addr;
+
 		/*
 		 * strip off all the headers that precedes AH.
 		 *	IP xx AH IP' payload -> IP' payload
@@ -453,7 +485,25 @@ ah4_input(struct mbuf *m, int off)
 			IPSEC_STAT_INCREMENT(ipsecstat.in_nomem);
 			goto fail;
 		}
-		proto_input(PF_INET, m);
+
+		if (ip_doscopedroute) {
+			struct sockaddr_in *ipaddr;
+
+			bzero(&addr, sizeof(addr));
+			ipaddr = (__typeof__(ipaddr))&addr;
+			ipaddr->sin_family = AF_INET;
+			ipaddr->sin_len = sizeof(*ipaddr);
+			ipaddr->sin_addr = ip->ip_dst;
+
+			// update the receiving interface address based on the inner address
+			ifa = ifa_ifwithaddr((struct sockaddr *)&addr);
+			if (ifa) {
+				m->m_pkthdr.rcvif = ifa->ifa_ifp;
+				IFA_REMREF(ifa);
+			}
+		}
+		if (proto_input(PF_INET, m) != 0)
+			goto fail;
 		nxt = IPPROTO_DONE;
 	} else {
 		/*
@@ -521,6 +571,10 @@ ah4_input(struct mbuf *m, int off)
 			goto fail;
 		}
 
+		DTRACE_IP6(receive, struct mbuf *, m, struct inpcb *, NULL,
+                        struct ip *, ip, struct ifnet *, m->m_pkthdr.rcvif,
+                        struct ip *, ip, struct ip6_hdr *, NULL);
+
 		if (nxt != IPPROTO_DONE) {
 			if ((ip_protox[nxt]->pr_flags & PR_LASTHDR) != 0 &&
 			    ipsec4_in_reject(m, NULL)) {
@@ -555,10 +609,9 @@ fail:
 
 #if INET6
 int
-ah6_input(mp, offp)
-	struct mbuf **mp;
-	int *offp;
+ah6_input(struct mbuf **mp, int *offp, int proto)
 {
+#pragma unused(proto)
 	struct mbuf *m = *mp;
 	int off = *offp;
 	struct ip6_hdr *ip6;
@@ -644,7 +697,7 @@ ah6_input(mp, offp)
 	if (siz1 < siz) {
 		ipseclog((LOG_NOTICE, "sum length too short in IPv6 AH input "
 		    "(%lu, should be at least %lu): %s\n",
-		    (u_long)siz1, (u_long)siz,
+		    (u_int32_t)siz1, (u_int32_t)siz,
 		    ipsec6_logpacketstr(ip6, spi)));
 		IPSEC_STAT_INCREMENT(ipsec6stat.in_inval);
 		goto fail;
@@ -652,7 +705,7 @@ ah6_input(mp, offp)
 	if ((ah->ah_len << 2) - sizoff != siz1) {
 		ipseclog((LOG_NOTICE, "sum length mismatch in IPv6 AH input "
 		    "(%d should be %lu): %s\n",
-		    (ah->ah_len << 2) - sizoff, (u_long)siz1,
+		    (ah->ah_len << 2) - sizoff, (u_int32_t)siz1,
 		    ipsec6_logpacketstr(ip6, spi)));
 		IPSEC_STAT_INCREMENT(ipsec6stat.in_inval);
 		goto fail;
@@ -797,6 +850,9 @@ ah6_input(mp, offp)
 		stripsiz = sizeof(struct newah) + siz1;
 	}
 	if (ipsec6_tunnel_validate(m, off + stripsiz, nxt, sav)) {
+		ifaddr_t ifa;
+		struct sockaddr_storage addr;
+
 		/*
 		 * strip off all the headers that precedes AH.
 		 *	IP6 xx AH IP6' payload -> IP6' payload
@@ -847,7 +903,26 @@ ah6_input(mp, offp)
 			IPSEC_STAT_INCREMENT(ipsec6stat.in_nomem);
 			goto fail;
 		}
-		proto_input(PF_INET6, m);
+
+		if (ip6_doscopedroute) {
+			struct sockaddr_in6 *ip6addr;
+
+			bzero(&addr, sizeof(addr));
+			ip6addr = (__typeof__(ip6addr))&addr;
+			ip6addr->sin6_family = AF_INET6;
+			ip6addr->sin6_len = sizeof(*ip6addr);
+			ip6addr->sin6_addr = ip6->ip6_dst;
+
+			// update the receiving interface address based on the inner address
+			ifa = ifa_ifwithaddr((struct sockaddr *)&addr);
+			if (ifa) {
+				m->m_pkthdr.rcvif = ifa->ifa_ifp;
+				IFA_REMREF(ifa);
+			}
+		}
+
+		if (proto_input(PF_INET6, m) != 0)
+			goto fail;
 		nxt = IPPROTO_DONE;
 	} else {
 		/*