/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013-2014 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
#include "zones.h"
#include "rules.h"
#include "redirects.h"
+#include "snats.h"
#include "forwards.h"
#include "ipsets.h"
#include "includes.h"
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)
else
{
if (!fw3_ubus_connect())
- error("Failed to connect to ubus");
+ warn("Failed to connect to ubus");
if (uci_load(state->uci, "firewall", &p))
{
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);
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);
static int
stop(bool complete)
{
- FILE *ct;
-
int rv = 1;
enum fw3_family family;
enum fw3_table table;
}
fw3_ipt_commit(handle);
+ fw3_ipt_close(handle);
}
family_set(run_state, family, false);
if (run_state)
fw3_destroy_ipsets(run_state);
- if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
- {
- info(" * Flushing conntrack table ...");
-
- fwrite("f\n", 2, 1, ct);
- fclose(ct);
- }
+ if (complete)
+ fw3_flush_conntrack(NULL);
if (!rv && run_state)
fw3_write_statefile(run_state);
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)
if (!rv)
{
+ fw3_flush_conntrack(run_state);
fw3_set_defaults(cfg_state);
if (!print_family)
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);
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);
if (!rv)
{
+ fw3_flush_conntrack(run_state);
+
fw3_set_defaults(cfg_state);
fw3_run_includes(cfg_state, true);
fw3_hotplug_zones(cfg_state, true);
}
static int
+gc(void)
+{
+ enum fw3_family family;
+ enum fw3_table table;
+ struct fw3_ipt_handle *handle;
+
+ for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
+ {
+ if (family == FW3_FAMILY_V6 && cfg_state->defaults.disable_ipv6)
+ continue;
+
+ for (table = FW3_TABLE_FILTER; table <= FW3_TABLE_RAW; table++)
+ {
+ if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table]))
+ continue;
+
+ if (!(handle = fw3_ipt_open(family, table)))
+ continue;
+
+ fw3_ipt_gc(handle);
+ fw3_ipt_commit(handle);
+ fw3_ipt_close(handle);
+ }
+ }
+
+ return 0;
+}
+
+static int
lookup_network(const char *net)
{
struct fw3_zone *z;
}
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;
}
break;
case 'q':
- freopen("/dev/null", "w", stderr);
+ if (freopen("/dev/null", "w", stderr)) {}
break;
case 'h':
}
build_state(false);
- build_state(true);
defs = &cfg_state->defaults;
if (optind >= argc)
#endif
}
- freopen("/dev/null", "w", stderr);
+ if (freopen("/dev/null", "w", stderr)) {};
cfg_state->disable_ipsets = true;
print_family = family;
fw3_pr_debug = true;
- rv = start();
+ if (fw3_lock())
+ {
+ build_state(true);
+ rv = start();
+ fw3_unlock();
+ }
}
else if (!strcmp(argv[optind], "start"))
{
if (fw3_lock())
{
+ build_state(true);
rv = start();
fw3_unlock();
}
{
if (fw3_lock())
{
+ build_state(true);
rv = stop(false);
fw3_unlock();
}
{
if (fw3_lock())
{
+ build_state(true);
rv = stop(true);
fw3_unlock();
}
{
if (fw3_lock())
{
+ build_state(true);
stop(true);
rv = start();
fw3_unlock();
{
if (fw3_lock())
{
+ build_state(true);
rv = reload();
fw3_unlock();
}
}
+ else if (!strcmp(argv[optind], "gc"))
+ {
+ if (fw3_lock())
+ {
+ rv = gc();
+ fw3_unlock();
+ }
+ }
else if (!strcmp(argv[optind], "network") && (optind + 1) < argc)
{
rv = lookup_network(argv[optind + 1]);
{
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();
projects / project / firewall3.git / blobdiff