From patchwork Wed Jun 26 11:37:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Borrero X-Patchwork-Id: 254716 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 E56442C0092 for ; Wed, 26 Jun 2013 21:37:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752171Ab3FZLhb (ORCPT ); Wed, 26 Jun 2013 07:37:31 -0400 Received: from smtp3.cica.es ([150.214.5.190]:54714 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752118Ab3FZLha (ORCPT ); Wed, 26 Jun 2013 07:37:30 -0400 Received: from localhost (unknown [127.0.0.1]) by smtp.cica.es (Postfix) with ESMTP id 16E2651ED22; Wed, 26 Jun 2013 11:37:29 +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 kqzvmxMWOlu3; Wed, 26 Jun 2013 13:37:24 +0200 (CEST) Received: from nfdev.cica.es (nfdev.cica.es [IPv6:2a00:9ac0:c1ca:31::220]) by smtp.cica.es (Postfix) with ESMTP id 01C8B51ED25; Wed, 26 Jun 2013 13:37:23 +0200 (CEST) Subject: [libnftables PATCH 21/21] exthdr: xml: rename type node to exthdr_type To: netfilter-devel@vger.kernel.org From: Arturo Borrero Gonzalez Cc: pablo@netfilter.org Date: Wed, 26 Jun 2013 13:37:21 +0200 Message-ID: <20130626113721.23511.76762.stgit@nfdev.cica.es> In-Reply-To: <20130626113509.23511.14359.stgit@nfdev.cica.es> References: <20130626113509.23511.14359.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 patch renames the node in the exthdr expr to . Signed-off-by: Arturo Borrero Gonzalez --- src/expr/exthdr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 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/exthdr.c b/src/expr/exthdr.c index 3cccc28..21b1d80 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c @@ -258,8 +258,9 @@ nft_rule_expr_exthdr_xml_parse(struct nft_rule_expr *e, char *xml) exthdr->dreg = tmp; e->flags |= (1 << NFT_EXPR_EXTHDR_DREG); - /* Get and set */ - node = mxmlFindElement(tree, tree, "type", NULL, NULL, MXML_DESCEND); + /* Get and set */ + node = mxmlFindElement(tree, tree, "exthdr_type", NULL, NULL, + MXML_DESCEND); if (node == NULL) { mxmlDelete(tree); return -1; @@ -323,7 +324,8 @@ nft_rule_expr_exthdr_snprintf(char *buf, size_t len, uint32_t type, switch(type) { case NFT_RULE_O_XML: return snprintf(buf, len, "%u" - "%s%u" + "%s" + "%u" "%u", exthdr->dreg, exthdr_type2str(exthdr->type),