#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-adb_ver="3.4.0"
+adb_ver="3.4.1"
adb_sysver="unknown"
adb_enabled=0
adb_debug=0
{
local dns_up sys_call sys_desc sys_model sys_ver cnt=0
+ # create temp files and directories
+ #
+ adb_tmpload="$(mktemp -tu)"
+ adb_tmpfile="$(mktemp -tu)"
+ adb_tmpdir="$(mktemp -p /tmp -d)"
+
# get system information
#
sys_call="$(ubus -S call system board 2>/dev/null)"
. "/lib/functions.sh"
. "/usr/share/libubox/jshn.sh"
else
- f_log "error" "system libraries not found"
+ f_log "err" "system libraries not found"
fi
# parse 'global' and 'extra' section by callback
#
case "${adb_dns}" in
dnsmasq)
- adb_dnsinstance=0
+ adb_dnsinstance="${adb_dnsinstance:-"0"}"
adb_dnsuser="${adb_dnsuser:-"dnsmasq"}"
adb_dnsdir="${adb_dnsdir:-"/tmp"}"
adb_dnsheader=""
fi
;;
unbound)
- adb_dnsinstance=0
+ adb_dnsinstance="${adb_dnsinstance:-"0"}"
adb_dnsuser="${adb_dnsuser:-"unbound"}"
adb_dnsdir="${adb_dnsdir:-"/var/lib/unbound"}"
adb_dnsheader=""
fi
;;
named)
- adb_dnsinstance=0
+ adb_dnsinstance="${adb_dnsinstance:-"0"}"
adb_dnsuser="${adb_dnsuser:-"bind"}"
adb_dnsdir="${adb_dnsdir:-"/var/lib/bind"}"
adb_dnsheader="\$TTL 2h"$'\n'"@ IN SOA localhost. root.localhost. (1 6h 1h 1w 2h)"$'\n'" IN NS localhost."
fi
;;
kresd)
- adb_dnsinstance=0
+ adb_dnsinstance="${adb_dnsinstance:-"0"}"
adb_dnsuser="${adb_dnsuser:-"root"}"
adb_dnsdir="${adb_dnsdir:-"/etc/kresd"}"
adb_dnsheader="\$TTL 2h"$'\n'"@ IN SOA localhost. root.localhost. (1 6h 1h 1w 2h)"$'\n'" IN NS localhost."
fi
;;
dnscrypt-proxy)
- adb_dnsinstance=0
+ adb_dnsinstance="${adb_dnsinstance:-"0"}"
adb_dnsuser="${adb_dnsuser:-"nobody"}"
adb_dnsdir="${adb_dnsdir:-"/tmp"}"
adb_dnsheader=""
then
f_extconf
f_rmdns
- f_jsnupdate
- f_log "info " "adblock is currently disabled, please set adb_enabled to '1' to use this service"
+ f_jsnup
+ f_log "info" "adblock is currently disabled, please set adb_enabled to '1' to use this service"
+ f_rmtemp
exit 0
fi
+ if [ "${adb_dns}" = "dnsmasq" ] && [ ${adb_dnsinstance} -ne 0 ]
+ then
+ adb_dnsfile="${adb_dnsprefix}.overall.${adb_dnsinstance}"
+ fi
+
if [ -d "${adb_dnsdir}" ] && [ ! -f "${adb_dnsdir}/${adb_dnsfile}" ]
then
printf '%s\n' "${adb_dnsheader}" > "${adb_dnsdir}/${adb_dnsfile}"
if [ -z "${adb_dns}" ] || [ -z "${adb_dnsformat}" ] || [ ! -x "$(command -v ${adb_dns})" ] || [ ! -d "${adb_dnsdir}" ]
then
- f_log "error" "'${adb_dns}' not running, DNS backend not found"
+ f_log "err" "'${adb_dns}' not running, DNS backend not found"
fi
}
{
local ssl_lib
- f_log "info " "start adblock processing (${adb_action})"
+ f_log "info" "start adblock processing (${adb_action})"
# check external uci config files
#
# check fetch utility
#
- ssl_lib="-"
if [ -x "${adb_fetchutil}" ]
then
if [ "$(readlink -fn "${adb_fetchutil}")" = "/usr/bin/wget-nossl" ]
fi
if [ ! -x "${adb_fetchutil}" ] || [ -z "${adb_fetchutil}" ] || [ -z "${adb_fetchparm}" ]
then
- f_log "error" "no download utility found, please install 'uclient-fetch' with 'libustream-mbedtls' or the full 'wget' package"
+ f_log "err" "no download utility found, please install 'uclient-fetch' with 'libustream-mbedtls' or the full 'wget' package"
fi
- adb_fetchinfo="${adb_fetchutil##*/} (${ssl_lib})"
-
- # initialize temp files and directories
- #
- adb_tmpload="$(mktemp -tu)"
- adb_tmpfile="$(mktemp -tu)"
- adb_tmpdir="$(mktemp -p /tmp -d)"
- > "${adb_tmpdir}/tmp.whitelist"
+ adb_fetchinfo="${adb_fetchutil##*/} (${ssl_lib:-"-"})"
}
-# remove temporary files and directories
+# remove temp files and directories
#
f_rmtemp()
{
{
if [ -n "${adb_dns}" ]
then
- f_hashcompare
+ f_hash
printf '%s\n' "${adb_dnsheader}" > "${adb_dnsdir}/${adb_dnsfile}"
> "${adb_dnsdir}/.${adb_dnsfile}"
> "${adb_rtfile}"
rm -f "${adb_backupdir}/${adb_dnsprefix}"*.gz
- f_hashcompare
+ f_hash
if [ ${?} -eq 1 ]
then
- f_dnsrestart
+ f_dnsup
fi
fi
+ f_log "debug" "f_rmdns::: dns: ${adb_dns}, dns_dir: ${adb_dnsdir}, dns_prefix: ${adb_dnsprefix}, dns_file: ${adb_dnsfile}, rt_file: ${adb_rtfile}, backup_dir: ${adb_backupdir}"
}
# commit uci changes
#
-f_ucichange()
+f_uci()
{
- local config="${1}"
+ local change config="${1}"
- if [ -n "$(uci -q changes "${config}")" ]
+ if [ -n "${config}" ]
then
- uci -q commit "${config}"
- case "${config}" in
- dhcp)
- /etc/init.d/"${adb_dns}" reload >/dev/null 2>&1
- ;;
- firewall)
- /etc/init.d/firewall reload >/dev/null 2>&1
- ;;
- esac
+ change="$(uci -q changes "${config}" | awk '{ORS=" "; print $0}')"
+ if [ -n "${change}" ]
+ then
+ uci -q commit "${config}"
+ case "${config}" in
+ firewall)
+ /etc/init.d/firewall reload >/dev/null 2>&1
+ ;;
+ *)
+ /etc/init.d/"${adb_dns}" reload >/dev/null 2>&1
+ ;;
+ esac
+ fi
fi
+ f_log "debug" "f_uci ::: config: ${config}, change: ${change}"
}
# list/overall count
local mode="${1}"
adb_cnt=0
- if [ -s "${adb_dnsdir}/${adb_dnsfile}" ] && ([ -z "${mode}" ] || [ "${mode}" = "format" ])
+ if [ -s "${adb_dnsdir}/${adb_dnsfile}" ] && ([ -z "${mode}" ] || [ "${mode}" = "final" ])
then
if [ "${adb_dns}" = "named" ] || [ "${adb_dns}" = "kresd" ]
then
- adb_cnt="$(( ( $(wc -l 2>/dev/null < "${adb_dnsdir}/${adb_dnsfile}") - $(printf "%s" "${adb_dnsheader}" | grep -c "^") ) / 2 ))"
+ adb_cnt="$(( ($(wc -l 2>/dev/null < "${adb_dnsdir}/${adb_dnsfile}") - $(printf "%s" "${adb_dnsheader}" | grep -c "^")) / 2 ))"
else
adb_cnt="$(wc -l 2>/dev/null < "${adb_dnsdir}/${adb_dnsfile}")"
fi
then
uci -q del_list resolver.kresd.rpz_file="${adb_dnsdir}/${adb_dnsfile}"
fi
-# wait for upstream change
-# if [ ${adb_enabled} -eq 1 ] && [ ${adb_dnsflush} -eq 0 ] && [ "$(uci -q get resolver.common.msg_keep_cache)" != "1" ]
-# then
-# uci -q set resolver.common.msg_keep_cache="1"
-# elif [ ${adb_enabled} -eq 0 ] || ([ ${adb_dnsflush} -eq 1 ] && [ "$(uci -q get resolver.common.msg_keep_cache)" = "1" ])
-# then
-# uci -q delete resolver.common.msg_keep_cache
-# fi
+ if [ ${adb_enabled} -eq 1 ] && [ ${adb_dnsflush} -eq 0 ] && [ "$(uci -q get resolver.kresd.keep_cache)" != "1" ]
+ then
+ uci -q set resolver.kresd.keep_cache="1"
+ elif [ ${adb_enabled} -eq 0 ] || ([ ${adb_dnsflush} -eq 1 ] && [ "$(uci -q get resolver.kresd.keep_cache)" = "1" ])
+ then
+ uci -q delete resolver.kresd.keep_cache
+ fi
;;
esac
- f_ucichange "${uci_config}"
+ f_uci "${uci_config}"
uci_config="firewall"
if [ ${adb_enabled} -eq 1 ] && [ ${adb_forcedns} -eq 1 ] && \
then
uci -q delete firewall.adblock_dns
fi
- f_ucichange "${uci_config}"
+ f_uci "${uci_config}"
}
# restart of the dns backend
#
-f_dnsrestart()
+f_dnsup()
{
- local dns_up cache_util cache_rc out_rc=1 cnt=0
+ local dns_up cache_util cache_rc cnt=0
- if [ ${adb_dnsflush} -eq 0 ] && [ ${adb_enabled} -eq 1 ] && \
- [ "${adb_rc}" -eq 0 ] && [ "${adb_action}" != "stop" ]
+ if [ ${adb_dnsflush} -eq 0 ] && [ ${adb_enabled} -eq 1 ] && [ "${adb_rc}" -eq 0 ]
then
case "${adb_dns}" in
dnsmasq)
- cache_util="n/a"
killall -q -HUP "${adb_dns}"
cache_rc=${?}
;;
"/etc/init.d/${adb_dns}" restart >/dev/null 2>&1
;;
kresd)
- cache_util="n/a"
+ cache_util="keep_cache"
"/etc/init.d/${adb_dns}" restart >/dev/null 2>&1
cache_rc=${?}
;;
"/etc/init.d/${adb_dns}" restart >/dev/null 2>&1
fi
+ adb_rc=1
while [ ${cnt} -le 10 ]
do
dns_up="$(ubus -S call service list "{\"name\":\"${adb_dns}\"}" | jsonfilter -l1 -e "@[\"${adb_dns}\"].instances.*.running")"
fi
;;
esac
- out_rc=0
+ adb_rc=0
break
fi
cnt=$((cnt+1))
sleep 1
done
- f_log "debug" "cache_util: ${cache_util}, cache_rc: ${cache_rc}, cache_flush: ${adb_dnsflush}, count: ${cnt}, out_rc: ${out_rc}"
- return ${out_rc}
+ f_log "debug" "f_dnsup::: cache_util: ${cache_util:-"-"}, cache_rc: ${cache_rc}, cache_flush: ${adb_dnsflush}, cache_cnt: ${cnt}, out_rc: ${adb_rc}"
}
# backup/restore/remove blocklists
case "${mode}" in
backup)
- if [ ${adb_backup} -eq 1 ] && [ -d "${adb_backupdir}" ]
+ if [ -d "${adb_backupdir}" ]
then
gzip -cf "${adb_tmpfile}" > "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" 2>/dev/null
adb_rc=${?}
fi
;;
restore)
- if [ ${adb_backup} -eq 1 ] && [ -d "${adb_backupdir}" ] &&
- [ -f "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" ]
+ if [ -d "${adb_backupdir}" ] && [ -f "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" ]
then
gunzip -cf "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" > "${adb_tmpfile}" 2>/dev/null
adb_rc=${?}
adb_rc=${?}
fi
;;
- format)
- src_name="overall"
+ final)
if [ -s "${adb_tmpdir}/tmp.whitelist" ]
then
grep -vf "${adb_tmpdir}/tmp.whitelist" "${adb_tmpdir}/${adb_dnsfile}" | eval "${adb_dnsformat}" > "${adb_dnsdir}/${adb_dnsfile}"
;;
esac
f_count "${mode}"
- f_log "debug" "name: ${src_name}, mode: ${mode}, count: ${adb_cnt}, in_rc: ${in_rc}, out_rc: ${adb_rc}"
+ f_log "debug" "f_list ::: mode: ${mode}, cnt: ${adb_cnt}, in_rc: ${in_rc}, out_rc: ${adb_rc}"
}
# top level domain compression
#
-f_tldcompression()
+f_tld()
{
- local source="${1}" temp="${adb_tmpload}"
-
- awk -F "." '{for(f=NF;f > 1;f--) printf "%s.", $f;print $1}' "${source}" 2>/dev/null | sort -u > "${temp}"
- awk '{if(NR==1){tld=$NF};while(getline){if($NF !~ tld"\\."){print tld;tld=$NF}}print tld}' "${temp}" 2>/dev/null > "${source}"
- awk -F "." '{for(f=NF;f > 1;f--) printf "%s.", $f;print $1}' "${source}" 2>/dev/null > "${temp}"
- sort -u "${temp}" > "${source}"
+ local cnt cnt_srt cnt_tld source="${1}" temp="${adb_tmpload}"
+
+ cnt="$(wc -l 2>/dev/null < "${source}")"
+ awk -F "." '{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' "${source}" 2>/dev/null | sort -u > "${temp}"
+ cnt_srt="$(wc -l 2>/dev/null < "${temp}")"
+ awk '{if(NR==1){tld=$NF};while(getline){if($NF!~tld"\\."){print tld;tld=$NF}}print tld}' "${temp}" 2>/dev/null |\
+ awk -F "." '{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' 2>/dev/null | sort > "${source}"
+ cnt_tld="$(wc -l 2>/dev/null < "${source}")"
+ f_log "debug" "f_tld ::: source: ${source}, cnt: ${cnt}, cnt_srt: ${cnt_srt}, cnt_tld: ${cnt_tld}"
}
# blocklist hash compare
#
-f_hashcompare()
+f_hash()
{
- local hash out_rc=1
+ local hash hash_rc=1
if [ -x "${adb_hashutil}" ] && [ -f "${adb_dnsdir}/${adb_dnsfile}" ]
then
then
if [ "${adb_hashold}" = "${adb_hashnew}" ]
then
- out_rc=0
+ hash_rc=0
fi
adb_hashold=""
adb_hashnew=""
fi
fi
- f_log "debug" "hash_util: ${adb_hashutil}, hash: ${hash}, out_rc: ${out_rc}"
- return ${out_rc}
+ f_log "debug" "f_hash ::: hash_util: ${adb_hashutil}, hash: ${hash}, out_rc: ${hash_rc}"
+ return ${hash_rc}
}
# suspend/resume adblock processing
if [ ! -s "${adb_dnsdir}/.${adb_dnsfile}" ] && [ "${mode}" = "suspend" ]
then
- f_hashcompare
+ f_hash
cat "${adb_dnsdir}/${adb_dnsfile}" > "${adb_dnsdir}/.${adb_dnsfile}"
printf '%s\n' "${adb_dnsheader}" > "${adb_dnsdir}/${adb_dnsfile}"
- f_hashcompare
+ f_hash
elif [ -s "${adb_dnsdir}/.${adb_dnsfile}" ] && [ "${mode}" = "resume" ]
then
- f_hashcompare
+ f_hash
cat "${adb_dnsdir}/.${adb_dnsfile}" > "${adb_dnsdir}/${adb_dnsfile}"
> "${adb_dnsdir}/.${adb_dnsfile}"
- f_hashcompare
+ f_hash
fi
if [ ${?} -eq 1 ]
then
- f_dnsrestart
- f_jsnupdate
- f_log "info " "${mode} adblock processing"
+ f_dnsup
+ f_jsnup
+ f_log "info" "${mode} adblock processing"
fi
}
# update runtime information
#
-f_jsnupdate()
+f_jsnup()
{
- local status mode="normal mode" rundate="$(/bin/date "+%d.%m.%Y %H:%M:%S")"
+ local status bg_pid mode="normal mode" rundate="$(/bin/date "+%d.%m.%Y %H:%M:%S")"
if [ ${adb_rc} -gt 0 ]
then
json_add_string "adblock_status" "${status}"
json_add_string "adblock_version" "${adb_ver}"
json_add_string "overall_domains" "${adb_cnt} (${mode})"
- json_add_string "fetch_utility" "${adb_fetchinfo}"
+ json_add_string "fetch_utility" "${adb_fetchinfo:-"-"}"
json_add_string "dns_backend" "${adb_dns} (${adb_dnsdir})"
json_add_string "last_rundate" "${rundate}"
json_add_string "system_release" "${adb_sysver}"
json_close_object
json_dump > "${adb_rtfile}"
- if [ ${adb_notify} -eq 1 ] && [ -x /etc/adblock/adblock.notify ] && ([ "${status}" = "error" ] || \
+ if [ ${adb_notify} -eq 1 ] && [ -x /etc/adblock/adblock.notify ] && ([ "${status}" = "error" ] ||\
([ "${status}" = "enabled" ] && [ ${adb_whitelist_mode} -eq 0 ] && [ ${adb_cnt} -le ${adb_notifycnt} ]))
then
(/etc/adblock/adblock.notify >/dev/null 2>&1) &
+ bg_pid=${!}
fi
+ f_log "debug" "f_jsnup::: status: ${status}, mode: ${mode}, cnt: ${adb_cnt}, notify: ${adb_notify}, notify_cnt: ${adb_notifycnt}, notify_pid: ${bg_pid:-"-"}"
}
-# output runtime information
-#
-f_status()
-{
- local key keylist value
-
- if [ -s "${adb_rtfile}" ]
- then
- printf "%s\n" "::: adblock runtime information"
- json_load "$(cat "${adb_rtfile}" 2>/dev/null)"
- json_select data
- json_get_keys keylist
- for key in ${keylist}
- do
- json_get_var value "${key}"
- printf " + %-15s : %s\n" "${key}" "${value}"
- done
- fi
-}
-
-# write to syslog, exit on error
+# write to syslog
#
f_log()
{
if [ -n "${log_msg}" ] && ([ "${class}" != "debug" ] || [ ${adb_debug} -eq 1 ])
then
- logger -t "adblock-[${adb_ver}] ${class}" "${log_msg}"
- if [ "${class}" = "error" ]
+ logger -p "${class}" -t "adblock-[${adb_ver}]" "${log_msg}"
+ if [ "${class}" = "err" ]
then
- adb_rc=1
f_rmdns
- f_jsnupdate
+ f_jsnup
f_rmtemp
- logger -t "adblock-[${adb_ver}] ${class}" "Please check 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md' (${adb_sysver})"
+ logger -p "${class}" -t "adblock-[${adb_ver}]" "Please also check 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md' (${adb_sysver})"
exit 1
fi
fi
{
local src_name src_rset shalla_archive enabled url mem_total="$(awk '/^MemTotal/ {print int($2/1000)}' "/proc/meminfo")"
- f_log "debug" "dns: ${adb_dns}, fetch_util: ${adb_fetchinfo}, backup: ${adb_backup}, backup_mode: ${adb_backup_mode}, whitelist_mode: ${adb_whitelist_mode}, force_srt/_dns: ${adb_forcesrt}/${adb_forcedns}, mem_total: ${mem_total}"
+ f_log "debug" "f_main ::: dns: ${adb_dns}, fetch_util: ${adb_fetchinfo}, backup: ${adb_backup}, backup_mode: ${adb_backup_mode}, whitelist_mode: ${adb_whitelist_mode}, force_srt: ${adb_forcesrt}, force_dns: ${adb_forcedns}, mem_total: ${mem_total}"
> "${adb_rtfile}"
> "${adb_dnsdir}/.${adb_dnsfile}"
+ > "${adb_tmpdir}/tmp.whitelist"
# prepare whitelist entries
#
#
if [ ${adb_whitelist_mode} -eq 1 ] && [ "${adb_dns}" != "dnscrypt-proxy" ]
then
- f_hashcompare
- f_tldcompression "${adb_tmpdir}/tmp.whitelist"
+ f_hash
+ f_tld "${adb_tmpdir}/tmp.whitelist"
eval "${adb_dnsformat}" "${adb_tmpdir}/tmp.whitelist" > "${adb_dnsdir}/${adb_dnsfile}"
printf '%s\n' "${adb_dnsblock}" >> "${adb_dnsdir}/${adb_dnsfile}"
if [ -n "${adb_dnsheader}" ]
printf '%s\n' "${adb_dnsheader}" | cat - "${adb_dnsdir}/${adb_dnsfile}" > "${adb_tmpdir}/${adb_dnsfile}"
cat "${adb_tmpdir}/${adb_dnsfile}" > "${adb_dnsdir}/${adb_dnsfile}"
fi
- f_hashcompare
+ f_hash
if [ ${?} -eq 1 ]
then
- f_dnsrestart
+ f_dnsup
fi
- if [ ${?} -eq 0 ]
+ f_jsnup
+ if [ ${adb_rc} -eq 0 ]
then
- f_jsnupdate "${adb_cnt}"
- f_log "info " "whitelist with overall ${adb_cnt} domains loaded successfully (${adb_sysver})"
+ f_log "info" "whitelist with overall ${adb_cnt} domains loaded successfully (${adb_sysver})"
+ return 0
else
- f_log "error" "dns backend restart with active whitelist failed"
+ f_log "err" "dns backend restart with active whitelist failed"
fi
- f_rmtemp
- return
fi
# normal & backup mode processing
eval "src_rset=\"\${adb_src_rset_${src_name}}\""
> "${adb_tmpload}"
> "${adb_tmpfile}"
- adb_rc=4
+ adb_rc=1
# basic pre-checks
#
- f_log "debug" "name: ${src_name}, enabled: ${enabled}"
+ f_log "debug" "f_main ::: name: ${src_name}, enabled: ${enabled}"
if [ "${enabled}" != "1" ] || [ -z "${url}" ] || [ -z "${src_rset}" ]
then
f_list remove
# download blocklist
#
- if [ "${src_name}" = "blacklist" ] && [ -s "${url}" ]
+ if [ "${src_name}" = "blacklist" ]
then
- cat "${url}" > "${adb_tmpload}"
- adb_rc=${?}
+ if [ -s "${url}" ]
+ then
+ cat "${url}" > "${adb_tmpload}"
+ adb_rc=${?}
+ fi
elif [ "${src_name}" = "shalla" ]
then
shalla_archive="${adb_tmpdir}/shallalist.tar.gz"
awk "${src_rset}" "${adb_tmpload}" 2>/dev/null > "${adb_tmpfile}"
if [ -s "${adb_tmpfile}" ]
then
- f_tldcompression "${adb_tmpfile}"
- if [ "${src_name}" != "blacklist" ]
+ if [ ${mem_total} -lt 64 ] && [ ${adb_forcesrt} -eq 0 ]
+ then
+ f_tld "${adb_tmpfile}"
+ fi
+ if [ ${adb_backup} -eq 1 ] && [ "${src_name}" != "blacklist" ]
then
f_list backup
fi
- else
+ elif [ ${adb_backup} -eq 1 ]
+ then
f_list restore
fi
- else
+ elif [ ${adb_backup} -eq 1 ] && [ "${src_name}" != "blacklist" ]
+ then
f_list restore
fi
# overall sort and conditional dns restart
#
- f_hashcompare
+ f_hash
if [ -s "${adb_tmpdir}/${adb_dnsfile}" ]
then
if [ ${mem_total} -ge 64 ] || [ ${adb_forcesrt} -eq 1 ]
then
- f_tldcompression "${adb_tmpdir}/${adb_dnsfile}"
+ f_tld "${adb_tmpdir}/${adb_dnsfile}"
fi
- f_list format
+ f_list final
else
> "${adb_dnsdir}/${adb_dnsfile}"
fi
chown "${adb_dnsuser}" "${adb_dnsdir}/${adb_dnsfile}" 2>/dev/null
- f_hashcompare
+ f_hash
if [ ${?} -eq 1 ]
then
- f_dnsrestart
+ f_dnsup
fi
- if [ ${?} -eq 0 ]
+ f_jsnup
+ if [ ${adb_rc} -eq 0 ]
then
- f_jsnupdate "${adb_cnt}"
- f_log "info " "blocklist with overall ${adb_cnt} domains loaded successfully (${adb_sysver})"
+ f_log "info" "blocklist with overall ${adb_cnt} domains loaded successfully (${adb_sysver})"
else
- f_log "error" "dns backend restart with active blocklist failed"
+ f_log "err" "dns backend restart with active blocklist failed"
fi
- f_rmtemp
}
# handle different adblock actions
f_rmdns
;;
restart)
- f_envcheck
f_rmdns
+ f_envcheck
f_main
;;
suspend)
query)
f_query "${2}"
;;
- status)
- f_status
- ;;
- *)
+ start|reload)
f_envcheck
f_main
;;
esac
-exit 0
+
+f_rmtemp
+exit ${adb_rc}