firewall3: add UBUS support for redirect sections

[project/firewall3.git] / redirects.h

diff --git a/redirects.h b/redirects.h
index 4436f52..ac625f4 100644 (file)
--- a/redirects.h
+++ b/redirects.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
@@ -23,14 +23,19 @@
 #include "zones.h"
 #include "ipsets.h"
 #include "ubus.h"
+#include "iptables.h"
 
 extern const struct fw3_option fw3_redirect_opts[];
 
-void fw3_load_redirects(struct fw3_state *state, struct uci_package *p);
-void fw3_print_redirects(enum fw3_table table, enum fw3_family family,
+void fw3_load_redirects(struct fw3_state *state, struct uci_package *p,
+                       struct blob_attr *a);
+void fw3_print_redirects(struct fw3_ipt_handle *handle,
                          struct fw3_state *state);
 
-#define fw3_free_redirect(redir) \
-       fw3_free_object(redir, fw3_redirect_opts)
+static inline void fw3_free_redirect(struct fw3_redirect *redir)
+{
+       list_del(&redir->list);
+       fw3_free_object(redir, fw3_redirect_opts);
+}
 
 #endif