Skip rules with invalid options

[project/firewall3.git] / zones.h

diff --git a/zones.h b/zones.h
index 63ed3a5..cf5ce3c 100644 (file)
--- a/zones.h
+++ b/zones.h
@@ -20,6 +20,10 @@
 #define __FW3_ZONES_H
 
 #include "options.h"
+#include "iptables.h"
+
+/* 32 - sizeof("postrouting_") - sizeof("_rule") - sizeof("\0") */
+#define FW3_ZONE_MAXNAMELEN 14
 
 extern const struct fw3_option fw3_zone_opts[];
 
@@ -27,21 +31,23 @@ struct fw3_zone * fw3_alloc_zone(void);
 
 void fw3_load_zones(struct fw3_state *state, struct uci_package *p);
 
-void fw3_print_zone_chains(struct fw3_state *state, enum fw3_family family,
-                           enum fw3_table table, bool reload);
+void fw3_print_zone_chains(struct fw3_ipt_handle *handle,
+                           struct fw3_state *state, bool reload);
 
-void fw3_print_zone_rules(struct fw3_state *state, enum fw3_family family,
-                          enum fw3_table table, bool reload);
+void fw3_print_zone_rules(struct fw3_ipt_handle *handle,
+                          struct fw3_state *state, bool reload);
 
-void fw3_flush_zones(struct fw3_state *state, enum fw3_family family,
-                     enum fw3_table table, bool reload, bool pass2);
+void fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
+                     bool reload);
 
 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);
+
+struct list_head * fw3_resolve_zone_addresses(struct fw3_zone *zone);
 
-void fw3_free_zone(struct fw3_zone *zone);
+#define fw3_free_zone(zone) \
+       fw3_free_object(zone, fw3_zone_opts)
 
 #define fw3_to_src_target(t) \
        (FW3_FLAG_SRC_ACCEPT - FW3_FLAG_ACCEPT + t)