interfamily-2.6.13.1

Host Identity Protocol on Linux is an implemetation of the Host Identity Protocol (HIP) and the rela

diff -urN linux-2.6.13.1-vanilla/include/net/xfrm.h family/linux/include/net/xfrm.h
--- linux-2.6.13.1-vanilla/include/net/xfrm.h	2005-09-10 05:42:58.000000000 +0300
+++ family/linux/include/net/xfrm.h	2005-09-30 17:18:18.000000000 +0300
@@ -258,6 +258,10 @@
 /* Source address of tunnel. Ignored, if it is not a tunnel. */
 	xfrm_address_t		saddr;
 
+/* family of the outer addresses. The family may differ from
+   the one in selector */
+	unsigned short		outer_family;
+
 	__u32			reqid;
 
 /* Mode: transport/tunnel */
diff -urN linux-2.6.13.1-vanilla/net/ipv4/xfrm4_input.c family/linux/net/ipv4/xfrm4_input.c
--- linux-2.6.13.1-vanilla/net/ipv4/xfrm4_input.c	2005-09-30 16:37:04.000000000 +0300
+++ family/linux/net/ipv4/xfrm4_input.c	2005-09-30 17:18:44.000000000 +0300
@@ -97,15 +97,28 @@
 		iph = skb->nh.iph;
 
 		if (x->props.mode == XFRM_MODE_TUNNEL) {
-			if (iph->protocol != IPPROTO_IPIP)
-				goto drop;
-			if (!pskb_may_pull(skb, sizeof(struct iphdr)))
-				goto drop;
-			if (skb_cloned(skb) &&
-			    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
-				goto drop;
-			if (x->props.flags & XFRM_STATE_DECAP_DSCP)
-				ipv4_copy_dscp(iph, skb->h.ipiph);
+			if (x->sel.family == AF_INET) {
+				if (iph->protocol != IPPROTO_IPIP)
+					goto drop;
+				if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+					goto drop;
+				if (skb_cloned(skb) &&
+				    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
+					goto drop;
+				if (x->props.flags & XFRM_STATE_DECAP_DSCP)
+					ipv4_copy_dscp(iph, skb->h.ipiph);
+			} else if (x->sel.family == AF_INET6) {
+				/* Inner = 6, Outer = 4 */
+				if (skb->nh.iph->protocol != IPPROTO_IPV6)
+					goto drop;
+
+				if (skb_cloned(skb) &&
+				    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
+					goto drop;
+				skb->protocol = htons(ETH_P_IPV6);
+			} else
+				BUG_ON(1);
+
 			if (!(x->props.flags & XFRM_STATE_NOECN))
 				ipip_ecn_decapsulate(skb);
 			skb->mac.raw = memmove(skb->data - skb->mac_len,
@@ -115,7 +128,20 @@
 			decaps = 1;
 			break;
 		} else if (x->props.mode == XFRM_MODE_BEET) {
-			int size = sizeof(struct iphdr);
+			int size = (x->sel.family == AF_INET) ? sizeof(struct iphdr) : sizeof(struct ipv6hdr);
+			int proto = skb->nh.iph->protocol;
+			int hops = skb->nh.iph->ttl;
+			int delta = sizeof(struct ipv6hdr) - sizeof(struct iphdr);
+			if (x->sel.family == AF_INET6) {
+				/* Here, the inner family is 6, therefore I have to
+				 * substitute the IPhdr by enlarging it */
+				if (skb_tailroom(skb) <  delta){
+					if (pskb_expand_head(skb, 0, delta, GFP_ATOMIC))
+						return -EINVAL;		//Just returning from here.
+				}
+				skb->nh.raw -= delta;
+			}
+
 			if (skb_cloned(skb) &&
 			    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
 				goto drop;
@@ -126,13 +152,21 @@
 
 			if (x->sel.family == AF_INET) {
 				struct iphdr *iph = skb->nh.iph;
-				iph = skb->nh.iph;
 				iph->tot_len = htons(skb->len);
 				iph->daddr = x->sel.daddr.a4;
 				iph->saddr = x->sel.saddr.a4;
-				iph->check = 0;
-				iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
-				skb->protocol = htons(ETH_P_IP);
+				ip_send_check(iph);
+			} else if (x->sel.family == AF_INET6) {
+				struct ipv6hdr *ip6h = skb->nh.ipv6h;
+				memset(ip6h->flow_lbl, 0, sizeof(ip6h->flow_lbl));
+				ip6h->version = 6;
+				ip6h->priority = 0;
+				ip6h->nexthdr = proto;
+				ip6h->hop_limit = hops;
+				ip6h->payload_len = htons(skb->len - size);
+				ipv6_addr_copy(&ip6h->daddr, (struct in6_addr *)&x->sel.daddr.a6);
+				ipv6_addr_copy(&ip6h->saddr, (struct in6_addr *)&x->sel.saddr.a6);
+				skb->protocol = htons(ETH_P_IPV6);
 			} else
 				BUG_ON(1);
 			decaps = 1;
diff -urN linux-2.6.13.1-vanilla/net/ipv4/xfrm4_output.c family/linux/net/ipv4/xfrm4_output.c
--- linux-2.6.13.1-vanilla/net/ipv4/xfrm4_output.c	2005-09-30 16:37:04.000000000 +0300
+++ family/linux/net/ipv4/xfrm4_output.c	2005-09-30 17:18:44.000000000 +0300
@@ -37,41 +37,81 @@
 
 	iph = skb->nh.iph;
 	skb->h.ipiph = iph;
-
 	skb->nh.raw = skb_push(skb, x->props.header_len);
+
 	top_iph = skb->nh.iph;
 
 	if (x->props.mode == XFRM_MODE_TRANSPORT ||
-	    x->props.mode == XFRM_MODE_BEET) {
+	    (x->props.mode == XFRM_MODE_BEET && x->props.family == AF_INET)) {
 		skb->h.raw += iph->ihl*4;
 		memmove(top_iph, iph, iph->ihl*4);
-		if (!x->props.mode)
+		if (x->props.mode == XFRM_MODE_TRANSPORT)
 			return;
 	}
 
-	if (x->props.mode == XFRM_MODE_TUNNEL) {
-		top_iph->ihl = 5;
-		top_iph->version = 4;
-
+	if (x->props.family == AF_INET) {
+		top_iph->saddr = x->props.saddr.a4;
+		top_iph->daddr = x->id.daddr.a4;
+		if (x->props.mode == XFRM_MODE_TUNNEL) {
+			top_iph->ihl = 5;
+			top_iph->version = 4;
+
+			/* DS disclosed */
+			top_iph->tos = INET_ECN_encapsulate(iph->tos, iph->tos);
+
+			flags = x->props.flags;
+			if (flags & XFRM_STATE_NOECN)
+				IP_ECN_clear(top_iph);
+
+			top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
+				0 : (iph->frag_off & htons(IP_DF));
+			if (!top_iph->frag_off)
+				__ip_select_ident(top_iph, dst, 0);
+
+			top_iph->ttl = dst_metric(dst->child, RTAX_HOPLIMIT);
+
+			top_iph->protocol = IPPROTO_IPIP;
+			memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
+		}
+	} else if (x->props.family == AF_INET6) {
+		/* Inner = 4, Outer = 6*/
+		struct ipv6hdr *top_iph6;
+		int dsfield;
+		u8 protocol = iph->protocol;
+		if (x->props.mode == XFRM_MODE_BEET) {
+			int delta = sizeof(struct ipv6hdr) - sizeof(struct iphdr);
+			if (skb_headroom(skb) <  delta){
+				if (pskb_expand_head(skb, delta,0, GFP_ATOMIC))
+					return;
+			}
+			skb->nh.raw = skb_push(skb, delta);
+		}
+		top_iph6 = skb->nh.ipv6h;
+		skb->h.ipv6h = top_iph6 + 1;
 		/* DS disclosed */
-		top_iph->tos = INET_ECN_encapsulate(iph->tos, iph->tos);
-
+		top_iph6->version = 6;
+		top_iph6->priority = 0;
+		top_iph6->flow_lbl[0] = 0;
+		top_iph6->flow_lbl[1] = 0;
+		top_iph6->flow_lbl[2] = 0;
+		dsfield = ipv6_get_dsfield(top_iph6);
+		dsfield = INET_ECN_encapsulate(dsfield, dsfield);
 		flags = x->props.flags;
 		if (flags & XFRM_STATE_NOECN)
-			IP_ECN_clear(top_iph);
-
-		top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
-			0 : (iph->frag_off & htons(IP_DF));
-		if (!top_iph->frag_off)
-			__ip_select_ident(top_iph, dst, 0);
+			dsfield &= ~INET_ECN_MASK;
+		ipv6_change_dsfield(top_iph6, 0, dsfield);
 
-		top_iph->ttl = dst_metric(dst->child, RTAX_HOPLIMIT);
-
-		top_iph->protocol = IPPROTO_IPIP;
-		memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
-	}
-	top_iph->saddr = x->props.saddr.a4;
-	top_iph->daddr = x->id.daddr.a4;
+		if (x->props.mode == XFRM_MODE_TUNNEL)
+			top_iph6->nexthdr = IPPROTO_IPIP;
+		else
+			top_iph6->nexthdr = protocol;
+		top_iph6->hop_limit = dst_metric(dst->child, RTAX_HOPLIMIT);
+		top_iph6->payload_len = htons(skb->len - sizeof(struct ipv6hdr));
+		ipv6_addr_copy(&top_iph6->saddr,(struct in6_addr *)&x->props.saddr);
+		ipv6_addr_copy(&top_iph6->daddr, (struct in6_addr *)&x->id.daddr);
+		skb->nh.raw = &skb->nh.ipv6h->nexthdr;
+	} else
+		BUG_ON(1);
 }
 
 static int xfrm4_tunnel_check_size(struct sk_buff *skb)
@@ -127,6 +167,7 @@
 	if (err)
 		goto error;
 
+	skb->nh.raw = skb->data;
 	x->curlft.bytes += skb->len;
 	x->curlft.packets++;
 
diff -urN linux-2.6.13.1-vanilla/net/ipv4/xfrm4_policy.c family/linux/net/ipv4/xfrm4_policy.c
--- linux-2.6.13.1-vanilla/net/ipv4/xfrm4_policy.c	2005-09-10 05:42:58.000000000 +0300
+++ family/linux/net/ipv4/xfrm4_policy.c	2005-09-30 17:18:44.000000000 +0300
@@ -20,6 +20,8 @@
 
 static struct xfrm_type_map xfrm4_type_map = { .lock = RW_LOCK_UNLOCKED };
 
+static void xfrm4_update_pmtu(struct dst_entry *dst, u32 mtu);
+
 static int xfrm4_dst_lookup(struct xfrm_dst **dst, struct flowi *fl)
 {
 	return __ip_route_output_key((struct rtable**)dst, fl);
@@ -56,16 +58,19 @@
 	struct dst_entry *dst, *dst_prev;
 	struct rtable *rt0 = (struct rtable*)(*dst_p);
 	struct rtable *rt = rt0;
-	u32 remote = fl->fl4_dst;
-	u32 local  = fl->fl4_src;
 	struct flowi fl_tunnel = {
 		.nl_u = {
 			.ip4_u = {
-				.saddr = local,
-				.daddr = remote
+				.saddr = fl->fl4_src,
+				.daddr = fl->fl4_dst
 			}
 		}
 	};
+	union {
+		struct in6_addr *in6;
+		struct in_addr *in;
+	} remote, local;
+	unsigned short outer_family = 0, beet = 0;
 	int i;
 	int err;
 	int header_len = 0;
@@ -77,7 +82,6 @@
 	for (i = 0; i < nx; i++) {
 		struct dst_entry *dst1 = dst_alloc(&xfrm4_dst_ops);
 		struct xfrm_dst *xdst;
-		int tunnel = 0;
 
 		if (unlikely(dst1 == NULL)) {
 			err = -ENOBUFS;
@@ -98,21 +102,45 @@
 
 		dst1->next = dst_prev;
 		dst_prev = dst1;
-		if (xfrm[i]->props.mode) {
-			remote = xfrm[i]->id.daddr.a4;
-			local  = xfrm[i]->props.saddr.a4;
-			tunnel = 1;
+
+		if (xfrm[i]->props.mode == XFRM_MODE_TUNNEL || xfrm[i]->props.mode == XFRM_MODE_BEET) {
+			outer_family = xfrm[i]->props.family;
+			beet = (xfrm[i]->props.mode == XFRM_MODE_BEET);
+
+			if(outer_family == AF_INET6){
+				remote.in6 = (struct in6_addr*)&xfrm[i]->id.daddr;
+				local.in6 = (struct in6_addr*)&xfrm[i]->props.saddr;
+			} else if(outer_family == AF_INET){
+				remote.in = (struct in_addr*)&xfrm[i]->id.daddr;
+				local.in = (struct in_addr*)&xfrm[i]->props.saddr;
+			} else
+				BUG_ON(1);
 		}
 		header_len += xfrm[i]->props.header_len;
 		trailer_len += xfrm[i]->props.trailer_len;
 
-		if (tunnel) {
-			fl_tunnel.fl4_src = local;
-			fl_tunnel.fl4_dst = remote;
+		if (outer_family) {
+			switch(outer_family) {
+			case AF_INET:
+				fl_tunnel.fl4_dst = remote.in->s_addr;
+				fl_tunnel.fl4_src = local.in->s_addr;
+				break;
+			case AF_INET6:
+				ipv6_addr_copy(&fl_tunnel.fl6_dst, remote.in6);
+				ipv6_addr_copy(&fl_tunnel.fl6_src, local.in6);
+				break;
+			default:
+				BUG_ON(1);
+			}
 			err = xfrm_dst_lookup((struct xfrm_dst **)&rt,
-					      &fl_tunnel, AF_INET);
+					      &fl_tunnel, outer_family);
 			if (err)
 				goto error;
+			/* Without this, the atomic inc below segfaults */
+			if (outer_family == AF_INET6) {
+				rt->peer = NULL;
+				rt_bind_peer(rt,1);
+			}
 		} else
 			dst_hold(&rt->u.dst);
 	}
@@ -162,6 +190,11 @@
 	}
 
 	xfrm_init_pmtu(dst);
+	if (beet && outer_family == AF_INET6) {
+		int delta = sizeof(struct ipv6hdr) - sizeof(struct iphdr);
+		u32 mtu = dst_mtu(dst);
+		xfrm4_update_pmtu(dst, mtu - delta);
+	}
 	return 0;
 
 error:
diff -urN linux-2.6.13.1-vanilla/net/ipv6/xfrm6_input.c family/linux/net/ipv6/xfrm6_input.c
--- linux-2.6.13.1-vanilla/net/ipv6/xfrm6_input.c	2005-09-30 16:37:04.000000000 +0300
+++ family/linux/net/ipv6/xfrm6_input.c	2005-09-30 17:18:44.000000000 +0300
@@ -81,15 +81,33 @@
 		xfrm_vec[xfrm_nr++].xvec = x;
 
 		if (x->props.mode == XFRM_MODE_TUNNEL) {
-			if (nexthdr != IPPROTO_IPV6)
-				goto drop;
-			if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
-				goto drop;
-			if (skb_cloned(skb) &&
-			    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
-				goto drop;
-			if (x->props.flags & XFRM_STATE_DECAP_DSCP)
-				ipv6_copy_dscp(skb->nh.ipv6h, skb->h.ipv6h);
+			if (x->sel.family == AF_INET6) {