X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=main.c;h=bc1cfd73c3a885803dc8901e9c9b8b8d93a57591;hb=1097a30f1d08c54e9483fb47fd4f25033e86d90d;hp=8b10d083eb85c91a3f6e9cec2308661c7e39438c;hpb=73805dcc03e242fe5e25c9764ed33456acebdb95;p=project%2Ffirewall3.git

diff --git a/main.c b/main.c
index 8b10d08..bc1cfd7 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -24,6 +24,7 @@
 #include "zones.h"
 #include "rules.h"
 #include "redirects.h"
+#include "snats.h"
 #include "forwards.h"
 #include "ipsets.h"
 #include "includes.h"
@@ -102,6 +103,7 @@ build_state(bool runtime)
 	fw3_load_zones(state, p);
 	fw3_load_rules(state, p);
 	fw3_load_redirects(state, p);
+	fw3_load_snats(state, p);
 	fw3_load_forwards(state, p);
 	fw3_load_includes(state, p);
 
@@ -122,6 +124,9 @@ free_state(struct fw3_state *state)
 	list_for_each_safe(cur, tmp, &state->redirects)
 		fw3_free_redirect((struct fw3_redirect *)cur);
 
+	list_for_each_safe(cur, tmp, &state->snats)
+		fw3_free_snat((struct fw3_snat *)cur);
+
 	list_for_each_safe(cur, tmp, &state->forwards)
 		fw3_free_forward((struct fw3_forward *)cur);
 
@@ -205,6 +210,7 @@ stop(bool complete)
 			}
 
 			fw3_ipt_commit(handle);
+			fw3_ipt_close(handle);
 		}
 
 		family_set(run_state, family, false);
@@ -274,12 +280,15 @@ start(void)
 			fw3_print_default_head_rules(handle, cfg_state, false);
 			fw3_print_rules(handle, cfg_state);
 			fw3_print_redirects(handle, cfg_state);
+			fw3_print_snats(handle, cfg_state);
 			fw3_print_forwards(handle, cfg_state);
 			fw3_print_zone_rules(handle, cfg_state, false);
 			fw3_print_default_tail_rules(handle, cfg_state, false);
 
 			if (!print_family)
 				fw3_ipt_commit(handle);
+
+			fw3_ipt_close(handle);
 		}
 
 		if (!print_family)
@@ -339,6 +348,7 @@ reload(void)
 			fw3_flush_rules(handle, run_state, true);
 			fw3_flush_zones(handle, run_state, true);
 			fw3_ipt_commit(handle);
+			fw3_ipt_close(handle);
 		}
 
 		family_set(run_state, family, false);
@@ -364,11 +374,13 @@ start:
 			fw3_print_default_head_rules(handle, cfg_state, true);
 			fw3_print_rules(handle, cfg_state);
 			fw3_print_redirects(handle, cfg_state);
+			fw3_print_snats(handle, cfg_state);
 			fw3_print_forwards(handle, cfg_state);
 			fw3_print_zone_rules(handle, cfg_state, true);
 			fw3_print_default_tail_rules(handle, cfg_state, true);
 
 			fw3_ipt_commit(handle);
+			fw3_ipt_close(handle);
 		}
 
 		fw3_print_includes(cfg_state, family, true);
@@ -467,7 +479,7 @@ int main(int argc, char **argv)
 			break;
 
 		case 'q':
-			freopen("/dev/null", "w", stderr);
+			if (freopen("/dev/null", "w", stderr)) {}
 			break;
 
 		case 'h':
@@ -502,7 +514,7 @@ int main(int argc, char **argv)
 #endif
 		}
 
-		freopen("/dev/null", "w", stderr);
+		if (freopen("/dev/null", "w", stderr)) {};
 
 		cfg_state->disable_ipsets = true;
 		print_family = family;