firewall3: check the return value of fw3_parse_options()

[project/firewall3.git] / rules.h

diff --git a/rules.h b/rules.h
index 38d0df7..7cf8524 100644 (file)
--- a/rules.h
+++ b/rules.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,17 @@
 #include "zones.h"
 #include "ipsets.h"
 #include "utils.h"
+#include "iptables.h"
 
 extern const struct fw3_option fw3_rule_opts[];
 
-void fw3_load_rules(struct fw3_state *state, struct uci_package *p);
-void fw3_print_rules(enum fw3_table table, enum fw3_family family,
-                     struct fw3_state *state);
+void fw3_load_rules(struct fw3_state *state, struct uci_package *p, struct blob_attr *a);
+void fw3_print_rules(struct fw3_ipt_handle *handle, struct fw3_state *state);
 
-#define fw3_free_rule(rule) \
-       fw3_free_object(rule, fw3_rule_opts)
+static inline void fw3_free_rule(struct fw3_rule *rule)
+{
+       list_del(&rule->list);
+       fw3_free_object(rule, fw3_rule_opts);
+}
 
 #endif