From: James Chapman <jchapman@katalix•com>
To: Benjamin LaHaise <bcrl@kvack•org>
Cc: "David S. Miller" <davem@davemloft•net>, netdev@vger•kernel.org
Subject: Re: [PATCH net-next 1/2] net/ipv6/udp: Add encap_rcv support to IPv6 UDP
Date: Wed, 11 Apr 2012 12:51:46 +0100 [thread overview]
Message-ID: <4F857052.1040005@katalix.com> (raw)
In-Reply-To: <20120411022047.GA19124@kvack.org>
On 11/04/12 03:20, Benjamin LaHaise wrote:
> At present, UDP encapsulated protocols (like L2TP) are only able to use the
> encap_rcv hook with UDP over IPv4. This patch adds the same support for use
> with UDP over IPv6.
>
> Signed-off-by: Benjamin LaHaise <bcrl@kvack•org>
Signed-off-by: James Chapman <jchapman@katalix•com>
> ---
> net/ipv6/udp.c | 31 +++++++++++++++++++++++++++++++
> 1 files changed, 31 insertions(+), 0 deletions(-)
>
> diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
> index 37b0699..4d7cd72 100644
> --- a/net/ipv6/udp.c
> +++ b/net/ipv6/udp.c
> @@ -515,6 +515,37 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
> if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
> goto drop;
>
> + if (up->encap_type) {
> + int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);
> +
> + /*
> + * This is an encapsulation socket so pass the skb to
> + * the socket's udp_encap_rcv() hook. Otherwise, just
> + * fall through and pass this up the UDP socket.
> + * up->encap_rcv() returns the following value:
> + * =0 if skb was successfully passed to the encap
> + * handler or was discarded by it.
> + * >0 if skb should be passed on to UDP.
> + * <0 if skb should be resubmitted as proto -N
> + */
> +
> + /* if we're overly short, let UDP handle it */
> + encap_rcv = ACCESS_ONCE(up->encap_rcv);
> + if (skb->len > sizeof(struct udphdr) && encap_rcv != NULL) {
> + int ret;
> +
> + ret = encap_rcv(sk, skb);
> + if (ret <= 0) {
> + UDP6_INC_STATS_BH(sock_net(sk),
> + UDP_MIB_INDATAGRAMS,
> + is_udplite);
> + return -ret;
> + }
> + }
> +
> + /* FALLTHROUGH -- it's a UDP Packet */
> + }
> +
> /*
> * UDP-Lite specific tests, ignored on UDP sockets (see net/ipv4/udp.c).
> */
--
James Chapman
Katalix Systems Ltd
http://www.katalix.com
Catalysts for your Embedded Linux software development
next prev parent reply other threads:[~2012-04-11 11:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 2:20 [PATCH net-next 1/2] net/ipv6/udp: Add encap_rcv support to IPv6 UDP Benjamin LaHaise
2012-04-11 11:51 ` James Chapman [this message]
2012-04-13 17:24 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F857052.1040005@katalix.com \
--to=jchapman@katalix$(echo .)com \
--cc=bcrl@kvack$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox