X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=main.c;h=5888ab50285a6e416d3434ea28f9e16901d7106a;hp=c0180b2e8ba9b79b69caacd7515071af617c5734;hb=0a7d36d8cf56f160b531f3db9f045e3f9315dd15;hpb=31456301f514e3e04f61930bb00f6b2d99b4d067 diff --git a/main.c b/main.c index c0180b2..5888ab5 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ /* * firewall3 - 3rd OpenWrt UCI firewall implementation * - * Copyright (C) 2013-2014 Jo-Philipp Wich + * Copyright (C) 2013-2014 Jo-Philipp Wich * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -45,12 +45,10 @@ build_state(bool runtime) 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) @@ -81,7 +79,7 @@ build_state(bool runtime) else { if (!fw3_ubus_connect()) - error("Failed to connect to ubus"); + warn("Failed to connect to ubus"); if (uci_load(state->uci, "firewall", &p)) { @@ -98,12 +96,16 @@ build_state(bool runtime) 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_redirects(state, p); - fw3_load_snats(state, p); + fw3_load_rules(state, p, b.head); + fw3_load_redirects(state, p, b.head); + fw3_load_snats(state, p, b.head); fw3_load_forwards(state, p); fw3_load_includes(state, p); @@ -165,8 +167,6 @@ family_set(struct fw3_state *state, enum fw3_family family, bool set) static int stop(bool complete) { - FILE *ct; - int rv = 1; enum fw3_family family; enum fw3_table table; @@ -222,13 +222,8 @@ stop(bool complete) 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); @@ -302,6 +297,7 @@ start(void) if (!rv) { + fw3_flush_conntrack(run_state); fw3_set_defaults(cfg_state); if (!print_family) @@ -374,6 +370,7 @@ start: 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); @@ -392,6 +389,8 @@ start: if (!rv) { + fw3_flush_conntrack(run_state); + fw3_set_defaults(cfg_state); fw3_run_includes(cfg_state, true); fw3_hotplug_zones(cfg_state, true); @@ -402,6 +401,35 @@ start: } 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; @@ -444,12 +472,42 @@ lookup_device(const char *dev) } 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; } @@ -478,7 +536,7 @@ int main(int argc, char **argv) break; case 'q': - freopen("/dev/null", "w", stderr); + if (freopen("/dev/null", "w", stderr)) {} break; case 'h': @@ -488,7 +546,6 @@ int main(int argc, char **argv) } build_state(false); - build_state(true); defs = &cfg_state->defaults; if (optind >= argc) @@ -513,18 +570,24 @@ int main(int argc, char **argv) #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(); } @@ -533,6 +596,7 @@ int main(int argc, char **argv) { if (fw3_lock()) { + build_state(true); rv = stop(false); fw3_unlock(); } @@ -541,6 +605,7 @@ int main(int argc, char **argv) { if (fw3_lock()) { + build_state(true); rv = stop(true); fw3_unlock(); } @@ -549,6 +614,7 @@ int main(int argc, char **argv) { if (fw3_lock()) { + build_state(true); stop(true); rv = start(); fw3_unlock(); @@ -558,10 +624,19 @@ int main(int argc, char **argv) { 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]); @@ -570,6 +645,10 @@ int main(int argc, char **argv) { 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();