print a notification if forwards are skipped due to zone family mismatch

[project/firewall3.git] / utils.c

diff --git a/utils.c b/utils.c
index a5d0082..9b62789 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -332,20 +332,88 @@ fw3_unlock(void)
 }
 
 
-bool fw3_has_state(void)
+struct list_head *
+fw3_read_statefile(void)
 {
-       struct stat s;
-       return !stat(FW3_STATEFILE, &s);
+       FILE *sf;
+
+       int n;
+       char line[128];
+       const char *p;
+
+       struct list_head *state;
+       struct fw3_statefile_entry *entry;
+
+       sf = fopen(FW3_STATEFILE, "r");
+
+       if (!sf)
+               return NULL;
+
+       state = malloc(sizeof(*state));
+
+       if (!state)
+               return NULL;
+
+       INIT_LIST_HEAD(state);
+
+       while (fgets(line, sizeof(line), sf))
+       {
+               entry = malloc(sizeof(*entry));
+
+               if (!entry)
+                       continue;
+
+               memset(entry, 0, sizeof(*entry));
+
+               p = strtok(line, " \t\n");
+
+               if (!p)
+                       continue;
+
+               entry->type = strtoul(p, NULL, 10);
+
+               p = strtok(NULL, " \t\n");
+
+               if (!p)
+                       continue;
+
+               entry->name = strdup(p);
+
+               for (n = 0, p = strtok(NULL, " \t\n");
+                    n < ARRAY_SIZE(entry->flags) && p != NULL;
+                    n++, p = strtok(NULL, " \t\n"))
+               {
+                       entry->flags[n] = strtoul(p, NULL, 10);
+               }
+
+               list_add_tail(&entry->list, state);
+       }
+
+       fclose(sf);
+
+       return state;
 }
 
-void fw3_write_state(void *state)
+void
+fw3_write_statefile(void *state)
 {
        FILE *sf;
-       int n, val;
        struct fw3_state *s = state;
+       struct fw3_defaults *d = &s->defaults;
        struct fw3_zone *z;
        struct fw3_ipset *i;
 
+       int mask = (1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6);
+
+       if (!(d->flags & mask))
+       {
+               if (unlink(FW3_STATEFILE))
+                       warn("Unable to remove state %s: %s",
+                            FW3_STATEFILE, strerror(errno));
+
+               return;
+       }
+
        sf = fopen(FW3_STATEFILE, "w");
 
        if (!sf)
@@ -354,19 +422,12 @@ void fw3_write_state(void *state)
                return;
        }
 
+       fprintf(sf, "%u - %u\n", FW3_TYPE_DEFAULTS, d->flags);
+
        list_for_each_entry(z, &s->zones, list)
        {
-               for (n = FW3_TARGET_ACCEPT, val = 0; n <= FW3_TARGET_SNAT; n++)
-                       if (z->has_src_target[n])
-                               val |= (1 << n);
-
-               fprintf(sf, "zone %s %u", z->name, val);
-
-               for (n = FW3_TARGET_ACCEPT, val = 0; n <= FW3_TARGET_SNAT; n++)
-                       if (z->has_dest_target[n])
-                               val |= (1 << n);
-
-               fprintf(sf, " %u\n", val);
+               fprintf(sf, "%u %s %u %u\n", FW3_TYPE_ZONE,
+                       z->name, z->src_flags, z->dst_flags);
        }
 
        list_for_each_entry(i, &s->ipsets, list)
@@ -374,14 +435,26 @@ void fw3_write_state(void *state)
                if (i->external && *i->external)
                        continue;
 
-               fprintf(sf, "ipset %s\n", i->name);
+               fprintf(sf, "%u %s %u\n", FW3_TYPE_IPSET, i->name, i->flags);
        }
 
        fclose(sf);
 }
 
-void fw3_remove_state(void)
+void
+fw3_free_statefile(struct list_head *statefile)
 {
-       if (unlink(FW3_STATEFILE))
-               warn("Unable to remove state %s: %s", FW3_STATEFILE, strerror(errno));
+       struct fw3_statefile_entry *e, *tmp;
+
+       if (!statefile)
+               return;
+
+       list_for_each_entry_safe(e, tmp, statefile, list)
+       {
+               list_del(&e->list);
+               free(e->name);
+               free(e);
+       }
+
+       free(statefile);
 }