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 02/10] src: ct: store proto base of ct key, if any
Date: Wed, 27 Sep 2017 20:16:46 +0200	[thread overview]
Message-ID: <20170927181654.3129-3-fw@strlen.de> (raw)
In-Reply-To: <20170927181654.3129-1-fw@strlen.de>

ct keys can match on network and tranasport header protocol
elements, such as port numbers or ip addresses.

Store this base type so a followup commit can store and kill
dependencies, e.g. if bsae is network header we might be able
to kill an earlier expression because the dependency is implicit.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 include/expression.h |  1 +
 src/ct.c             | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/include/expression.h b/include/expression.h
index 90caaf51c36a..5b34d13d8527 100644
--- a/include/expression.h
+++ b/include/expression.h
@@ -300,6 +300,7 @@ struct expr {
 		struct {
 			/* EXPR_CT */
 			enum nft_ct_keys	key;
+			enum proto_bases	base;
 			int8_t			direction;
 			uint8_t			nfproto;
 		} ct;
diff --git a/src/ct.c b/src/ct.c
index 2b2578732066..99e4430bf173 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -347,8 +347,21 @@ struct expr *ct_expr_alloc(const struct location *loc, enum nft_ct_keys key,
 	expr->ct.nfproto = nfproto;
 
 	switch (key) {
+	case NFT_CT_SRC:
+	case NFT_CT_DST:
+		expr->ct.base = PROTO_BASE_NETWORK_HDR;
+		break;
+	case NFT_CT_PROTO_SRC:
+	case NFT_CT_PROTO_DST:
+		expr->ct.base = PROTO_BASE_TRANSPORT_HDR;
+		break;
 	case NFT_CT_PROTOCOL:
 		expr->flags = EXPR_F_PROTOCOL;
+		expr->ct.base = PROTO_BASE_NETWORK_HDR;
+		break;
+	case NFT_CT_L3PROTOCOL:
+		expr->flags = EXPR_F_PROTOCOL;
+		expr->ct.base = PROTO_BASE_LL_HDR;
 		break;
 	default:
 		break;
-- 
2.13.5


  parent reply	other threads:[~2017-09-27 18:16 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-27 18:16 [PATCH nft 0/10] nftables remove use of meta nfproto Florian Westphal
2017-09-27 18:16 ` [PATCH nft 01/10] src: add alternate syntax for ct saddr Florian Westphal
2017-09-27 18:16 ` Florian Westphal [this message]
2017-09-27 18:16 ` [PATCH nft 03/10] src: ct: add eval part to inject dependencies for ct saddr/daddr Florian Westphal
2017-09-27 18:16 ` [PATCH nft 04/10] src: unifiy meta and ct postprocessing Florian Westphal
2017-09-27 18:16 ` [PATCH nft 05/10] tests: update inet/bridge icmp test case Florian Westphal
2017-09-27 18:16 ` [PATCH nft 06/10] src: ct: print nfproto name for some header fields Florian Westphal
2017-09-27 18:16 ` [PATCH nft 07/10] tests: ct: adjust test case commands Florian Westphal
2017-09-27 18:16 ` [PATCH nft 08/10] src: rt: add keyword distinction for nexthop vs nexthop6 Florian Westphal
2017-09-27 18:16 ` [PATCH nft 09/10] tests: rt: fix test cases Florian Westphal
2017-09-27 18:16 ` [PATCH nft 10/10] doc: update man page Florian Westphal
2017-09-29 10:24 ` [PATCH nft 0/10] nftables remove use of meta nfproto 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=20170927181654.3129-3-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).