diff options
-rw-r--r-- | forwards.c | 4 | ||||
-rw-r--r-- | redirects.c | 4 | ||||
-rw-r--r-- | rules.c | 4 | ||||
-rw-r--r-- | zones.c | 2 | ||||
-rw-r--r-- | zones.h | 3 |
5 files changed, 8 insertions, 9 deletions
@@ -72,14 +72,14 @@ fw3_load_forwards(struct fw3_state *state, struct uci_package *p) continue; } else if (forward->src.set && !forward->src.any && - !(forward->_src = fw3_lookup_zone(state, forward->src.name, false))) + !(forward->_src = fw3_lookup_zone(state, forward->src.name))) { warn_elem(e, "refers to not existing zone '%s'", forward->src.name); fw3_free_forward(forward); continue; } else if (forward->dest.set && !forward->dest.any && - !(forward->_dest = fw3_lookup_zone(state, forward->dest.name, false))) + !(forward->_dest = fw3_lookup_zone(state, forward->dest.name))) { warn_elem(e, "refers to not existing zone '%s'", forward->dest.name); fw3_free_forward(forward); diff --git a/redirects.c b/redirects.c index 0a13d85..45d04c8 100644 --- a/redirects.c +++ b/redirects.c @@ -157,14 +157,14 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p) continue; } else if (redir->src.set && !redir->src.any && - !(redir->_src = fw3_lookup_zone(state, redir->src.name, false))) + !(redir->_src = fw3_lookup_zone(state, redir->src.name))) { warn_elem(e, "refers to not existing zone '%s'", redir->src.name); fw3_free_redirect(redir); continue; } else if (redir->dest.set && !redir->dest.any && - !(redir->_dest = fw3_lookup_zone(state, redir->dest.name, false))) + !(redir->_dest = fw3_lookup_zone(state, redir->dest.name))) { warn_elem(e, "refers to not existing zone '%s'", redir->dest.name); fw3_free_redirect(redir); @@ -114,14 +114,14 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p) continue; } else if (rule->src.set && !rule->src.any && - !(rule->_src = fw3_lookup_zone(state, rule->src.name, false))) + !(rule->_src = fw3_lookup_zone(state, rule->src.name))) { warn_elem(e, "refers to not existing zone '%s'", rule->src.name); fw3_free_rule(rule); continue; } else if (rule->dest.set && !rule->dest.any && - !(rule->_dest = fw3_lookup_zone(state, rule->dest.name, false))) + !(rule->_dest = fw3_lookup_zone(state, rule->dest.name))) { warn_elem(e, "refers to not existing zone '%s'", rule->dest.name); fw3_free_rule(rule); @@ -561,7 +561,7 @@ fw3_hotplug_zones(struct fw3_state *state, bool add) } struct fw3_zone * -fw3_lookup_zone(struct fw3_state *state, const char *name, bool running) +fw3_lookup_zone(struct fw3_state *state, const char *name) { struct fw3_zone *z; @@ -38,8 +38,7 @@ void fw3_flush_zones(struct fw3_state *state, enum fw3_family family, void fw3_hotplug_zones(struct fw3_state *state, bool add); -struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name, - bool running); +struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name); void fw3_free_zone(struct fw3_zone *zone); |