firewall3: check the return value of fw3_parse_options()

[project/firewall3.git] / includes.c

diff --git a/includes.c b/includes.c
index 23cfda0..a2b37a3 100644 (file)
--- a/includes.c
+++ b/includes.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *

- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>

  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -47,17 +47,15 @@ fw3_load_includes(struct fw3_state *state, struct uci_package *p)
                if (strcmp(s->type, "include"))
                        continue;
 
                if (strcmp(s->type, "include"))
                        continue;
 

-               include = malloc(sizeof(*include));
-
+               include = calloc(1, sizeof(*include));

                if (!include)
                        continue;
 
                if (!include)
                        continue;
 

-               memset(include, 0, sizeof(*include));
-

                include->name = e->name;
                include->enabled = true;
 
                include->name = e->name;
                include->enabled = true;
 

-               fw3_parse_options(include, fw3_include_opts, s);
+               if (!fw3_parse_options(include, fw3_include_opts, s))
+                       warn_elem(e, "has invalid options");

 
                if (!include->enabled)
                {
 
                if (!include->enabled)
                {


@@ -83,14 +81,11 @@ fw3_load_includes(struct fw3_state *state, struct uci_package *p)
 
 
 static void
 
 
 static void

-print_include(struct fw3_include *include, enum fw3_family family)
+print_include(struct fw3_include *include)

 {
        FILE *f;
        char line[1024];
 
 {
        FILE *f;
        char line[1024];
 

-       if (!fw3_is_family(include, family))
-               return;
-

        info(" * Loading include '%s'", include->path);
 
        if (!(f = fopen(include->path, "r")))
        info(" * Loading include '%s'", include->path);
 
        if (!(f = fopen(include->path, "r")))


@@ -110,14 +105,36 @@ fw3_print_includes(struct fw3_state *state, enum fw3_family family, bool reload)
 {
        struct fw3_include *include;
 
 {
        struct fw3_include *include;
 

+       bool exec = false;
+       const char *restore = "iptables-restore";
+
+       if (family == FW3_FAMILY_V6)
+               restore = "ip6tables-restore";
+

        list_for_each_entry(include, &state->includes, list)
        {
                if (reload && !include->reload)
                        continue;
 
        list_for_each_entry(include, &state->includes, list)
        {
                if (reload && !include->reload)
                        continue;
 

-               if (include->type == FW3_INC_TYPE_RESTORE)
-                       print_include(include, family);
+               if (include->type != FW3_INC_TYPE_RESTORE)
+                       continue;
+
+               if (!fw3_is_family(include, family))
+                       continue;
+
+               if (!exec)
+               {
+                       exec = fw3_command_pipe(false, restore, "--noflush");
+
+                       if (!exec)
+                               return;
+               }
+
+               print_include(include);

        }
        }

+
+       if (exec)
+               fw3_command_close();

 }
 
 
 }