summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>2013-09-04 12:50:21 +0300
committerPablo Neira Ayuso <pablo@netfilter.org>2013-09-04 12:33:04 +0200
commit419968925d01571b2f454abb2b80a0f30b7f3227 (patch)
tree5645237c15fc2b0cbb5e1b77a76f8eb796ecd12e
parent108d9f6b3af0f70459fb7ccc1dfc5452d3f3646e (diff)
src: Add priority keyword on base chain description
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 <tomasz.bursztyka@linux.intel.com>
-rw-r--r--src/parser.y8
-rw-r--r--src/rule.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/parser.y b/src/parser.y
index ec78e7fd..a7dfdcc4 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -767,7 +767,7 @@ map_block : /* empty */ { $$ = $<set>-1; }
}
;
-hook_spec : TYPE STRING HOOK STRING NUM
+hook_spec : TYPE STRING HOOK STRING PRIORITY NUM
{
$<chain>0->type = $2;
$<chain>0->hookstr = chain_hookname_lookup($4);
@@ -776,10 +776,10 @@ hook_spec : TYPE STRING HOOK STRING NUM
state->msgs);
YYERROR;
}
- $<chain>0->priority = $5;
+ $<chain>0->priority = $6;
$<chain>0->flags |= CHAIN_F_BASECHAIN;
}
- | TYPE STRING HOOK STRING DASH NUM
+ | TYPE STRING HOOK STRING PRIORITY DASH NUM
{
$<chain>0->type = $2;
$<chain>0->hookstr = chain_hookname_lookup($4);
@@ -788,7 +788,7 @@ hook_spec : TYPE STRING HOOK STRING NUM
state->msgs);
YYERROR;
}
- $<chain>0->priority = -$6;
+ $<chain>0->priority = -$7;
$<chain>0->flags |= CHAIN_F_BASECHAIN;
}
;
diff --git a/src/rule.c b/src/rule.c
index f493cd48..42ba37f4 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -295,7 +295,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->handle.family, chain->hooknum),
chain->priority);
}