Keep all basic chains on reload and only flush them, this allows user rules to jump...

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index a2b80be..32ff87d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,7 +31,7 @@
 #include "iptables.h"
 
 
-static bool print_rules = false;
+static enum fw3_family print_family = FW3_FAMILY_ANY;
 
 static struct fw3_state *run_state = NULL;
 static struct fw3_state *cfg_state = NULL;
@@ -175,7 +175,7 @@ stop(bool complete)
                return rv;
        }
 
-       if (!print_rules && run_state)
+       if (!print_family && run_state)
                fw3_hotplug_zones(run_state, false);
 
        for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
@@ -205,6 +205,7 @@ stop(bool complete)
                        }
 
                        fw3_ipt_commit(handle);
+                       fw3_ipt_close(handle);
                }
 
                family_set(run_state, family, false);
@@ -214,13 +215,7 @@ stop(bool complete)
        }
 
        if (run_state)
-       {
-               if (fw3_command_pipe(false, "ipset", "-exist", "-"))
-               {
-                       fw3_destroy_ipsets(run_state);
-                       fw3_command_close();
-               }
-       }
+               fw3_destroy_ipsets(run_state);
 
        if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
        {
@@ -244,21 +239,18 @@ start(void)
        enum fw3_table table;
        struct fw3_ipt_handle *handle;
 
-       if (!print_rules)
-       {
-               if (fw3_command_pipe(false, "ipset", "-exist", "-"))
-               {
-                       fw3_create_ipsets(cfg_state);
-                       fw3_command_close();
-               }
-       }
+       if (!print_family)
+               fw3_create_ipsets(cfg_state);
 
        for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
        {
                if (family == FW3_FAMILY_V6 && cfg_state->defaults.disable_ipv6)
                        continue;
 
-               if (!print_rules && family_running(family))
+               if (print_family && family != print_family)
+                       continue;
+
+               if (!print_family && family_running(family))
                {
                        warn("The %s firewall appears to be started already. "
                             "If it is indeed empty, remove the %s file and retry.",
@@ -287,10 +279,14 @@ start(void)
                        fw3_print_zone_rules(handle, cfg_state, false);
                        fw3_print_default_tail_rules(handle, cfg_state, false);
 
-                       fw3_ipt_commit(handle);
+                       if (!print_family)
+                               fw3_ipt_commit(handle);
+
+                       fw3_ipt_close(handle);
                }
 
-               //fw3_print_includes(cfg_state, family, false);
+               if (!print_family)
+                       fw3_print_includes(cfg_state, family, false);
 
                family_set(run_state, family, true);
                family_set(cfg_state, family, true);
@@ -302,7 +298,7 @@ start(void)
        {
                fw3_set_defaults(cfg_state);
 
-               if (!print_rules)
+               if (!print_family)
                {
                        fw3_run_includes(cfg_state, false);
                        fw3_hotplug_zones(cfg_state, true);
@@ -322,8 +318,10 @@ reload(void)
        enum fw3_table table;
        struct fw3_ipt_handle *handle;
 
-       if (!print_rules && run_state)
-               fw3_hotplug_zones(run_state, false);
+       if (!run_state)
+               return start();
+
+       fw3_hotplug_zones(run_state, false);
 
        for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
        {
@@ -341,13 +339,10 @@ reload(void)
                        info(" * Clearing %s %s table",
                             fw3_flag_names[family], fw3_flag_names[table]);
 
-                       if (run_state)
-                       {
-                               fw3_flush_rules(handle, run_state, true);
-                               fw3_flush_zones(handle, run_state, true);
-                       }
-
+                       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);
@@ -378,9 +373,10 @@ start:
                        fw3_print_default_tail_rules(handle, cfg_state, true);
 
                        fw3_ipt_commit(handle);
+                       fw3_ipt_close(handle);
                }
 
-               //fw3_print_includes(cfg_state, family, true);
+               fw3_print_includes(cfg_state, family, true);
 
                family_set(run_state, family, true);
                family_set(cfg_state, family, true);
@@ -391,13 +387,9 @@ start:
        if (!rv)
        {
                fw3_set_defaults(cfg_state);
-
-               if (!print_rules)
-               {
-                       fw3_run_includes(cfg_state, true);
-                       fw3_hotplug_zones(cfg_state, true);
-                       fw3_write_statefile(cfg_state);
-               }
+               fw3_run_includes(cfg_state, true);
+               fw3_hotplug_zones(cfg_state, true);
+               fw3_write_statefile(cfg_state);
        }
 
        return rv;
@@ -460,19 +452,19 @@ usage(void)
 int main(int argc, char **argv)
 {
        int ch, rv = 1;
+       enum fw3_family family = FW3_FAMILY_ANY;
        struct fw3_defaults *defs = NULL;
-       enum fw3_family use_family = FW3_FAMILY_ANY;
 
        while ((ch = getopt(argc, argv, "46dqh")) != -1)
        {
                switch (ch)
                {
                case '4':
-                       use_family = FW3_FAMILY_V4;
+                       family = FW3_FAMILY_V4;
                        break;
 
                case '6':
-                       use_family = FW3_FAMILY_V6;
+                       family = FW3_FAMILY_V6;
                        break;
 
                case 'd':
@@ -501,15 +493,25 @@ int main(int argc, char **argv)
 
        if (!strcmp(argv[optind], "print"))
        {
-               if (use_family == FW3_FAMILY_ANY)
-                       use_family = FW3_FAMILY_V4;
-               else if (use_family == FW3_FAMILY_V6 && defs->disable_ipv6)
-                       warn("IPv6 rules globally disabled in configuration");
+               if (family == FW3_FAMILY_ANY)
+               {
+                       family = FW3_FAMILY_V4;
+               }
+               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);
 
                cfg_state->disable_ipsets = true;
-               print_rules = true;
+               print_family = family;
+               fw3_pr_debug = true;
 
                rv = start();
        }