From patchwork Wed Aug 28 08:33:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Bursztyka X-Patchwork-Id: 270388 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 B27972C00AC for ; Wed, 28 Aug 2013 18:33:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752441Ab3H1IdV (ORCPT ); Wed, 28 Aug 2013 04:33:21 -0400 Received: from mga14.intel.com ([143.182.124.37]:28313 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094Ab3H1IdU (ORCPT ); Wed, 28 Aug 2013 04:33:20 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 28 Aug 2013 01:33:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,974,1367996400"; d="scan'208";a="287740641" Received: from rd-180.fi.intel.com ([10.237.68.43]) by AZSMGA002.ch.intel.com with ESMTP; 28 Aug 2013 01:33:18 -0700 From: Tomasz Bursztyka To: netfilter-devel@vger.kernel.org Cc: Tomasz Bursztyka Subject: [nftables tool PATCH 3/5] syntax: Add priority keyword on base chain description Date: Wed, 28 Aug 2013 11:33:09 +0300 Message-Id: <1377678791-7616-4-git-send-email-tomasz.bursztyka@linux.intel.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1377678791-7616-1-git-send-email-tomasz.bursztyka@linux.intel.com> References: <1377678791-7616-1-git-send-email-tomasz.bursztyka@linux.intel.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Instead of: add chain foo bar { type route hook input 0; } it should be now: add chain foo bar { type route hook input priority 0; } Signed-off-by: Tomasz Bursztyka --- src/parser.y | 8 ++++---- src/rule.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/parser.y b/src/parser.y index 4df7d44..9a91490 100644 --- a/src/parser.y +++ b/src/parser.y @@ -765,11 +765,11 @@ map_block : /* empty */ { $$ = $-1; } } ; -hook_spec : TYPE STRING HOOK STRING NUM +hook_spec : TYPE STRING HOOK STRING PRIORITY NUM { $0->type = $2; $0->hooknum = str2hooknum($4); - $0->priority = $5; + $0->priority = $6; $0->flags |= CHAIN_F_BASECHAIN; if ($0->hooknum == HOOK_NUMHOOKS) { @@ -778,11 +778,11 @@ hook_spec : TYPE STRING HOOK STRING NUM YYERROR; } } - | TYPE STRING HOOK STRING DASH NUM + | TYPE STRING HOOK STRING PRIORITY DASH NUM { $0->type = $2; $0->hooknum = str2hooknum($4); - $0->priority = -$6; + $0->priority = -$7; $0->flags |= CHAIN_F_BASECHAIN; if ($0->hooknum == HOOK_NUMHOOKS) { diff --git a/src/rule.c b/src/rule.c index 23b64a7..28a52b0 100644 --- a/src/rule.c +++ b/src/rule.c @@ -262,7 +262,7 @@ static void chain_print(const struct chain *chain) printf("\tchain %s {\n", chain->handle.chain); if (chain->flags & CHAIN_F_BASECHAIN) { - printf("\t\t type %s hook %s %u;\n", chain->type, + printf("\t\t type %s hook %s priority %u;\n", chain->type, hooknum2str(chain->hooknum), chain->priority); } list_for_each_entry(rule, &chain->rules, list) {