Reapply SNAT/MASQUERADE rules on firewall reloads

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index 5897588..bf0830b 100644 (file)
--- 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);
@@ -489,9 +501,18 @@ int main(int argc, char **argv)
        if (!strcmp(argv[optind], "print"))
        {
                if (family == FW3_FAMILY_ANY)
+               {
                        family = FW3_FAMILY_V4;
-               else if (family == FW3_FAMILY_V6 && defs->disable_ipv6)
-                       warn("IPv6 rules globally disabled in configuration");
+               }
+               else if (family == FW3_FAMILY_V6)
+               {
+                       if (defs->disable_ipv6)
+                               warn("IPv6 rules globally disabled in configuration");
+#ifdef DISABLE_IPV6
+                       else
+                               warn("IPv6 support is not compiled in");
+#endif
+               }
 
                freopen("/dev/null", "w", stderr);