ubus: store rule origin as comment

[project/firewall3.git] / zones.h

diff --git a/zones.h b/zones.h
index 353f089..4205196 100644 (file)
--- a/zones.h
+++ b/zones.h
@@ -22,17 +22,20 @@
 #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[];
 
 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_ipt_handle *handle, struct fw3_state *state,
                      bool reload);
@@ -41,7 +44,11 @@ void fw3_hotplug_zones(struct fw3_state *state, bool add);
 
 struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name);
 
-void fw3_free_zone(struct fw3_zone *zone);
+struct list_head * fw3_resolve_zone_addresses(struct fw3_zone *zone,
+                                              struct fw3_address *addr);
+
+#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)