Skip to content

L
linux
Commit 59fbb3a6 authored by Masahide NAKAMURA's avatar Masahide NAKAMURA Committed by David S. Miller
Browse files
Options

[IPV6] MIP6: Loadable module support for MIPv6. 

This patch makes MIPv6 loadable module named "mip6".

Here is a modprobe.conf(5) example to load it automatically
when user application uses XFRM state for MIPv6:

alias xfrm-type-10-43 mip6
alias xfrm-type-10-60 mip6

Some MIPv6 feature is not included by this modular, however,
it should not be affected to other features like either IPsec
or IPv6 with and without the patch.
We may discuss XFRM, MH (RAW socket) and ancillary data/sockopt
separately for future work.

Loadable features:
* MH receiving check (to send ICMP error back)
* RO header parsing and building (i.e. RH2 and HAO in DSTOPTS)
* XFRM policy/state database handling for RO

These are NOT covered as loadable:
* Home Address flags and its rule on source address selection
* XFRM sub policy (depends on its own kernel option)
* XFRM functions to receive RO as IPv6 extension header
* MH sending/receiving through raw socket if user application
  opens it (since raw socket allows to do so)
* RH2 sending as ancillary data
* RH2 operation with setsockopt(2)
Signed-off-by: default avatarMasahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 136ebf08
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 46 deletions
include/linux/ipv6.h
View file @ 59fbb3a6
...@@ -247,7 +247,7 @@ struct inet6_skb_parm { ...@@ -247,7 +247,7 @@ struct inet6_skb_parm {
__u16 lastopt; __u16 lastopt;
__u32 nhoff; __u32 nhoff;
__u16 flags; __u16 flags;
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
__u16 dsthao; __u16 dsthao;
#endif #endif
......
include/net/addrconf.h
View file @ 59fbb3a6
...@@ -61,7 +61,7 @@ extern int addrconf_set_dstaddr(void __user *arg); ...@@ -61,7 +61,7 @@ extern int addrconf_set_dstaddr(void __user *arg);
extern int ipv6_chk_addr(struct in6_addr *addr, extern int ipv6_chk_addr(struct in6_addr *addr,
struct net_device *dev, struct net_device *dev,
int strict); int strict);
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
extern int ipv6_chk_home_addr(struct in6_addr *addr); extern int ipv6_chk_home_addr(struct in6_addr *addr);
#endif #endif
extern struct inet6_ifaddr * ipv6_get_ifaddr(struct in6_addr *addr, extern struct inet6_ifaddr * ipv6_get_ifaddr(struct in6_addr *addr,
......
include/net/mip6.h
View file @ 59fbb3a6
...@@ -54,8 +54,4 @@ struct ip6_mh { ...@@ -54,8 +54,4 @@ struct ip6_mh {
#define IP6_MH_TYPE_BERROR 7 /* Binding Error */ #define IP6_MH_TYPE_BERROR 7 /* Binding Error */
#define IP6_MH_TYPE_MAX IP6_MH_TYPE_BERROR #define IP6_MH_TYPE_MAX IP6_MH_TYPE_BERROR
extern int mip6_init(void);
extern void mip6_fini(void);
extern int mip6_mh_filter(struct sock *sk, struct sk_buff *skb);
#endif #endif
include/net/rawv6.h
View file @ 59fbb3a6
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <net/protocol.h>
#define RAWV6_HTABLE_SIZE MAX_INET_PROTOS #define RAWV6_HTABLE_SIZE MAX_INET_PROTOS
extern struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE]; extern struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE];
extern rwlock_t raw_v6_lock; extern rwlock_t raw_v6_lock;
...@@ -23,6 +25,13 @@ extern void rawv6_err(struct sock *sk, ...@@ -23,6 +25,13 @@ extern void rawv6_err(struct sock *sk,
int type, int code, int type, int code,
int offset, __be32 info); int offset, __be32 info);
#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
int rawv6_mh_filter_register(int (*filter)(struct sock *sock,
struct sk_buff *skb));
int rawv6_mh_filter_unregister(int (*filter)(struct sock *sock,
struct sk_buff *skb));
#endif
#endif #endif
#endif #endif
net/ipv6/Kconfig
View file @ 59fbb3a6
...@@ -109,7 +109,7 @@ config INET6_IPCOMP ...@@ -109,7 +109,7 @@ config INET6_IPCOMP
If unsure, say Y. If unsure, say Y.
config IPV6_MIP6 config IPV6_MIP6
bool "IPv6: Mobility (EXPERIMENTAL)" tristate "IPv6: Mobility (EXPERIMENTAL)"
depends on IPV6 && EXPERIMENTAL depends on IPV6 && EXPERIMENTAL
select XFRM select XFRM
---help--- ---help---
......
net/ipv6/Makefile
View file @ 59fbb3a6
...@@ -14,7 +14,6 @@ ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ ...@@ -14,7 +14,6 @@ ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \
xfrm6_output.o xfrm6_output.o
ipv6-$(CONFIG_NETFILTER) += netfilter.o ipv6-$(CONFIG_NETFILTER) += netfilter.o
ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o
ipv6-$(CONFIG_IPV6_MIP6) += mip6.o
ipv6-$(CONFIG_PROC_FS) += proc.o ipv6-$(CONFIG_PROC_FS) += proc.o
ipv6-objs += $(ipv6-y) ipv6-objs += $(ipv6-y)
...@@ -28,6 +27,7 @@ obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o ...@@ -28,6 +27,7 @@ obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o
obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o
obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o
obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o
obj-$(CONFIG_IPV6_MIP6) += mip6.o
obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_NETFILTER) += netfilter/
obj-$(CONFIG_IPV6_SIT) += sit.o obj-$(CONFIG_IPV6_SIT) += sit.o
......
net/ipv6/addrconf.c
View file @ 59fbb3a6
...@@ -1034,7 +1034,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, ...@@ -1034,7 +1034,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
} }
/* Rule 4: Prefer home address */ /* Rule 4: Prefer home address */
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
if (hiscore.rule < 4) { if (hiscore.rule < 4) {
if (ifa_result->flags & IFA_F_HOMEADDRESS) if (ifa_result->flags & IFA_F_HOMEADDRESS)
hiscore.attrs |= IPV6_SADDR_SCORE_HOA; hiscore.attrs |= IPV6_SADDR_SCORE_HOA;
...@@ -2835,7 +2835,7 @@ void if6_proc_exit(void) ...@@ -2835,7 +2835,7 @@ void if6_proc_exit(void)
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
/* Check if address is a home address configured on any interface. */ /* Check if address is a home address configured on any interface. */
int ipv6_chk_home_addr(struct in6_addr *addr) int ipv6_chk_home_addr(struct in6_addr *addr)
{ {
......
net/ipv6/af_inet6.c
View file @ 59fbb3a6
...@@ -58,9 +58,6 @@ ...@@ -58,9 +58,6 @@
#ifdef CONFIG_IPV6_TUNNEL #ifdef CONFIG_IPV6_TUNNEL
#include <net/ip6_tunnel.h> #include <net/ip6_tunnel.h>
#endif #endif
#ifdef CONFIG_IPV6_MIP6
#include <net/mip6.h>
#endif
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -853,9 +850,6 @@ static int __init inet6_init(void) ...@@ -853,9 +850,6 @@ static int __init inet6_init(void)
ipv6_frag_init(); ipv6_frag_init();
ipv6_nodata_init(); ipv6_nodata_init();
ipv6_destopt_init(); ipv6_destopt_init();
#ifdef CONFIG_IPV6_MIP6
mip6_init();
#endif
/* Init v6 transport protocols. */ /* Init v6 transport protocols. */
udpv6_init(); udpv6_init();
...@@ -921,9 +915,7 @@ static void __exit inet6_exit(void) ...@@ -921,9 +915,7 @@ static void __exit inet6_exit(void)
/* Cleanup code parts. */ /* Cleanup code parts. */
ipv6_packet_cleanup(); ipv6_packet_cleanup();
#ifdef CONFIG_IPV6_MIP6
mip6_fini();
#endif
addrconf_cleanup(); addrconf_cleanup();
ip6_flowlabel_cleanup(); ip6_flowlabel_cleanup();
ip6_route_cleanup(); ip6_route_cleanup();
......
net/ipv6/ah6.c
View file @ 59fbb3a6
...@@ -74,7 +74,7 @@ static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr) ...@@ -74,7 +74,7 @@ static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr)
return 0; return 0;
} }
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
/** /**
* ipv6_rearrange_destopt - rearrange IPv6 destination options header * ipv6_rearrange_destopt - rearrange IPv6 destination options header
* @iph: IPv6 header * @iph: IPv6 header
...@@ -228,7 +228,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) ...@@ -228,7 +228,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
u8 nexthdr; u8 nexthdr;
char tmp_base[8]; char tmp_base[8];
struct { struct {
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
struct in6_addr saddr; struct in6_addr saddr;
#endif #endif
struct in6_addr daddr; struct in6_addr daddr;
...@@ -255,7 +255,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) ...@@ -255,7 +255,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
err = -ENOMEM; err = -ENOMEM;
goto error; goto error;
} }
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
memcpy(tmp_ext, &top_iph->saddr, extlen); memcpy(tmp_ext, &top_iph->saddr, extlen);
#else #else
memcpy(tmp_ext, &top_iph->daddr, extlen); memcpy(tmp_ext, &top_iph->daddr, extlen);
...@@ -294,7 +294,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) ...@@ -294,7 +294,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
memcpy(top_iph, tmp_base, sizeof(tmp_base)); memcpy(top_iph, tmp_base, sizeof(tmp_base));
if (tmp_ext) { if (tmp_ext) {
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
memcpy(&top_iph->saddr, tmp_ext, extlen); memcpy(&top_iph->saddr, tmp_ext, extlen);
#else #else
memcpy(&top_iph->daddr, tmp_ext, extlen); memcpy(&top_iph->daddr, tmp_ext, extlen);
......
net/ipv6/datagram.c
View file @ 59fbb3a6
...@@ -658,7 +658,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl, ...@@ -658,7 +658,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,
switch (rthdr->type) { switch (rthdr->type) {
case IPV6_SRCRT_TYPE_0: case IPV6_SRCRT_TYPE_0:
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
case IPV6_SRCRT_TYPE_2: case IPV6_SRCRT_TYPE_2:
#endif #endif
break; break;
......
net/ipv6/exthdrs.c
View file @ 59fbb3a6
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include <net/ndisc.h> #include <net/ndisc.h>
#include <net/ip6_route.h> #include <net/ip6_route.h>
#include <net/addrconf.h> #include <net/addrconf.h>
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
#include <net/xfrm.h> #include <net/xfrm.h>
#endif #endif
...@@ -90,6 +90,7 @@ int ipv6_find_tlv(struct sk_buff *skb, int offset, int type) ...@@ -90,6 +90,7 @@ int ipv6_find_tlv(struct sk_buff *skb, int offset, int type)
bad: bad:
return -1; return -1;
} }
EXPORT_SYMBOL_GPL(ipv6_find_tlv);
/* /*
* Parsing tlv encoded headers. * Parsing tlv encoded headers.
...@@ -196,7 +197,7 @@ static int ip6_parse_tlv(struct tlvtype_proc *procs, struct sk_buff **skbp) ...@@ -196,7 +197,7 @@ static int ip6_parse_tlv(struct tlvtype_proc *procs, struct sk_buff **skbp)
Destination options header. Destination options header.
*****************************/ *****************************/
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
static int ipv6_dest_hao(struct sk_buff **skbp, int optoff) static int ipv6_dest_hao(struct sk_buff **skbp, int optoff)
{ {
struct sk_buff *skb = *skbp; struct sk_buff *skb = *skbp;
...@@ -270,7 +271,7 @@ static int ipv6_dest_hao(struct sk_buff **skbp, int optoff) ...@@ -270,7 +271,7 @@ static int ipv6_dest_hao(struct sk_buff **skbp, int optoff)
#endif #endif
static struct tlvtype_proc tlvprocdestopt_lst[] = { static struct tlvtype_proc tlvprocdestopt_lst[] = {
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
{ {
.type = IPV6_TLV_HAO, .type = IPV6_TLV_HAO,
.func = ipv6_dest_hao, .func = ipv6_dest_hao,
...@@ -283,7 +284,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp) ...@@ -283,7 +284,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp)
{ {
struct sk_buff *skb = *skbp; struct sk_buff *skb = *skbp;
struct inet6_skb_parm *opt = IP6CB(skb); struct inet6_skb_parm *opt = IP6CB(skb);
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
__u16 dstbuf; __u16 dstbuf;
#endif #endif
struct dst_entry *dst; struct dst_entry *dst;
...@@ -298,7 +299,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp) ...@@ -298,7 +299,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp)
} }
opt->lastopt = opt->dst1 = skb_network_header_len(skb); opt->lastopt = opt->dst1 = skb_network_header_len(skb);
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
dstbuf = opt->dst1; dstbuf = opt->dst1;
#endif #endif
...@@ -308,7 +309,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp) ...@@ -308,7 +309,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp)
skb = *skbp; skb = *skbp;
skb->transport_header += (skb_transport_header(skb)[1] + 1) << 3; skb->transport_header += (skb_transport_header(skb)[1] + 1) << 3;
opt = IP6CB(skb); opt = IP6CB(skb);
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
opt->nhoff = dstbuf; opt->nhoff = dstbuf;
#else #else
opt->nhoff = opt->dst1; opt->nhoff = opt->dst1;
...@@ -427,7 +428,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp) ...@@ -427,7 +428,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
looped_back: looped_back:
if (hdr->segments_left == 0) { if (hdr->segments_left == 0) {
switch (hdr->type) { switch (hdr->type) {
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
case IPV6_SRCRT_TYPE_2: case IPV6_SRCRT_TYPE_2:
/* Silently discard type 2 header unless it was /* Silently discard type 2 header unless it was
* processed by own * processed by own
...@@ -463,7 +464,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp) ...@@ -463,7 +464,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
return -1; return -1;
} }
break; break;
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
case IPV6_SRCRT_TYPE_2: case IPV6_SRCRT_TYPE_2:
/* Silently discard invalid RTH type 2 */ /* Silently discard invalid RTH type 2 */
if (hdr->hdrlen != 2 || hdr->segments_left != 1) { if (hdr->hdrlen != 2 || hdr->segments_left != 1) {
...@@ -520,7 +521,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp) ...@@ -520,7 +521,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
addr += i - 1; addr += i - 1;
switch (hdr->type) { switch (hdr->type) {
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
case IPV6_SRCRT_TYPE_2: case IPV6_SRCRT_TYPE_2:
if (xfrm6_input_addr(skb, (xfrm_address_t *)addr, if (xfrm6_input_addr(skb, (xfrm_address_t *)addr,
(xfrm_address_t *)&ipv6_hdr(skb)->saddr, (xfrm_address_t *)&ipv6_hdr(skb)->saddr,
......
net/ipv6/icmp.c
View file @ 59fbb3a6
...@@ -272,7 +272,7 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st ...@@ -272,7 +272,7 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st
return 0; return 0;
} }
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
static void mip6_addr_swap(struct sk_buff *skb) static void mip6_addr_swap(struct sk_buff *skb)
{ {
struct ipv6hdr *iph = ipv6_hdr(skb); struct ipv6hdr *iph = ipv6_hdr(skb);
......
net/ipv6/ip6_output.c
View file @ 59fbb3a6
...@@ -543,7 +543,7 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr) ...@@ -543,7 +543,7 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
found_rhdr = 1; found_rhdr = 1;
break; break;
case NEXTHDR_DEST: case NEXTHDR_DEST:
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
if (ipv6_find_tlv(skb, offset, IPV6_TLV_HAO) >= 0) if (ipv6_find_tlv(skb, offset, IPV6_TLV_HAO) >= 0)
break; break;
#endif #endif
......
net/ipv6/ipv6_sockglue.c
View file @ 59fbb3a6
...@@ -417,7 +417,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, ...@@ -417,7 +417,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
struct ipv6_rt_hdr *rthdr = opt->srcrt; struct ipv6_rt_hdr *rthdr = opt->srcrt;
switch (rthdr->type) { switch (rthdr->type) {
case IPV6_SRCRT_TYPE_0: case IPV6_SRCRT_TYPE_0:
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
case IPV6_SRCRT_TYPE_2: case IPV6_SRCRT_TYPE_2:
#endif #endif
break; break;
......
net/ipv6/mip6.c
View file @ 59fbb3a6
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/ip6_checksum.h> #include <net/ip6_checksum.h>
#include <net/rawv6.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/mip6.h> #include <net/mip6.h>
...@@ -86,7 +87,7 @@ static int mip6_mh_len(int type) ...@@ -86,7 +87,7 @@ static int mip6_mh_len(int type)
return len; return len;
} }
int mip6_mh_filter(struct sock *sk, struct sk_buff *skb) static int mip6_mh_filter(struct sock *sk, struct sk_buff *skb)
{ {
struct ip6_mh *mh; struct ip6_mh *mh;
...@@ -471,7 +472,7 @@ static struct xfrm_type mip6_rthdr_type = ...@@ -471,7 +472,7 @@ static struct xfrm_type mip6_rthdr_type =
.remote_addr = mip6_xfrm_addr, .remote_addr = mip6_xfrm_addr,
}; };
int __init mip6_init(void) static int __init mip6_init(void)
{ {
printk(KERN_INFO "Mobile IPv6\n"); printk(KERN_INFO "Mobile IPv6\n");
...@@ -483,18 +484,33 @@ int __init mip6_init(void) ...@@ -483,18 +484,33 @@ int __init mip6_init(void)
printk(KERN_INFO "%s: can't add xfrm type(rthdr)\n", __FUNCTION__); printk(KERN_INFO "%s: can't add xfrm type(rthdr)\n", __FUNCTION__);
goto mip6_rthdr_xfrm_fail; goto mip6_rthdr_xfrm_fail;
} }
if (rawv6_mh_filter_register(mip6_mh_filter) < 0) {
printk(KERN_INFO "%s: can't add rawv6 mh filter\n", __FUNCTION__);
goto mip6_rawv6_mh_fail;
}
return 0; return 0;
mip6_rawv6_mh_fail:
xfrm_unregister_type(&mip6_rthdr_type, AF_INET6);
mip6_rthdr_xfrm_fail: mip6_rthdr_xfrm_fail:
xfrm_unregister_type(&mip6_destopt_type, AF_INET6); xfrm_unregister_type(&mip6_destopt_type, AF_INET6);
mip6_destopt_xfrm_fail: mip6_destopt_xfrm_fail:
return -EAGAIN; return -EAGAIN;
} }
void __exit mip6_fini(void) static void __exit mip6_fini(void)
{ {
if (rawv6_mh_filter_unregister(mip6_mh_filter) < 0)
printk(KERN_INFO "%s: can't remove rawv6 mh filter\n", __FUNCTION__);
if (xfrm_unregister_type(&mip6_rthdr_type, AF_INET6) < 0) if (xfrm_unregister_type(&mip6_rthdr_type, AF_INET6) < 0)
printk(KERN_INFO "%s: can't remove xfrm type(rthdr)\n", __FUNCTION__); printk(KERN_INFO "%s: can't remove xfrm type(rthdr)\n", __FUNCTION__);
if (xfrm_unregister_type(&mip6_destopt_type, AF_INET6) < 0) if (xfrm_unregister_type(&mip6_destopt_type, AF_INET6) < 0)
printk(KERN_INFO "%s: can't remove xfrm type(destopt)\n", __FUNCTION__); printk(KERN_INFO "%s: can't remove xfrm type(destopt)\n", __FUNCTION__);
} }
module_init(mip6_init);
module_exit(mip6_fini);
MODULE_LICENSE("GPL");
net/ipv6/raw.c
View file @ 59fbb3a6
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <net/udp.h> #include <net/udp.h>
#include <net/inet_common.h> #include <net/inet_common.h>
#include <net/tcp_states.h> #include <net/tcp_states.h>
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
#include <net/mip6.h> #include <net/mip6.h>
#endif #endif
...@@ -137,6 +137,28 @@ static __inline__ int icmpv6_filter(struct sock *sk, struct sk_buff *skb) ...@@ -137,6 +137,28 @@ static __inline__ int icmpv6_filter(struct sock *sk, struct sk_buff *skb)
return 0; return 0;
} }
#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
static int (*mh_filter)(struct sock *sock, struct sk_buff *skb);
int rawv6_mh_filter_register(int (*filter)(struct sock *sock,
struct sk_buff *skb))
{
rcu_assign_pointer(mh_filter, filter);
return 0;
}
EXPORT_SYMBOL(rawv6_mh_filter_register);
int rawv6_mh_filter_unregister(int (*filter)(struct sock *sock,
struct sk_buff *skb))
{
rcu_assign_pointer(mh_filter, NULL);
synchronize_rcu();
return 0;
}
EXPORT_SYMBOL(rawv6_mh_filter_unregister);
#endif
/* /*
* demultiplex raw sockets. * demultiplex raw sockets.
* (should consider queueing the skb in the sock receive_queue * (should consider queueing the skb in the sock receive_queue
...@@ -178,16 +200,22 @@ int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) ...@@ -178,16 +200,22 @@ int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
case IPPROTO_ICMPV6: case IPPROTO_ICMPV6:
filtered = icmpv6_filter(sk, skb); filtered = icmpv6_filter(sk, skb);
break; break;
#ifdef CONFIG_IPV6_MIP6
#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
case IPPROTO_MH: case IPPROTO_MH:
{
/* XXX: To validate MH only once for each packet, /* XXX: To validate MH only once for each packet,
* this is placed here. It should be after checking * this is placed here. It should be after checking
* xfrm policy, however it doesn't. The checking xfrm * xfrm policy, however it doesn't. The checking xfrm
* policy is placed in rawv6_rcv() because it is * policy is placed in rawv6_rcv() because it is
* required for each socket. * required for each socket.
*/ */
filtered = mip6_mh_filter(sk, skb); int (*filter)(struct sock *sock, struct sk_buff *skb);
filter = rcu_dereference(mh_filter);
filtered = filter ? filter(sk, skb) : 0;
break; break;
}
#endif #endif
default: default:
filtered = 0; filtered = 0;
......
net/ipv6/xfrm6_policy.c
View file @ 59fbb3a6
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <net/ip.h> #include <net/ip.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/ip6_route.h> #include <net/ip6_route.h>
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
#include <net/mip6.h> #include <net/mip6.h>
#endif #endif
...@@ -318,7 +318,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl) ...@@ -318,7 +318,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
fl->proto = nexthdr; fl->proto = nexthdr;
return; return;
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
case IPPROTO_MH: case IPPROTO_MH:
if (pskb_may_pull(skb, nh + offset + 3 - skb->data)) { if (pskb_may_pull(skb, nh + offset + 3 - skb->data)) {
struct ip6_mh *mh; struct ip6_mh *mh;
......
net/ipv6/xfrm6_state.c
View file @ 59fbb3a6
...@@ -65,7 +65,7 @@ __xfrm6_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n) ...@@ -65,7 +65,7 @@ __xfrm6_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n)
goto end; goto end;
/* Rule 2: select MIPv6 RO or inbound trigger */ /* Rule 2: select MIPv6 RO or inbound trigger */
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (src[i] && if (src[i] &&
(src[i]->props.mode == XFRM_MODE_ROUTEOPTIMIZATION || (src[i]->props.mode == XFRM_MODE_ROUTEOPTIMIZATION ||
...@@ -130,7 +130,7 @@ __xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n) ...@@ -130,7 +130,7 @@ __xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n)
goto end; goto end;
/* Rule 2: select MIPv6 RO or inbound trigger */ /* Rule 2: select MIPv6 RO or inbound trigger */
#ifdef CONFIG_IPV6_MIP6 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (src[i] && if (src[i] &&
(src[i]->mode == XFRM_MODE_ROUTEOPTIMIZATION || (src[i]->mode == XFRM_MODE_ROUTEOPTIMIZATION ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7