From patchwork Tue Jun 24 06:46:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 363316 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 C52BE1400B8 for ; Tue, 24 Jun 2014 16:47:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752462AbaFXGrF (ORCPT ); Tue, 24 Jun 2014 02:47:05 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:56546 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752278AbaFXGrE (ORCPT ); Tue, 24 Jun 2014 02:47:04 -0400 Received: by mail-we0-f170.google.com with SMTP id w61so8167670wes.29 for ; Mon, 23 Jun 2014 23:47:03 -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=dB2PpTSI+/oa+qc6mgMwIs9McN4TkAxHF6hPbZXW7qk=; b=uHgelOKNCuMn2ryxqoVebvHUWIHDaCWT49XjYEpdz/t0oktiq3mn0fMTHK+nreYFOV CwnohUEg3oTvC7SGAl7H6PpKsnw7liVYWfNZxbO10Zsx2iGKTsTO87eEFsxv+ck2uSmO nE+If9pO9+lYsJbVxg+DF1/YBW6+JRbjp+Bb3hdZ8XepvHYNAUk0OWd8vHFWpbs0pD4K +GdFnbMEaTFseLSFbdp1nrKMmsWgDCqvfqv7RSWxmG3wJ3v4iTAOQub04gA0vlDk1hUp s36YaYRb6PDKE6agP5jEXSEwLGBFp3Pj+N7/R7fHSTHRH2XJRelAlpCLzTOc4qmg3Dng x26Q== X-Received: by 10.194.123.105 with SMTP id lz9mr1219655wjb.122.1403592422961; Mon, 23 Jun 2014 23:47:02 -0700 (PDT) Received: from localhost.localdomain ([188.84.98.232]) by mx.google.com with ESMTPSA id o2sm40341739wia.16.2014.06.23.23.47.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jun 2014 23:47:02 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 1/4] expr: ct: Use nft_rule_expr_set_* in the xml parsing code Date: Tue, 24 Jun 2014 08:46:37 +0200 Message-Id: <1403592401-5057-2-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403592401-5057-1-git-send-email-anarey@gmail.com> References: <1403592401-5057-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/ct.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/expr/ct.c b/src/expr/ct.c index 38f5169..0f1c050 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -286,23 +286,18 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_ct *ct = nft_expr_data(e); const char *key_str, *dir_str; int key; uint8_t dir; - uint32_t reg; + uint32_t dreg, sreg; - if (nft_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND_FIRST, - NFT_XML_OPT, err) >= 0) { - ct->dreg = reg; - e->flags |= (1 << NFT_EXPR_CT_DREG); - } + if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST, + NFT_XML_OPT, err) >= 0) + nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, dreg); - if (nft_mxml_reg_parse(tree, "sreg", ®, MXML_DESCEND_FIRST, - NFT_XML_OPT, err) >= 0) { - ct->sreg = reg; - e->flags |= (1 << NFT_EXPR_CT_SREG); - } + if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST, + NFT_XML_OPT, err) >= 0) + nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, sreg); key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST, NFT_XML_MAND, err); @@ -313,8 +308,7 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree if (key < 0) goto err; - ct->key = key; - e->flags |= (1 << NFT_EXPR_CT_KEY); + nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key); dir_str = nft_mxml_str_parse(tree, "dir", MXML_DESCEND_FIRST, NFT_XML_OPT, err);