From patchwork Tue Jun 24 17:14:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 363558 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 0C7581400DC for ; Wed, 25 Jun 2014 03:14:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755410AbaFXROf (ORCPT ); Tue, 24 Jun 2014 13:14:35 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:59464 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbaFXROe (ORCPT ); Tue, 24 Jun 2014 13:14:34 -0400 Received: by mail-we0-f170.google.com with SMTP id w61so696492wes.15 for ; Tue, 24 Jun 2014 10:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R+feEM65vN8I70FwheVVV4EYn1ACYyIhGQuj2UN/7lg=; b=h0rOtsOz16XoZJlctC4RZWLqiqg9KkJ482lI9uOsyRAcyF/N3e8tOsMETLfIp0Om37 8NUP+08aREzHY6t2DHG/s8Out77qX/co/lQ1sIaU08ZcyPI02kwiGAnRA67y/lcLVvGY Uez8wUXZ1UdFIMB2dj/Q2sAiXXoFaZwLQeUbr0UHZGXYup77bvJc0u7XaCDLkGMxc84m 87D5/HuyTTQt0SfBQhRBTorxX8jrcZXj2uaZ+8M1qnCm4/63D2yvQ/zJyGJMllNBLOHq mkmHwhK5w7TaluWPb5qqLcalhCVLjp0UqjpsLVV4Qorb47KFsErr/bhtQHvGdvQ6k+Vb achw== X-Received: by 10.194.87.134 with SMTP id ay6mr3021713wjb.84.1403630068244; Tue, 24 Jun 2014 10:14:28 -0700 (PDT) Received: from localhost.localdomain (186.169.216.87.static.jazztel.es. [87.216.169.186]) by mx.google.com with ESMTPSA id cy4sm3512602wib.5.2014.06.24.10.14.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jun 2014 10:14:27 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 1/3] expr: lookup: Use nft_rule_expr_set_* in the xml parsing code Date: Tue, 24 Jun 2014 19:14:15 +0200 Message-Id: <1403630057-12996-2-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403630057-12996-1-git-send-email-anarey@gmail.com> References: <1403630057-12996-1-git-send-email-anarey@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Code refactoring to use nft_rule_expr_set_* in parse functions. Signed-off-by: Ana Rey --- src/expr/lookup.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/expr/lookup.c b/src/expr/lookup.c index 1df65db..68b7345 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -194,31 +194,23 @@ nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_lookup *lookup = nft_expr_data(e); const char *set_name; - uint32_t reg; + uint32_t sreg, dreg; set_name = nft_mxml_str_parse(tree, "set", MXML_DESCEND_FIRST, NFT_XML_MAND, err); if (set_name == NULL) return -1; + nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name); - strncpy(lookup->set_name, set_name, IFNAMSIZ); - lookup->set_name[IFNAMSIZ-1] = '\0'; - e->flags |= (1 << NFT_EXPR_LOOKUP_SET); - - if (nft_mxml_reg_parse(tree, "sreg", ®, MXML_DESCEND, + if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND, NFT_XML_MAND, err) != 0) return -1; + nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg); - lookup->sreg = reg; - e->flags |= (1 << NFT_EXPR_LOOKUP_SREG); - - if (nft_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND, - NFT_XML_OPT, err) == 0) { - lookup->dreg = reg; - e->flags |= (1 << NFT_EXPR_LOOKUP_DREG); - } + if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, + NFT_XML_OPT, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg); return 0; #else