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

Commit 59b84351 authored by Steffen Klassert's avatar Steffen Klassert
Browse files

ipcomp6: Use the IPsec protocol multiplexer API 



Switch ipcomp6 to use the new IPsec protocol multiplexer.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent e924d2d6

net/ipv6/ipcomp6.c

+15 −7
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include <linux/icmpv6.h>

#include <linux/mutex.h>



static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,

static int ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,

				u8 type, u8 code, int offset, __be32 info)

{

	struct net *net = dev_net(skb->dev);
@@ -65,19 +65,21 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 


	if (type != ICMPV6_PKT_TOOBIG &&

	    type != NDISC_REDIRECT)

		return;

		return 0;



	spi = htonl(ntohs(ipcomph->cpi));

	x = xfrm_state_lookup(net, skb->mark, (const xfrm_address_t *)&iph->daddr,

			      spi, IPPROTO_COMP, AF_INET6);

	if (!x)

		return;

		return 0;



	if (type == NDISC_REDIRECT)

		ip6_redirect(skb, net, skb->dev->ifindex, 0);

	else

		ip6_update_pmtu(skb, net, info, 0, 0);

	xfrm_state_put(x);



	return 0;

}



static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x)
@@ -174,6 +176,11 @@ out: 
	return err;

}



static int ipcomp6_rcv_cb(struct sk_buff *skb, int err)

{

	return 0;

}



static const struct xfrm_type ipcomp6_type =

{

	.description	= "IPCOMP6",
@@ -186,11 +193,12 @@ static const struct xfrm_type ipcomp6_type = 
	.hdr_offset	= xfrm6_find_1stfragopt,

};



static const struct inet6_protocol ipcomp6_protocol =

static struct xfrm6_protocol ipcomp6_protocol =

{

	.handler	= xfrm6_rcv,

	.cb_handler	= ipcomp6_rcv_cb,

	.err_handler	= ipcomp6_err,

	.flags		= INET6_PROTO_NOPOLICY,

	.priority	= 0,

};



static int __init ipcomp6_init(void)
@@ -199,7 +207,7 @@ static int __init ipcomp6_init(void) 
		pr_info("%s: can't add xfrm type\n", __func__);

		return -EAGAIN;

	}

	if (inet6_add_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0) {

	if (xfrm6_protocol_register(&ipcomp6_protocol, IPPROTO_COMP) < 0) {

		pr_info("%s: can't add protocol\n", __func__);

		xfrm_unregister_type(&ipcomp6_type, AF_INET6);

		return -EAGAIN;
@@ -209,7 +217,7 @@ static int __init ipcomp6_init(void) 


static void __exit ipcomp6_fini(void)

{

	if (inet6_del_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0)

	if (xfrm6_protocol_deregister(&ipcomp6_protocol, IPPROTO_COMP) < 0)

		pr_info("%s: can't remove protocol\n", __func__);

	if (xfrm_unregister_type(&ipcomp6_type, AF_INET6) < 0)

		pr_info("%s: can't remove xfrm type\n", __func__);