From patchwork Thu Jun 19 15:07:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 361900 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 7B79F140092 for ; Fri, 20 Jun 2014 01:07:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933095AbaFSPHZ (ORCPT ); Thu, 19 Jun 2014 11:07:25 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:52590 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932894AbaFSPHZ (ORCPT ); Thu, 19 Jun 2014 11:07:25 -0400 Received: by mail-wg0-f43.google.com with SMTP id b13so2450666wgh.14 for ; Thu, 19 Jun 2014 08:07:24 -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=5wRvfD5+d95rqoHE1usrgozzqwTMo93K57nuZxoi1fE=; b=ow6v3RTLdE9GRGnJIxSU7KXy/FmxDgZdlTJEPfxNo9nTea9WnZ5DZ7tZnaShr/ZPpg Y2pEiCLQYstrtEyTp4rwirap5CKq9iNK0uJj7z7QwGcyAxjV+iTzT7bIp6N51IKbLkEX s8coVl0QrjucpWD5Io3C4I2gf9zLwXdYbiceuSzLCdCb+eYSh13gZK7WqEqp5SqachEo ihHpad2SU6t54w8AB3T1PqXNyB2PzAoY+SUeAFLB15x33cuTpnZ8owW89MeOD2F7rW1y tQoQM+8jBjYUtCrkrneFONvtCwp1M24UyQxCXVzkHy7+qWzTuJcK8iF+yTpZ+dSvKGt2 9pkQ== X-Received: by 10.180.210.174 with SMTP id mv14mr7248516wic.47.1403190444012; Thu, 19 Jun 2014 08:07:24 -0700 (PDT) Received: from localhost.localdomain (186.169.216.87.static.jazztel.es. [87.216.169.186]) by mx.google.com with ESMTPSA id na4sm34100786wic.21.2014.06.19.08.07.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jun 2014 08:07:23 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 2/5] expr: byteorder: Use nft_rule_expr_set_* in the xml parsing code Date: Thu, 19 Jun 2014 17:07:07 +0200 Message-Id: <1403190430-22173-3-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403190430-22173-1-git-send-email-anarey@gmail.com> References: <1403190430-22173-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/byteorder.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index e42d7b6..0b87eca 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -244,24 +244,19 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_byteorder *byteorder = nft_expr_data(e); const char *op; int32_t ntoh; - uint32_t reg; + uint32_t sreg, dreg, len, size; - if (nft_mxml_reg_parse(tree, "sreg", ®, MXML_DESCEND_FIRST, - NFT_XML_MAND, err) != 0) + if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST, + NFT_XML_MAND, err) < 0) return -1; + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg); - byteorder->sreg = reg; - e->flags |= (1 << NFT_EXPR_BYTEORDER_SREG); - - if (nft_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND, NFT_XML_MAND, - err) != 0) + if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFT_XML_MAND, + err) < 0) return -1; - - byteorder->dreg = reg; - e->flags |= (1 << NFT_EXPR_BYTEORDER_DREG); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg); op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFT_XML_MAND, err); @@ -271,23 +266,19 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, ntoh = nft_str2ntoh(op); if (ntoh < 0) return -1; - - byteorder->op = ntoh; - e->flags |= (1 << NFT_EXPR_BYTEORDER_OP); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh); if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, BASE_DEC, - &byteorder->len, NFT_TYPE_U8, - NFT_XML_MAND, err) != 0) + &len, NFT_TYPE_U32, NFT_XML_MAND, + err) < 0) return -1; - - e->flags |= (1 << NFT_EXPR_BYTEORDER_LEN); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len); if (nft_mxml_num_parse(tree, "size", MXML_DESCEND_FIRST, BASE_DEC, - &byteorder->size, NFT_TYPE_U8, - NFT_XML_MAND, err) != 0) + &size, NFT_TYPE_U32, NFT_XML_MAND, + err) != 0) return -1; - - e->flags |= (1 << NFT_EXPR_BYTEORDER_SIZE); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size); return 0; #else