use calloc instead of malloc+memset

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index 5897588..455c049 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"
@@ -44,12 +45,10 @@ build_state(bool runtime)
        struct uci_package *p = NULL;
        FILE *sf;
 
-       state = malloc(sizeof(*state));
-
+       state = calloc(1, sizeof(*state));
        if (!state)
                error("Out of memory");
 
-       memset(state, 0, sizeof(*state));
        state->uci = uci_alloc_context();
 
        if (!state->uci)
@@ -97,11 +96,16 @@ build_state(bool runtime)
                cfg_state = state;
        }
 
+
+       struct blob_buf b = {NULL, NULL, 0, NULL};
+       fw3_ubus_rules(&b);
+
        fw3_load_defaults(state, p);
        fw3_load_ipsets(state, p);
        fw3_load_zones(state, p);
-       fw3_load_rules(state, p);
+       fw3_load_rules(state, p, b.head);
        fw3_load_redirects(state, p);
+       fw3_load_snats(state, p, b.head);
        fw3_load_forwards(state, p);
        fw3_load_includes(state, p);
 
@@ -122,6 +126,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 +212,7 @@ stop(bool complete)
                        }
 
                        fw3_ipt_commit(handle);
+                       fw3_ipt_close(handle);
                }
 
                family_set(run_state, family, false);
@@ -274,12 +282,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 +350,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 +376,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);
@@ -433,12 +447,42 @@ lookup_device(const char *dev)
 }
 
 static int
+lookup_zone(const char *zone, const char *device)
+{
+       struct fw3_zone *z;
+       struct fw3_device *d;
+
+       list_for_each_entry(z, &cfg_state->zones, list)
+       {
+               if (strcmp(z->name, zone))
+                       continue;
+
+               list_for_each_entry(d, &z->devices, list)
+               {
+                       if (device && strcmp(device, d->name))
+                               continue;
+
+                       printf("%s\n", d->name);
+
+                       if (device)
+                               return 0;
+               }
+
+               if (!device)
+                       return 0;
+       }
+
+       return 1;
+}
+
+static int
 usage(void)
 {
        fprintf(stderr, "fw3 [-4] [-6] [-q] print\n");
        fprintf(stderr, "fw3 [-q] {start|stop|flush|reload|restart}\n");
        fprintf(stderr, "fw3 [-q] network {net}\n");
        fprintf(stderr, "fw3 [-q] device {dev}\n");
+       fprintf(stderr, "fw3 [-q] zone {zone} [dev]\n");
 
        return 1;
 }
@@ -467,7 +511,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'q':
-                       freopen("/dev/null", "w", stderr);
+                       if (freopen("/dev/null", "w", stderr)) {}
                        break;
 
                case 'h':
@@ -489,11 +533,20 @@ 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);
+               if (freopen("/dev/null", "w", stderr)) {};
 
                cfg_state->disable_ipsets = true;
                print_family = family;
@@ -550,6 +603,10 @@ int main(int argc, char **argv)
        {
                rv = lookup_device(argv[optind + 1]);
        }
+       else if (!strcmp(argv[optind], "zone") && (optind + 1) < argc)
+       {
+               rv = lookup_zone(argv[optind + 1], argv[optind + 2]);
+       }
        else
        {
                rv = usage();