X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/389232eaac53f22bd0d6b1bd0b43419b9214a3c5..ddc9278d09957a5c6cb27ad0ca696f096476e38a:/package/firewall/files/lib/core.sh?ds=inline diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh index 5880cd3ac..c38359781 100644 --- a/package/firewall/files/lib/core.sh +++ b/package/firewall/files/lib/core.sh @@ -39,7 +39,7 @@ fw_start() { echo "Loading includes" config_foreach fw_load_include include - [ -n "$FW_NOTRACK_DISABLED" ] && { + [ -z "$FW_NOTRACK_DISABLED" ] && { echo "Optimizing conntrack" config_foreach fw_load_notrack_zone zone } @@ -49,6 +49,7 @@ fw_start() { fw_callback post core + uci_set_state firewall core zones "$FW_ZONES" uci_set_state firewall core loaded 1 } @@ -57,6 +58,17 @@ fw_stop() { fw_callback pre stop + local z n i + config_get z core zones + for z in $z; do + config_get n core "${z}_networks" + for n in $n; do + config_get i core "${n}_ifname" + [ -n "$i" ] && env -i ACTION=remove ZONE="$z" \ + INTERFACE="$n" DEVICE="$i" /sbin/hotplug-call firewall + done + done + fw_clear ACCEPT fw_callback post stop @@ -95,10 +107,8 @@ fw_die() { fw_log() { local level="$1" - [ -n "$2" ] || { - shift - level=notice - } + [ -n "$2" ] && shift || level=notice + [ "$level" != error ] || echo "Error: $@" >&2 logger -t firewall -p user.$level "$@" }