From patchwork Tue May 28 15:06:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Borrero X-Patchwork-Id: 246884 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 01D6A2C02CD for ; Wed, 29 May 2013 01:07:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934477Ab3E1PGp (ORCPT ); Tue, 28 May 2013 11:06:45 -0400 Received: from smtp3.cica.es ([150.214.5.190]:53542 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934474Ab3E1PGo (ORCPT ); Tue, 28 May 2013 11:06:44 -0400 Received: from localhost (unknown [127.0.0.1]) by smtp.cica.es (Postfix) with ESMTP id A9C9151ECD4; Tue, 28 May 2013 15:06:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at cica.es Received: from smtp.cica.es ([127.0.0.1]) by localhost (mail.cica.es [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xt4c0jEv7T6x; Tue, 28 May 2013 17:06:42 +0200 (CEST) Received: from nfdev.cica.es (nfdev.cica.es [IPv6:2a00:9ac0:c1ca:31::220]) by smtp.cica.es (Postfix) with ESMTP id 5AB1951ECE1; Tue, 28 May 2013 17:06:42 +0200 (CEST) Subject: [libnftables PATCH] data_reg: Add generic interface for parsing: nft_data_reg_parse(). To: netfilter-devel@vger.kernel.org From: Arturo Borrero Cc: pablo@netfilter.org Date: Tue, 28 May 2013 17:06:40 +0200 Message-ID: <20130528150640.5305.34507.stgit@nfdev.cica.es> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This was missing in previous patches, but was the original intention. Signed-off-by: Arturo Borrero Gonzalez --- src/expr/bitwise.c | 4 ++-- src/expr/cmp.c | 2 +- src/expr/data_reg.c | 18 +++++++++++++++++- src/expr/data_reg.h | 10 +++++++++- src/expr/immediate.c | 2 +- 5 files changed, 30 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index 9ebe3dc..1c7198b 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -265,7 +265,7 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, char *xml) /* hack for mxmSaveAllocString to print just the current node */ save = node->next; node->next = NULL; - if (nft_data_reg_xml_parse(&data_regtmp, + if (nft_data_reg_parse(&data_regtmp, NFT_DATA_REG_PARSE_XML, mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { mxmlDelete(tree); return -1; @@ -287,7 +287,7 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, char *xml) /* hack for mxmSaveAllocString to print just the current node */ save = node->next; node->next = NULL; - if (nft_data_reg_xml_parse(&data_regtmp, + if (nft_data_reg_parse(&data_regtmp, NFT_DATA_REG_PARSE_XML, mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { mxmlDelete(tree); return -1; diff --git a/src/expr/cmp.c b/src/expr/cmp.c index 673f3e0..bf285d5 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -237,7 +237,7 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, char *xml) save = node->next; node->next = NULL; - if (nft_data_reg_xml_parse(&data_regtmp, + if (nft_data_reg_parse(&data_regtmp, NFT_DATA_REG_PARSE_XML, mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { mxmlDelete(tree); return -1; diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index be2b47a..5ebc1de 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -225,7 +225,7 @@ static int nft_data_reg_value_xml_parse(union nft_data_reg *reg, char *xml) #endif } -int nft_data_reg_xml_parse(union nft_data_reg *reg, char *xml) +static int nft_data_reg_xml_parse(union nft_data_reg *reg, char *xml) { #ifdef XML_PARSING mxml_node_t *node = NULL; @@ -267,6 +267,22 @@ int nft_data_reg_xml_parse(union nft_data_reg *reg, char *xml) #endif } +int nft_data_reg_parse(union nft_data_reg *reg, + enum nft_data_reg_parse_type type, char *data) { + int ret; + + switch (type) { + case NFT_DATA_REG_PARSE_XML: + ret = nft_data_reg_xml_parse(reg, data); + break; + default: + errno = EOPNOTSUPP; + ret = -1; + } + + return ret; +} + static int nft_data_reg_value_snprintf_xml(char *buf, size_t size, union nft_data_reg *reg, uint32_t flags) diff --git a/src/expr/data_reg.h b/src/expr/data_reg.h index 1552c1e..0a290a8 100644 --- a/src/expr/data_reg.h +++ b/src/expr/data_reg.h @@ -20,7 +20,15 @@ union nft_data_reg { int nft_data_reg_snprintf(char *buf, size_t size, union nft_data_reg *reg, uint32_t output_format, uint32_t flags, int reg_type); -int nft_data_reg_xml_parse(union nft_data_reg *reg, char *xml); + +enum nft_data_reg_parse_type { + NFT_DATA_REG_PARSE_NONE = 0, + NFT_DATA_REG_PARSE_XML, + NFT_DATA_REG_PARSE_MAX, +}; + +int nft_data_reg_parse(union nft_data_reg *reg, + enum nft_data_reg_parse_type type, char *data); int nft_parse_data(union nft_data_reg *data, struct nlattr *attr, int *type); #endif diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 7cfb4bf..f10a785 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -251,7 +251,7 @@ nft_rule_expr_immediate_xml_parse(struct nft_rule_expr *e, char *xml) save = node->next; node->next = NULL; - if (nft_data_reg_xml_parse(&data_regtmp, + if (nft_data_reg_parse(&data_regtmp, NFT_DATA_REG_PARSE_XML, mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { mxmlDelete(tree); return -1;