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

Commit d099160e authored by Steffen Klassert's avatar Steffen Klassert
Browse files

ipcomp4: Use the IPsec protocol multiplexer API 



Switch ipcomp4 to use the new IPsec protocol multiplexer.

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

net/ipv4/ipcomp.c

+17 −9
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <net/protocol.h>

#include <net/sock.h>



static void ipcomp4_err(struct sk_buff *skb, u32 info)

static int ipcomp4_err(struct sk_buff *skb, u32 info)

{

	struct net *net = dev_net(skb->dev);

	__be32 spi;
@@ -34,24 +34,26 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) 
	switch (icmp_hdr(skb)->type) {

	case ICMP_DEST_UNREACH:

		if (icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)

			return;

			return 0;

	case ICMP_REDIRECT:

		break;

	default:

		return;

		return 0;

	}



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

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

			      spi, IPPROTO_COMP, AF_INET);

	if (!x)

		return;

		return 0;



	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)

		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);

	else

		ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0);

	xfrm_state_put(x);



	return 0;

}



/* We always hold one tunnel user reference to indicate a tunnel */
@@ -147,6 +149,11 @@ static int ipcomp4_init_state(struct xfrm_state *x) 
	return err;

}



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

{

	return 0;

}



static const struct xfrm_type ipcomp_type = {

	.description	= "IPCOMP4",

	.owner		= THIS_MODULE,
@@ -157,11 +164,12 @@ static const struct xfrm_type ipcomp_type = { 
	.output		= ipcomp_output

};



static const struct net_protocol ipcomp4_protocol = {

static struct xfrm4_protocol ipcomp4_protocol = {

	.handler	=	xfrm4_rcv,

	.input_handler	=	xfrm_input,

	.cb_handler	=	ipcomp4_rcv_cb,

	.err_handler	=	ipcomp4_err,

	.no_policy	=	1,

	.netns_ok	=	1,

	.priority	=	0,

};



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

		return -EAGAIN;

	}

	if (inet_add_protocol(&ipcomp4_protocol, IPPROTO_COMP) < 0) {

	if (xfrm4_protocol_register(&ipcomp4_protocol, IPPROTO_COMP) < 0) {

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

		xfrm_unregister_type(&ipcomp_type, AF_INET);

		return -EAGAIN;
@@ -180,7 +188,7 @@ static int __init ipcomp4_init(void) 


static void __exit ipcomp4_fini(void)

{

	if (inet_del_protocol(&ipcomp4_protocol, IPPROTO_COMP) < 0)

	if (xfrm4_protocol_deregister(&ipcomp4_protocol, IPPROTO_COMP) < 0)

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

	if (xfrm_unregister_type(&ipcomp_type, AF_INET) < 0)

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