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
char line[128];
const char *p, *name;
- uint16_t flags[2];
+ uint32_t flags[2];
struct fw3_state *s = state;
struct fw3_zone *zone;
switch (type)
{
case FW3_TYPE_DEFAULTS:
- s->running_defaults.flags = flags[0];
+ s->defaults.running_flags = flags[0];
break;
case FW3_TYPE_ZONE:
list_add_tail(&zone->list, &s->zones);
}
- zone->src_flags = flags[0];
- zone->dst_flags = flags[1];
+ zone->running_src_flags = flags[0];
+ zone->running_dst_flags = flags[1];
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[0];
list_add_tail(&ipset->running_list, &s->running_ipsets);
break;
}