Include iptables command and table name in iptables debug output

[project/firewall3.git] / zones.h

diff --git a/zones.h b/zones.h
index c84897b..b78aa32 100644 (file)
--- a/zones.h
+++ b/zones.h
@@ -20,6 +20,7 @@
 #define __FW3_ZONES_H
 
 #include "options.h"
+#include "iptables.h"
 
 extern const struct fw3_option fw3_zone_opts[];
 
@@ -27,22 +28,22 @@ struct fw3_zone * fw3_alloc_zone(void);
 
 void fw3_load_zones(struct fw3_state *state, struct uci_package *p);
 
-void fw3_print_zone_chains(enum fw3_table table, enum fw3_family family,
-                           bool reload, struct fw3_state *state);
+void fw3_print_zone_chains(struct fw3_ipt_handle *handle,
+                           struct fw3_state *state, bool reload);
 
-void fw3_print_zone_rules(enum fw3_table table, enum fw3_family family,
-                          bool reload, struct fw3_state *state);
+void fw3_print_zone_rules(struct fw3_ipt_handle *handle,
+                          struct fw3_state *state, bool reload);
 
-void fw3_flush_zones(enum fw3_table table, enum fw3_family family,
-                     bool pass2, bool reload, struct fw3_state *state);
+void fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
+                     bool reload);
 
-struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name,
-                                  bool running);
+void fw3_hotplug_zones(struct fw3_state *state, bool add);
 
-#define fw3_to_src_target(t) \
-       (FW3_TARGET_SRC_ACCEPT - FW3_TARGET_ACCEPT + t)
+struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name);
+
+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)
 
 #endif