netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: kaber@trash.net, ast@fiberby.dk
Subject: [PATCH 2/5 nft] rule: use netlink_add_setelems() when creating literal sets
Date: Tue, 19 Jan 2016 18:52:53 +0100	[thread overview]
Message-ID: <1453225976-23749-2-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1453225976-23749-1-git-send-email-pablo@netfilter.org>

Thus, do_add_setelems() is only used for set declarations. This change
is required by the follow up patch entitled ("rule: fix use of intervals
in set declarations").

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/rule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rule.c b/src/rule.c
index 18ff592..1295228 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -876,7 +876,7 @@ static int do_add_set(struct netlink_ctx *ctx, const struct handle *h,
 		if (set->flags & SET_F_INTERVAL &&
 		    set_to_intervals(ctx->msgs, set) < 0)
 			return -1;
-		if (do_add_setelems(ctx, &set->handle, set->init) < 0)
+		if (netlink_add_setelems(ctx, &set->handle, set->init) < 0)
 			return -1;
 	}
 	return 0;
-- 
2.1.4


  reply	other threads:[~2016-01-19 17:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-19 17:52 [PATCH 1/5 nf,kernel] netfilter: nft_rbtree: allow adjacent intervals with dynamic updates Pablo Neira Ayuso
2016-01-19 17:52 ` Pablo Neira Ayuso [this message]
2016-01-19 17:52 ` [PATCH 3/5 nft] segtree: when checks when qsorting from interval_map_decompose() Pablo Neira Ayuso
2016-01-19 17:52 ` [PATCH 4/5 nft] segtree: pass element expression as parameter to set_to_intervals() Pablo Neira Ayuso
2016-01-19 17:52 ` [PATCH 5/5, nft] rule: allow dynamic updates for intervals in set declarations 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=1453225976-23749-2-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=ast@fiberby.dk \
    --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).