projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify fw3_default and fw3_target enums
[project/firewall3.git]
/
rules.c
diff --git
a/rules.c
b/rules.c
index
de6ddc9
..
8452a40
100644
(file)
--- a/
rules.c
+++ b/
rules.c
@@
-137,7
+137,7
@@
fw3_load_rules(struct fw3_state *state, struct uci_package *p)
continue;
}
continue;
}
- if (!rule->_src && rule->target == FW3_
TARGET
_NOTRACK)
+ if (!rule->_src && rule->target == FW3_
FLAG
_NOTRACK)
{
warn_elem(e, "is set to target NOTRACK but has no source assigned");
fw3_free_rule(rule);
{
warn_elem(e, "is set to target NOTRACK but has no source assigned");
fw3_free_rule(rule);
@@
-150,15
+150,15
@@
fw3_load_rules(struct fw3_state *state, struct uci_package *p)
"- assuming an output rule");
}
"- assuming an output rule");
}
- if (rule->target == FW3_
TARGET
_UNSPEC)
+ if (rule->target == FW3_
FLAG
_UNSPEC)
{
warn_elem(e, "has no target specified, defaulting to REJECT");
{
warn_elem(e, "has no target specified, defaulting to REJECT");
- rule->target = FW3_
TARGET
_REJECT;
+ rule->target = FW3_
FLAG
_REJECT;
}
}
- else if (rule->target > FW3_
TARGET
_NOTRACK)
+ else if (rule->target > FW3_
FLAG
_NOTRACK)
{
warn_elem(e, "has invalid target specified, defaulting to REJECT");
{
warn_elem(e, "has invalid target specified, defaulting to REJECT");
- rule->target = FW3_
TARGET
_REJECT;
+ rule->target = FW3_
FLAG
_REJECT;
}
/* NB: rule family... */
}
/* NB: rule family... */
@@
-181,7
+181,7
@@
print_chain(struct fw3_rule *rule)
sprintf(chain, "delegate_output");
sprintf(chain, "delegate_output");
- if (rule->target == FW3_
TARGET
_NOTRACK)
+ if (rule->target == FW3_
FLAG
_NOTRACK)
{
sprintf(chain, "zone_%s_notrack", rule->src.name);
}
{
sprintf(chain, "zone_%s_notrack", rule->src.name);
}
@@
-218,20
+218,20
@@
static void print_target(struct fw3_rule *rule)
switch(rule->target)
{
switch(rule->target)
{
- case FW3_
TARGET
_ACCEPT:
- case FW3_
TARGET
_DROP:
- case FW3_
TARGET
_NOTRACK:
+ case FW3_
FLAG
_ACCEPT:
+ case FW3_
FLAG
_DROP:
+ case FW3_
FLAG
_NOTRACK:
target = fw3_flag_names[rule->target];
break;
default:
target = fw3_flag_names[rule->target];
break;
default:
- target = fw3_flag_names[FW3_
TARGET
_REJECT];
+ target = fw3_flag_names[FW3_
FLAG
_REJECT];
break;
}
if (rule->dest.set && !rule->dest.any)
fw3_pr(" -j zone_%s_dest_%s\n", rule->dest.name, target);
break;
}
if (rule->dest.set && !rule->dest.any)
fw3_pr(" -j zone_%s_dest_%s\n", rule->dest.name, target);
- else if (rule->target == FW3_
TARGET
_REJECT)
+ else if (rule->target == FW3_
FLAG
_REJECT)
fw3_pr(" -j reject\n");
else
fw3_pr(" -j %s\n", target);
fw3_pr(" -j reject\n");
else
fw3_pr(" -j %s\n", target);
@@
-292,7
+292,7
@@
expand_rule(enum fw3_table table, enum fw3_family family,
if (!fw3_is_family(rule, family))
return;
if (!fw3_is_family(rule, family))
return;
- if ((table == FW3_TABLE_RAW && rule->target != FW3_
TARGET
_NOTRACK) ||
+ if ((table == FW3_TABLE_RAW && rule->target != FW3_
FLAG
_NOTRACK) ||
(table != FW3_TABLE_FILTER))
return;
(table != FW3_TABLE_FILTER))
return;