static pid_t pipe_pid = -1;
static FILE *pipe_fd = NULL;
+bool fw3_pr_debug = false;
+
+
static void
warn_elem_section_name(struct uci_section *s, bool find_name)
{
void
fw3_pr(const char *fmt, ...)
{
- va_list args;
- va_start(args, fmt);
- vfprintf(pipe_fd, fmt, args);
- va_end(args);
+ va_list args;
+
+ if (fw3_pr_debug && pipe_fd != stdout)
+ {
+ va_start(args, fmt);
+ vfprintf(stderr, fmt, args);
+ va_end(args);
+ }
+
+ va_start(args, fmt);
+ vfprintf(pipe_fd, fmt, args);
+ va_end(args);
}
void
{
FILE *sf;
- int n, type;
+ int type;
char line[128];
const char *p, *name;
- uint16_t flags[2];
+ uint32_t flags;
struct fw3_state *s = state;
struct fw3_zone *zone;
if (!p)
continue;
- type = strtoul(p, NULL, 10);
+ type = strtoul(p, NULL, 16);
name = strtok(NULL, " \t\n");
if (!name)
continue;
- for (n = 0, p = strtok(NULL, " \t\n");
- n < ARRAY_SIZE(flags) && p != NULL;
- n++, p = strtok(NULL, " \t\n"))
- {
- flags[n] = strtoul(p, NULL, 10);
- }
+ p = strtok(NULL, " \t\n");
+
+ if (!p)
+ continue;
+
+ flags = strtoul(p, NULL, 16);
switch (type)
{
case FW3_TYPE_DEFAULTS:
- s->running_defaults.flags = flags[0];
+ s->defaults.running_flags = flags;
break;
case FW3_TYPE_ZONE:
list_add_tail(&zone->list, &s->zones);
}
- zone->src_flags = flags[0];
- zone->dst_flags = flags[1];
+ zone->running_flags = flags;
list_add_tail(&zone->running_list, &s->running_zones);
break;
list_add_tail(&ipset->list, &s->ipsets);
}
- ipset->flags = flags[0];
+ ipset->running_flags = flags;
list_add_tail(&ipset->running_list, &s->running_ipsets);
break;
}
return;
}
- fprintf(sf, "%u - %u\n", FW3_TYPE_DEFAULTS, d->flags);
+ fprintf(sf, "%x - %x\n", FW3_TYPE_DEFAULTS, d->flags);
list_for_each_entry(z, &s->running_zones, running_list)
{
- fprintf(sf, "%u %s %u %u\n", FW3_TYPE_ZONE,
- z->name, z->src_flags, z->dst_flags);
+ fprintf(sf, "%x %s %x\n", FW3_TYPE_ZONE, z->name, z->flags);
}
list_for_each_entry(i, &s->running_ipsets, running_list)
{
- fprintf(sf, "%u %s %u\n", FW3_TYPE_IPSET, i->name, i->flags);
+ fprintf(sf, "%x %s %x\n", FW3_TYPE_IPSET, i->name, i->flags);
}
fclose(sf);
else if (!dest && o->running_list.next)
list_del(&o->running_list);
}
+
+void
+fw3_free_object(void *obj, const void *opts)
+{
+ const struct fw3_option *ol;
+ struct list_head *list, *cur, *tmp;
+
+ for (ol = opts; ol->name; ol++)
+ {
+ if (!ol->elem_size)
+ continue;
+
+ list = (struct list_head *)((char *)obj + ol->offset);
+ list_for_each_safe(cur, tmp, list)
+ {
+ list_del(cur);
+ free(cur);
+ }
+ }
+
+ free(obj);
+}