Remove src_flags and running_src_flags from fw3_zone struct, rename dst_flags and...

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index e917963..09baca9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -135,7 +135,7 @@ restore_pipe(enum fw3_family family, bool silent)
 static bool
 family_running(struct fw3_state *state, enum fw3_family family)
 {
-       return hasbit(state->running_defaults.flags, family);
+       return hasbit(state->defaults.running_flags, family);
 }
 
 static bool
@@ -160,15 +160,18 @@ family_set(struct fw3_state *state, enum fw3_family family, bool set)
 }
 
 static int
-stop(struct fw3_state *state, bool complete, bool restart)
+stop(struct fw3_state *state, bool complete, bool reload)
 {
+       FILE *ct;
+
        int rv = 1;
        enum fw3_family family;
        enum fw3_table table;
+       enum fw3_target policy = reload ? FW3_TARGET_DROP : FW3_TARGET_ACCEPT;
 
        if (!complete && !state->statefile)
        {
-               if (!restart)
+               if (!reload)
                        warn("The firewall appears to be stopped. "
                                 "Use the 'flush' command to forcefully purge all rules.");
 
@@ -202,12 +205,12 @@ stop(struct fw3_state *state, bool complete, bool restart)
                        else
                        {
                                /* pass 1 */
-                               fw3_flush_rules(table, family, false, state);
-                               fw3_flush_zones(table, family, false, state);
+                               fw3_flush_rules(table, family, false, state, policy);
+                               fw3_flush_zones(table, family, false, reload, state);
 
                                /* pass 2 */
-                               fw3_flush_rules(table, family, true, state);
-                               fw3_flush_zones(table, family, true, state);
+                               fw3_flush_rules(table, family, true, state, policy);
+                               fw3_flush_zones(table, family, true, reload, state);
                        }
 
                        fw3_pr("COMMIT\n");
@@ -215,16 +218,26 @@ stop(struct fw3_state *state, bool complete, bool restart)
 
                fw3_command_close();
 
-               if (!restart)
+               if (!reload)
+               {
+                       if (fw3_command_pipe(false, "ipset", "-exist", "-"))
+                       {
+                               fw3_destroy_ipsets(state, family);
+                               fw3_command_close();
+                       }
+
                        family_set(state, family, false);
+               }
 
                rv = 0;
        }
 
-       if (!restart && fw3_command_pipe(false, "ipset", "-exist", "-"))
+       if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
        {
-               fw3_destroy_ipsets(state);
-               fw3_command_close();
+               info("Flushing conntrack table ...");
+
+               fwrite("f\n", 2, 1, ct);
+               fclose(ct);
        }
 
        if (!rv)
@@ -234,17 +247,21 @@ stop(struct fw3_state *state, bool complete, bool restart)
 }
 
 static int
-start(struct fw3_state *state, bool restart)
+start(struct fw3_state *state, bool reload)
 {
        int rv = 1;
        enum fw3_family family;
        enum fw3_table table;
 
-       if (!print_rules && !restart &&
-           fw3_command_pipe(false, "ipset", "-exist", "-"))
+       if (!print_rules && !reload)
        {
-               fw3_create_ipsets(state);
-               fw3_command_close();
+               fw3_set_defaults(state);
+
+               if (fw3_command_pipe(false, "ipset", "-exist", "-"))
+               {
+                       fw3_create_ipsets(state);
+                       fw3_command_close();
+               }
        }
 
        for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
@@ -252,7 +269,7 @@ start(struct fw3_state *state, bool restart)
                if (!family_used(family))
                        continue;
 
-               if (!print_rules && !restart && family_running(state, family))
+               if (!print_rules && !reload && family_running(state, family))
                {
                        warn("The %s firewall appears to be started already. "
                             "If it is indeed empty, remove the %s file and retry.",
@@ -285,12 +302,18 @@ start(struct fw3_state *state, bool restart)
                        fw3_pr("COMMIT\n");
                }
 
+               if (!reload)
+                       fw3_print_includes(family, state);
+
                fw3_command_close();
                family_set(state, family, true);
 
                rv = 0;
        }
 
+       if (!reload && !print_rules)
+               fw3_run_includes(state);
+
        if (!rv && !print_rules)
                fw3_write_statefile(state);
 
@@ -356,7 +379,7 @@ int main(int argc, char **argv)
        struct fw3_state *state = NULL;
        struct fw3_defaults *defs = NULL;
 
-       while ((ch = getopt(argc, argv, "46qh")) != -1)
+       while ((ch = getopt(argc, argv, "46dqh")) != -1)
        {
                switch (ch)
                {
@@ -368,6 +391,10 @@ int main(int argc, char **argv)
                        use_family = FW3_FAMILY_V6;
                        break;
 
+               case 'd':
+                       fw3_pr_debug = true;
+                       break;
+
                case 'q':
                        freopen("/dev/null", "w", stderr);
                        break;