X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.h;h=d78673664cd73c9e956695956235539be5d6237f;hp=bda96ab2873cb67ef1d15139d2faa7714b741093;hb=47b23946cb2d51c486cd01596744955f850e2060;hpb=6da847c446c29c349b0edd757c1afd529565c619;ds=sidebyside

diff --git a/zones.h b/zones.h
index bda96ab..d786736 100644
--- a/zones.h
+++ b/zones.h
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -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,24 @@ 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(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_flush_zones(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_hotplug_zones(struct fw3_state *state, bool add);
 
-void fw3_hotplug_zones(bool add, struct fw3_state *state);
+struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name);
 
-struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name,
-                                  bool running);
+struct list_head * fw3_resolve_zone_addresses(struct fw3_zone *zone,
+                                              struct fw3_address *addr);
 
-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)