diff options
| author | Dirk Brenken <dev@brenken.org> | 2016-07-20 22:09:23 +0200 |
|---|---|---|
| committer | Dirk Brenken <dev@brenken.org> | 2016-07-20 22:10:35 +0200 |
| commit | 6883d35f5e184168d6377f29094892c3f6f82583 (patch) | |
| tree | 063f84a48b46cb6a52460fb8db3f63137c5e4a9e /net | |
| parent | c493f6af44b9d53d13e3297431175e14e7f14c25 (diff) | |
adblock: update 1.4.1
* fix two possible overflows in adblock statistics
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/adblock/Makefile | 2 | ||||
| -rw-r--r-- | net/adblock/files/adblock-helper.sh | 14 | ||||
| -rwxr-xr-x | net/adblock/files/adblock-update.sh | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 6f5daca77..99da155f5 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock -PKG_VERSION:=1.4.0 +PKG_VERSION:=1.4.1 PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> diff --git a/net/adblock/files/adblock-helper.sh b/net/adblock/files/adblock-helper.sh index 0e1178437..4940b255c 100644 --- a/net/adblock/files/adblock-helper.sh +++ b/net/adblock/files/adblock-helper.sh @@ -710,20 +710,26 @@ f_statistics() if [ -n "${adb_wanif4}" ] then - ipv4_blk="$(iptables -t nat -vnL adb-nat | awk '$3 ~ /^DNAT$/ {sum += $1} END {printf sum}')" - ipv4_all="$(iptables -t nat -vnL PREROUTING | awk '$3 ~ /^prerouting_rule$/ {sum += $1} END {printf sum}')" + ipv4_blk="$(iptables -t nat -vxnL adb-nat | awk '$3 ~ /^DNAT$/ {sum += $1} END {printf sum}')" + ipv4_all="$(iptables -t nat -vxnL PREROUTING | awk '$3 ~ /^prerouting_rule$/ {sum += $1} END {printf sum}')" if [ $((ipv4_all)) -gt 0 ] && [ $((ipv4_blk)) -gt 0 ] && [ $((ipv4_all)) -gt $((ipv4_blk)) ] then ipv4_pct="$(printf "${ipv4_blk}" | awk -v all="${ipv4_all}" '{printf( "%5.2f\n",$1/all*100)}')" + elif [ $((ipv4_all)) -lt $((ipv4_blk)) ] + then + iptables -t nat -Z adb-nat fi fi if [ -n "${adb_wanif6}" ] then - ipv6_blk="$(ip6tables -t nat -vnL adb-nat | awk '$3 ~ /^DNAT$/ {sum += $1} END {printf sum}')" - ipv6_all="$(ip6tables -t nat -vnL PREROUTING | awk '$3 ~ /^(adb-nat|DNAT)$/ {sum += $1} END {printf sum}')" + ipv6_blk="$(ip6tables -t nat -vxnL adb-nat | awk '$3 ~ /^DNAT$/ {sum += $1} END {printf sum}')" + ipv6_all="$(ip6tables -t nat -vxnL PREROUTING | awk '$3 ~ /^(adb-nat|DNAT)$/ {sum += $1} END {printf sum}')" if [ $((ipv6_all)) -gt 0 ] && [ $((ipv6_blk)) -gt 0 ] && [ $((ipv6_all)) -gt $((ipv6_blk)) ] then ipv6_pct="$(printf "${ipv6_blk}" | awk -v all="${ipv6_all}" '{printf( "%5.2f\n",$1/all*100)}')" + elif [ $((ipv6_all)) -lt $((ipv6_blk)) ] + then + ip6tables -t nat -Z adb-nat fi fi "${adb_uci}" -q set "adblock.global.adb_percentage=${ipv4_pct}%/${ipv6_pct}%" diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh index 017da468e..ea7f67810 100755 --- a/net/adblock/files/adblock-update.sh +++ b/net/adblock/files/adblock-update.sh @@ -10,7 +10,7 @@ # adb_pid="${$}" adb_pidfile="/var/run/adblock.pid" -adb_scriptver="1.4.0" +adb_scriptver="1.4.1" adb_mincfgver="2.2" adb_scriptdir="${0%/*}" if [ -r "${adb_pidfile}" ] |