From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: kaber@trash.net
Subject: [PATCH nft,v3 7/7] rule: fix use of intervals in set declarations
Date: Thu, 2 Jul 2015 20:25:12 +0200 [thread overview]
Message-ID: <1435861512-23572-8-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1435861512-23572-1-git-send-email-pablo@netfilter.org>
# nft add table test
# nft add set test myset { type ipv4_addr\; flags interval\; }
# nft add element test myset { 1.2.3.0/24 }
Then the listing shows:
set myset2 {
type ipv4_addr
flags interval
elements = { 1.2.3.0/24}
}
This patch relies on the table and set caches.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=994
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/rule.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/rule.c b/src/rule.c
index bc9042f..8c9e8e8 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -769,10 +769,26 @@ static int do_add_chain(struct netlink_ctx *ctx, const struct handle *h,
}
static int do_add_setelems(struct netlink_ctx *ctx, const struct handle *h,
- const struct expr *expr)
+ struct expr *expr)
{
+ struct table *table;
+ struct set *set;
+
+ table = table_lookup(h);
+ if (table == NULL)
+ return -1;
+
+ set = set_lookup(table, h->set);
+ if (set == NULL)
+ return -1;
+
+ if (set->flags & SET_F_INTERVAL &&
+ set_to_intervals(ctx->msgs, set, expr) < 0)
+ return -1;
+
if (netlink_add_setelems(ctx, h, expr) < 0)
return -1;
+
return 0;
}
--
1.7.10.4
prev parent reply other threads:[~2015-07-02 18:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 18:25 [PATCH nft,v3 0/7] cache consolidation Pablo Neira Ayuso
2015-07-02 18:25 ` [PATCH nft,v3 1/7] src: consolidate table cache Pablo Neira Ayuso
2015-07-02 18:25 ` [PATCH nft,v3 2/7] src: add table declaration to cache Pablo Neira Ayuso
2015-07-02 18:25 ` [PATCH nft,v3 3/7] src: consolidate set cache Pablo Neira Ayuso
2015-07-02 18:25 ` [PATCH nft,v3 4/7] src: early allocation of the set ID Pablo Neira Ayuso
2015-07-02 18:25 ` [PATCH nft,v3 5/7] segtree: pass element expression as parameter to set_to_intervals() Pablo Neira Ayuso
2015-07-02 18:25 ` [PATCH nft,v3 6/7] rule: use netlink_add_setelems() when creating literal sets Pablo Neira Ayuso
2015-07-02 18:25 ` Pablo Neira Ayuso [this message]
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=1435861512-23572-8-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=kaber@trash.net \
--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).