firewall3: add UBUS support for forwarding sections

[project/firewall3.git] / forwards.h

diff --git a/forwards.h b/forwards.h
index b8784bc..06d3e06 100644 (file)
--- a/forwards.h
+++ b/forwards.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
@@ -22,14 +22,17 @@
 #include "options.h"
 #include "zones.h"
 #include "utils.h"
+#include "iptables.h"
 
 extern const struct fw3_option fw3_forward_opts[];
 
-void fw3_load_forwards(struct fw3_state *state, struct uci_package *p);
-void fw3_print_forwards(struct fw3_state *state, enum fw3_family family,
-                        enum fw3_table table);
+void fw3_load_forwards(struct fw3_state *state, struct uci_package *p, struct blob_attr *a);
+void fw3_print_forwards(struct fw3_ipt_handle *handle, struct fw3_state *state);
 
-#define fw3_free_forward(forward) \
-       fw3_free_object(forward, fw3_forward_opts)
+static inline void fw3_free_forward(struct fw3_forward *forward)
+{
+       list_del(&forward->list);
+       fw3_free_object(forward, fw3_forward_opts);
+}
 
 #endif