netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tom Herbert <tom@herbertland.com>
To: davem@davemloft.net, kuba@kernel.org, edumazet@google.com,
	netdev@vger.kernel.org, felipe@sipanda.io,
	willemdebruijn.kernel@gmail.com, pablo@netfilter.org,
	laforge@gnumonks.org, xeb@mail.ru
Cc: Tom Herbert <tom@herbertland.com>
Subject: [PATCH net-next v3 08/13] flow_dissector: Parse ESP, L2TP, and SCTP in UDP
Date: Wed, 21 Aug 2024 14:22:07 -0700	[thread overview]
Message-ID: <20240821212212.1795357-9-tom@herbertland.com> (raw)
In-Reply-To: <20240821212212.1795357-1-tom@herbertland.com>

These don't have an encapsulation header so it's fairly easy to
support them

Signed-off-by: Tom Herbert <tom@herbertland.com>
---
 net/core/flow_dissector.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index fed1f98358e8..331848f90f78 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -963,10 +963,23 @@ __skb_flow_dissect_udp(const struct sk_buff *skb, const struct net *net,
 	ret = FLOW_DISSECT_RET_OUT_GOOD;
 
 	switch (encap_type) {
+	case UDP_ENCAP_ESPINUDP_NON_IKE:
+	case UDP_ENCAP_ESPINUDP:
+		*p_ip_proto = IPPROTO_ESP;
+		ret = FLOW_DISSECT_RET_IPPROTO_AGAIN;
+		break;
+	case UDP_ENCAP_L2TPINUDP:
+		*p_ip_proto = IPPROTO_L2TP;
+		ret = FLOW_DISSECT_RET_IPPROTO_AGAIN;
+		break;
 	case UDP_ENCAP_FOU:
 		*p_ip_proto = fou_protocol;
 		ret = FLOW_DISSECT_RET_IPPROTO_AGAIN;
 		break;
+	case UDP_ENCAP_SCTP:
+		*p_ip_proto = IPPROTO_SCTP;
+		ret = FLOW_DISSECT_RET_IPPROTO_AGAIN;
+		break;
 	case UDP_ENCAP_VXLAN:
 	case UDP_ENCAP_VXLAN_GPE:
 		ret = __skb_flow_dissect_vxlan(skb, flow_dissector,
-- 
2.34.1


  parent reply	other threads:[~2024-08-21 21:22 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-21 21:21 [PATCH net-next v3 00/13] flow_dissector: Dissect UDP encapsulation protocols Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 01/13] ipv6: Add udp6_lib_lookup to IPv6 stubs Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 02/13] flow_dissector: Parse ETH_P_TEB and move out of GRE Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 03/13] udp_encaps: Add new UDP_ENCAP constants Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 04/13] udp_encaps: Set proper UDP_ENCAP types in tunnel setup Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 05/13] flow_dissector: UDP encap infrastructure Tom Herbert
2024-08-22  8:25   ` kernel test robot
2024-08-21 21:22 ` [PATCH net-next v3 06/13] flow_dissector: Parse vxlan in UDP Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 07/13] flow_dissector: Parse foo-over-udp (FOU) Tom Herbert
2024-08-21 21:22 ` Tom Herbert [this message]
2024-08-21 21:22 ` [PATCH net-next v3 09/13] flow_dissector: Parse Geneve in UDP Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 10/13] flow_dissector: Parse GUE " Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 11/13] gtp: Move gtp_parse_exthdrs into net/gtp.h Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 12/13] flow_dissector: Parse gtp in UDP Tom Herbert
2024-08-21 21:22 ` [PATCH net-next v3 13/13] flow_dissector: Add case in ipproto switch for NEXTHDR_NONE Tom Herbert

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=20240821212212.1795357-9-tom@herbertland.com \
    --to=tom@herbertland.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=felipe@sipanda.io \
    --cc=kuba@kernel.org \
    --cc=laforge@gnumonks.org \
    --cc=netdev@vger.kernel.org \
    --cc=pablo@netfilter.org \
    --cc=willemdebruijn.kernel@gmail.com \
    --cc=xeb@mail.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).