aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahide NAKAMURA <nakam@linux-ipv6.org>2006-08-23 20:59:44 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 18:06:37 -0400
commit1d71627d699eca831c1fbfb66ea67bb1fba41415 (patch)
tree19652e18b0b5f58c94674d8b32168c8c93e0b151
parentaee5adb4307c4c63a4dc5f3b49984d76f8a71b5b (diff)
[XFRM] STATE: Introduce route optimization mode.
Route optimization is used with routing header and destination options header for Mobile IPv6. At outbound it makes header space like IPsec transport. At inbound it does nothing because exhdrs.c functions have responsibility to update skbuff information for these headers. Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/Kconfig7
-rw-r--r--net/ipv6/Makefile1
-rw-r--r--net/ipv6/xfrm6_mode_ro.c94
3 files changed, 102 insertions, 0 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 14f0b336519f..1188d9560242 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -127,6 +127,13 @@ config INET6_XFRM_MODE_TUNNEL
127 127
128 If unsure, say Y. 128 If unsure, say Y.
129 129
130config INET6_XFRM_MODE_ROUTEOPTIMIZATION
131 tristate "IPv6: MIPv6 route optimization mode (EXPERIMENTAL)"
132 depends on IPV6 && EXPERIMENTAL
133 select XFRM
134 ---help---
135 Support for MIPv6 route optimization mode.
136
130config IPV6_TUNNEL 137config IPV6_TUNNEL
131 tristate "IPv6: IPv6-in-IPv6 tunnel" 138 tristate "IPv6: IPv6-in-IPv6 tunnel"
132 select INET6_TUNNEL 139 select INET6_TUNNEL
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 9eebf6091279..87e912e31922 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_INET6_XFRM_TUNNEL) += xfrm6_tunnel.o
23obj-$(CONFIG_INET6_TUNNEL) += tunnel6.o 23obj-$(CONFIG_INET6_TUNNEL) += tunnel6.o
24obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o 24obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o
25obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o 25obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o
26obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o
26obj-$(CONFIG_NETFILTER) += netfilter/ 27obj-$(CONFIG_NETFILTER) += netfilter/
27 28
28obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o 29obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c
new file mode 100644
index 000000000000..c11c335312f9
--- /dev/null
+++ b/net/ipv6/xfrm6_mode_ro.c
@@ -0,0 +1,94 @@
1/*
2 * xfrm6_mode_ro.c - Route optimization mode for IPv6.
3 *
4 * Copyright (C)2003-2006 Helsinki University of Technology
5 * Copyright (C)2003-2006 USAGI/WIDE Project
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */
21/*
22 * Authors:
23 * Noriaki TAKAMIYA @USAGI
24 * Masahide NAKAMURA @USAGI
25 */
26
27#include <linux/init.h>
28#include <linux/kernel.h>
29#include <linux/module.h>
30#include <linux/skbuff.h>
31#include <linux/stringify.h>
32#include <net/ipv6.h>
33#include <net/xfrm.h>
34
35/* Add route optimization header space.
36 *
37 * The IP header and mutable extension headers will be moved forward to make
38 * space for the route optimization header.
39 *
40 * On exit, skb->h will be set to the start of the encapsulation header to be
41 * filled in by x->type->output and skb->nh will be set to the nextheader field
42 * of the extension header directly preceding the encapsulation header, or in
43 * its absence, that of the top IP header. The value of skb->data will always
44 * point to the top IP header.
45 */
46static int xfrm6_ro_output(struct sk_buff *skb)
47{
48 struct xfrm_state *x = skb->dst->xfrm;
49 struct ipv6hdr *iph;
50 u8 *prevhdr;
51 int hdr_len;
52
53 skb_push(skb, x->props.header_len);
54 iph = skb->nh.ipv6h;
55
56 hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
57 skb->nh.raw = prevhdr - x->props.header_len;
58 skb->h.raw = skb->data + hdr_len;
59 memmove(skb->data, iph, hdr_len);
60 return 0;
61}
62
63/*
64 * Do nothing about routing optimization header unlike IPsec.
65 */
66static int xfrm6_ro_input(struct xfrm_state *x, struct sk_buff *skb)
67{
68 return 0;
69}
70
71static struct xfrm_mode xfrm6_ro_mode = {
72 .input = xfrm6_ro_input,
73 .output = xfrm6_ro_output,
74 .owner = THIS_MODULE,
75 .encap = XFRM_MODE_ROUTEOPTIMIZATION,
76};
77
78static int __init xfrm6_ro_init(void)
79{
80 return xfrm_register_mode(&xfrm6_ro_mode, AF_INET6);
81}
82
83static void __exit xfrm6_ro_exit(void)
84{
85 int err;
86
87 err = xfrm_unregister_mode(&xfrm6_ro_mode, AF_INET6);
88 BUG_ON(err);
89}
90
91module_init(xfrm6_ro_init);
92module_exit(xfrm6_ro_exit);
93MODULE_LICENSE("GPL");
94MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_ROUTEOPTIMIZATION);