Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee5adb4 authored by Masahide NAKAMURA's avatar Masahide NAKAMURA Committed by David S. Miller
Browse files

[XFRM] STATE: Add a hook to find offset to be inserted header in outbound. 



On current kernel, ip6_find_1stfragopt() is used by IPv6 IPsec to find
offset to be inserted header in outbound for transport mode. (BTW, no
usage may be needed for IPv4 case.)  Mobile IPv6 requires another
logic for routing header and destination options header
respectively. This patch is common platform for the offset and adopts
it to IPsec.

Based on MIPL2 kernel patch.

Signed-off-by: default avatarMasahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb2971b6

include/net/xfrm.h

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ struct xfrm_type 
	void			(*destructor)(struct xfrm_state *);

	int			(*input)(struct xfrm_state *, struct sk_buff *skb);

	int			(*output)(struct xfrm_state *, struct sk_buff *pskb);

	int			(*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);

	/* Estimate maximal size of result of transformation of a dgram */

	u32			(*get_max_size)(struct xfrm_state *, int size);

};
@@ -960,6 +961,8 @@ extern u32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr); 
extern void xfrm6_tunnel_free_spi(xfrm_address_t *saddr);

extern u32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr);

extern int xfrm6_output(struct sk_buff *skb);

extern int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,

				 u8 **prevhdr);



#ifdef CONFIG_XFRM

extern int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type);

net/ipv6/ah6.c

+2 −1
Original line number Diff line number Diff line
@@ -435,7 +435,8 @@ static struct xfrm_type ah6_type = 
	.init_state	= ah6_init_state,

	.destructor	= ah6_destroy,

	.input		= ah6_input,

	.output		= ah6_output

	.output		= ah6_output,

	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct inet6_protocol ah6_protocol = {

net/ipv6/esp6.c

+2 −1
Original line number Diff line number Diff line
@@ -379,7 +379,8 @@ static struct xfrm_type esp6_type = 
	.destructor	= esp6_destroy,

	.get_max_size	= esp6_get_max_size,

	.input		= esp6_input,

	.output		= esp6_output

	.output		= esp6_output,

	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct inet6_protocol esp6_protocol = {

net/ipv6/ipcomp6.c

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static struct xfrm_type ipcomp6_type = 
	.destructor	= ipcomp6_destroy,

	.input		= ipcomp6_input,

	.output		= ipcomp6_output,

	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct inet6_protocol ipcomp6_protocol =

net/ipv6/ipv6_syms.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ EXPORT_SYMBOL(ipv6_chk_addr); 
EXPORT_SYMBOL(in6_dev_finish_destroy);

#ifdef CONFIG_XFRM

EXPORT_SYMBOL(xfrm6_rcv);

EXPORT_SYMBOL(xfrm6_find_1stfragopt);

#endif

EXPORT_SYMBOL(rt6_lookup);

EXPORT_SYMBOL(ipv6_push_nfrag_opts);