From patchwork Tue Jun 3 10:41:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 355352 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 7AAF614009F for ; Tue, 3 Jun 2014 20:42:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677AbaFCKmL (ORCPT ); Tue, 3 Jun 2014 06:42:11 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:63011 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752522AbaFCKmJ (ORCPT ); Tue, 3 Jun 2014 06:42:09 -0400 Received: by mail-wi0-f182.google.com with SMTP id r20so6159087wiv.15 for ; Tue, 03 Jun 2014 03:42:08 -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=LaF0WT+O4gLzDIZNpPzOxtvd7FqIC6E+ePMFq6JQA78=; b=CeUdqMfve2aAJ8w6GaAlc+QFGm6TuUc6pU+xXdOMdGpzZxmjJqbKK1402FfWPLuf2W HeDKTHMcseqllDWF0TW8v09pqFjW7JrBdUUjdjHpiR+kmZlVVNfugAB925mR7/oekq3E aI59CQZMxXrgKPkmt5mMVJftYu0m5G7AnEVRzSUFyjzkD7MKZl/+1+GnSGL7yELVar50 bqVNv3BoNMFCFKfnuCeM5DhfQQ6T+kfigNFrgHOjHgCu7YMJ8aqKgrCjSQFwfv0j52fK hexHAy+5eU0QSlWrMEiyD1ODnTdfZ5gmzx73knsgD6gvX7t3h+drZhXTZdXIaA5OiN+2 d4mw== X-Received: by 10.180.212.77 with SMTP id ni13mr31117175wic.5.1401792127775; Tue, 03 Jun 2014 03:42:07 -0700 (PDT) Received: from localhost.localdomain (186.169.216.87.static.jazztel.es. [87.216.169.186]) by mx.google.com with ESMTPSA id q2sm40455931wix.5.2014.06.03.03.42.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Jun 2014 03:42:07 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH v4 2/3] expr: log: Use nft_rule_expr_set_* in the xml parsing code Date: Tue, 3 Jun 2014 12:41:55 +0200 Message-Id: <1401792116-17742-3-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1401792116-17742-1-git-send-email-anarey@gmail.com> References: <1401792116-17742-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 Suggested-by: Arturo Borrero Gonzalez --- src/expr/log.c | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/src/expr/log.c b/src/expr/log.c index eaba1d6..392bb14 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -133,6 +133,10 @@ nft_rule_expr_log_parse(struct nft_rule_expr *e, struct nlattr *attr) { struct nft_expr_log *log = nft_expr_data(e); struct nlattr *tb[NFTA_LOG_MAX+1] = {}; + const char *prefix; + uint32_t snaplen; + uint16_t group; + uint16_t qthreshold; if (mnl_attr_parse_nested(attr, nft_rule_expr_log_cb, tb) < 0) return -1; @@ -141,20 +145,20 @@ nft_rule_expr_log_parse(struct nft_rule_expr *e, struct nlattr *attr) if (log->prefix) xfree(log->prefix); - log->prefix = strdup(mnl_attr_get_str(tb[NFTA_LOG_PREFIX])); - e->flags |= (1 << NFT_EXPR_LOG_PREFIX); + prefix = strdup(mnl_attr_get_str(tb[NFTA_LOG_PREFIX])); + nft_rule_expr_set_str(e, NFT_EXPR_LOG_PREFIX, prefix); } if (tb[NFTA_LOG_GROUP]) { - log->group = ntohs(mnl_attr_get_u16(tb[NFTA_LOG_GROUP])); - e->flags |= (1 << NFT_EXPR_LOG_GROUP); + group = ntohs(mnl_attr_get_u16(tb[NFTA_LOG_GROUP])); + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, group); } if (tb[NFTA_LOG_SNAPLEN]) { - log->snaplen = ntohl(mnl_attr_get_u32(tb[NFTA_LOG_SNAPLEN])); - e->flags |= (1 << NFT_EXPR_LOG_SNAPLEN); + snaplen = ntohl(mnl_attr_get_u32(tb[NFTA_LOG_SNAPLEN])); + nft_rule_expr_set_u32(e, NFT_EXPR_LOG_SNAPLEN, snaplen); } if (tb[NFTA_LOG_QTHRESHOLD]) { - log->qthreshold = ntohs(mnl_attr_get_u16(tb[NFTA_LOG_QTHRESHOLD])); - e->flags |= (1 << NFT_EXPR_LOG_QTHRESHOLD); + qthreshold = ntohs(mnl_attr_get_u16(tb[NFTA_LOG_QTHRESHOLD])); + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, qthreshold); } return 0; @@ -205,37 +209,32 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e, struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_log *log = nft_expr_data(e); const char *prefix; + uint32_t snaplen; + uint16_t group; + uint16_t qthreshold; prefix = nft_mxml_str_parse(tree, "prefix", MXML_DESCEND_FIRST, NFT_XML_MAND, err); if (prefix == NULL) return -1; - - log->prefix = strdup(prefix); - e->flags |= (1 << NFT_EXPR_LOG_PREFIX); + nft_rule_expr_set_str(e, NFT_EXPR_LOG_PREFIX, prefix); if (nft_mxml_num_parse(tree, "group", MXML_DESCEND_FIRST, BASE_DEC, - &log->group, NFT_TYPE_U16, NFT_XML_MAND, - err) != 0) + &group, NFT_TYPE_U16, NFT_XML_MAND, err) < 0) return -1; - - e->flags |= (1 << NFT_EXPR_LOG_GROUP); + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, group); if (nft_mxml_num_parse(tree, "snaplen", MXML_DESCEND_FIRST, BASE_DEC, - &log->snaplen, NFT_TYPE_U32, NFT_XML_MAND, - err) != 0) + &snaplen, NFT_TYPE_U32, NFT_XML_MAND, err) < 0) return -1; + nft_rule_expr_set_u32(e, NFT_EXPR_LOG_SNAPLEN, snaplen); - e->flags |= (1 << NFT_EXPR_LOG_SNAPLEN); - - if (nft_mxml_num_parse(tree, "qthreshold", MXML_DESCEND_FIRST, - BASE_DEC, &log->qthreshold, - NFT_TYPE_U16, NFT_XML_MAND, err) != 0) + if (nft_mxml_num_parse(tree, "qthreshold", MXML_DESCEND_FIRST, BASE_DEC, + &qthreshold, NFT_TYPE_U16, NFT_XML_MAND, + err) < 0) return -1; - - e->flags |= (1 << NFT_EXPR_LOG_QTHRESHOLD); + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, qthreshold); return 0; #else