From patchwork Mon Jul 6 18:17:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 491736 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 76EC8140DB8 for ; Tue, 7 Jul 2015 04:11:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200AbbGFSLq (ORCPT ); Mon, 6 Jul 2015 14:11:46 -0400 Received: from mail.us.es ([193.147.175.20]:40448 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753621AbbGFSLm (ORCPT ); Mon, 6 Jul 2015 14:11:42 -0400 Received: (qmail 29992 invoked from network); 6 Jul 2015 20:11:40 +0200 Received: from unknown (HELO us.es) (192.168.2.15) by us.es with SMTP; 6 Jul 2015 20:11:40 +0200 Received: (qmail 11526 invoked by uid 507); 6 Jul 2015 18:11:40 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus5 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.7/20651. spamassassin: 3.4.0. Clear:RC:1(127.0.0.1):SA:0(-103.2/7.5):. Processed in 1.90674 secs); 06 Jul 2015 18:11:40 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on antivirus5 X-Spam-Level: X-Spam-Status: No, score=-103.2 required=7.5 tests=BAYES_50,SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.4.0 X-Spam-ASN: AS12715 87.216.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus5) (127.0.0.1) by us.es with SMTP; 6 Jul 2015 18:11:38 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus5 (F-Secure/fsigk_smtp/412/antivirus5); Mon, 06 Jul 2015 20:11:38 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus5) Received: (qmail 30677 invoked from network); 6 Jul 2015 20:11:38 +0200 Received: from 129.166.216.87.static.jazztel.es (HELO salvia.here) (pneira@us.es@87.216.166.129) by mail.us.es with SMTP; 6 Jul 2015 20:11:38 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH nft, v4 09/16] rule: use netlink_add_setelems() when creating literal sets Date: Mon, 6 Jul 2015 20:17:01 +0200 Message-Id: <1436206628-23894-10-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1436206628-23894-1-git-send-email-pablo@netfilter.org> References: <1436206628-23894-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Thus, do_add_setelems() is only used for set declarations. This comes in preparation to the follow up patch, to avoid resending back to userspace the list of existing elements. Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rule.c b/src/rule.c index 2b624c2..2b663f5 100644 --- a/src/rule.c +++ b/src/rule.c @@ -762,7 +762,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, set->init) < 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;