netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH nft 1/7] payload: split ll proto dependency into helper
Date: Fri, 19 May 2017 22:11:05 +0200	[thread overview]
Message-ID: <20170519201111.7402-2-fw@strlen.de> (raw)
In-Reply-To: <20170519201111.7402-1-fw@strlen.de>

will be re-used in folloup patch for icmp/icmpv6 depenency
handling.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 patch was not part of earlier series.

 src/payload.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/payload.c b/src/payload.c
index 55128fee1498..31e5a0244837 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -224,21 +224,28 @@ static int payload_add_dependency(struct eval_ctx *ctx,
 }
 
 static const struct proto_desc *
+payload_get_get_ll_hdr(const struct eval_ctx *ctx)
+{
+	switch (ctx->pctx.family) {
+	case NFPROTO_INET:
+		return &proto_inet;
+	case NFPROTO_BRIDGE:
+		return &proto_eth;
+	case NFPROTO_NETDEV:
+		return &proto_netdev;
+	default:
+		break;
+	}
+
+	return NULL;
+}
+
+static const struct proto_desc *
 payload_gen_special_dependency(struct eval_ctx *ctx, const struct expr *expr)
 {
 	switch (expr->payload.base) {
 	case PROTO_BASE_LL_HDR:
-		switch (ctx->pctx.family) {
-		case NFPROTO_INET:
-			return &proto_inet;
-		case NFPROTO_BRIDGE:
-			return &proto_eth;
-		case NFPROTO_NETDEV:
-			return &proto_netdev;
-		default:
-			break;
-		}
-		break;
+		return payload_get_get_ll_hdr(ctx);
 	case PROTO_BASE_TRANSPORT_HDR:
 		if (expr->payload.desc == &proto_icmp)
 			return &proto_ip;
-- 
2.13.0


  reply	other threads:[~2017-05-19 20:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-19 20:11 [PATCH nft v3 0/7] switch l4 dependency to meta l4proto Florian Westphal
2017-05-19 20:11 ` Florian Westphal [this message]
2017-05-19 20:11 ` [PATCH nft v3 2/7] src: allow update of net base w. meta l4proto icmpv6 Florian Westphal
2017-05-19 20:11 ` [PATCH nft v3 3/7] src: ipv6: switch implicit dependencies to meta l4proto Florian Westphal
2017-05-19 20:11 ` [PATCH nft 4/7] payload: enforce ip/ip6 protocol depending on icmp or icmpv6 Florian Westphal
2017-05-19 20:11 ` [PATCH nft v3 5/7] tests: fix up meta l4proto change for ip6 family Florian Westphal
2017-05-19 20:11 ` [PATCH nft v3 6/7] src: ip: switch implicit dependencies to meta l4proto too Florian Westphal
2017-05-19 20:11 ` [PATCH nft v3 7/7] tests: fix up meta l4proto change for ip family Florian Westphal
2017-05-23 21:21 ` [PATCH nft v3 0/7] switch l4 dependency to meta l4proto Pablo Neira Ayuso

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=20170519201111.7402-2-fw@strlen.de \
    --to=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    /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).