Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15168 from dibdot/banIP

Browse source 
banip: update 0.7.5-3
This commit is contained in:
Dirk Brenken 2021-03-19 22:19:29 +01:00 committed by GitHub
commit 1e0eaa1f4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/banip/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=banip
PKG_VERSION:=0.7.5
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

66
net/banip/files/banip.sh
View file

@ -678,61 +678,65 @@ f_ipset()
"initial")
for proto in "4" "6"
do
if [ "${proto}" = "4" ]
if [ "${proto}" = "4" ] && [ "${ban_proto4_enabled}" = "1" ]
then
ipt_cmd="${ban_ipt4_cmd}"
chainsets="${ban_lan_inputchains_4} ${ban_lan_forwardchains_4} ${ban_wan_inputchains_4} ${ban_wan_forwardchains_4}"
elif [ "${proto}" = "6" ]
elif [ "${proto}" = "6" ] && [ "${ban_proto6_enabled}" = "1" ]
then
ipt_cmd="${ban_ipt6_cmd}"
chainsets="${ban_lan_inputchains_6} ${ban_lan_forwardchains_6} ${ban_wan_inputchains_6} ${ban_wan_forwardchains_6}"
fi
if [ -z "$("${ipt_cmd}" "${timeout}" -nL "${ban_chain}" 2>/dev/null)" ]
if { [ "${proto}" = "4" ] && [ "${ban_proto4_enabled}" = "1" ]; } || \
{ [ "${proto}" = "6" ] && [ "${ban_proto6_enabled}" = "1" ]; }
then
"${ipt_cmd}" "${timeout}" -N "${ban_chain}" 2>/dev/null
out_rc="${?}"
f_log "debug" "f_ipset ::: name: ${src_name:-"-"}, mode: ${mode:-"-"}, chain: ${ban_chain:-"-"}, out_rc: ${out_rc}"
else
out_rc=0
for chain in ${chainsets}
do
f_iptrule "-D" "${chain}" "-j ${ban_chain}"
done
fi
if [ "${ban_logsrc_enabled}" = "1" ] && [ "${out_rc}" = "0" ] && [ -z "$("${ipt_cmd}" "${timeout}" -nL "${ban_logchain_src}" 2>/dev/null)" ]
then
"${ipt_cmd}" "${timeout}" -N "${ban_logchain_src}" 2>/dev/null
out_rc="${?}"
if [ "${out_rc}" = "0" ]
if [ -z "$("${ipt_cmd}" "${timeout}" -nL "${ban_chain}" 2>/dev/null)" ]
then
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_src}" -j LOG ${ban_logopts_src} --log-prefix "${ban_logprefix_src}"
"${ipt_cmd}" "${timeout}" -N "${ban_chain}" 2>/dev/null
out_rc="${?}"
f_log "debug" "f_ipset ::: name: ${src_name:-"-"}, mode: ${mode:-"-"}, chain: ${ban_chain:-"-"}, out_rc: ${out_rc}"
else
out_rc=0
for chain in ${chainsets}
do
f_iptrule "-D" "${chain}" "-j ${ban_chain}"
done
fi
if [ "${ban_logsrc_enabled}" = "1" ] && [ "${out_rc}" = "0" ] && [ -z "$("${ipt_cmd}" "${timeout}" -nL "${ban_logchain_src}" 2>/dev/null)" ]
then
"${ipt_cmd}" "${timeout}" -N "${ban_logchain_src}" 2>/dev/null
out_rc="${?}"
if [ "${out_rc}" = "0" ]
then
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_src}" -j "${ban_logtarget_src}"
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_src}" -j LOG ${ban_logopts_src} --log-prefix "${ban_logprefix_src}"
out_rc="${?}"
if [ "${out_rc}" = "0" ]
then
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_src}" -j "${ban_logtarget_src}"
out_rc="${?}"
fi
fi
f_log "debug" "f_ipset ::: name: ${src_name:-"-"}, mode: ${mode:-"-"}, logchain_src: ${ban_logchain_src:-"-"}, out_rc: ${out_rc}"
fi
f_log "debug" "f_ipset ::: name: ${src_name:-"-"}, mode: ${mode:-"-"}, logchain_src: ${ban_logchain_src:-"-"}, out_rc: ${out_rc}"
fi
if [ "${ban_logdst_enabled}" = "1" ] && [ "${out_rc}" = "0" ] && [ -z "$("${ipt_cmd}" "${timeout}" -nL "${ban_logchain_dst}" 2>/dev/null)" ]
then
"${ipt_cmd}" "${timeout}" -N "${ban_logchain_dst}" 2>/dev/null
out_rc="${?}"
if [ "${out_rc}" = "0" ]
if [ "${ban_logdst_enabled}" = "1" ] && [ "${out_rc}" = "0" ] && [ -z "$("${ipt_cmd}" "${timeout}" -nL "${ban_logchain_dst}" 2>/dev/null)" ]
then
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_dst}" -j LOG ${ban_logopts_dst} --log-prefix "${ban_logprefix_dst}"
"${ipt_cmd}" "${timeout}" -N "${ban_logchain_dst}" 2>/dev/null
out_rc="${?}"
if [ "${out_rc}" = "0" ]
then
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_dst}" -j "${ban_logtarget_dst}"
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_dst}" -j LOG ${ban_logopts_dst} --log-prefix "${ban_logprefix_dst}"
out_rc="${?}"
if [ "${out_rc}" = "0" ]
then
"${ipt_cmd}" "${timeout}" -A "${ban_logchain_dst}" -j "${ban_logtarget_dst}"
out_rc="${?}"
fi
fi
f_log "debug" "f_ipset ::: name: initial, mode: ${mode:-"-"}, logchain_dst: ${ban_logchain_dst:-"-"}, out_rc: ${out_rc}"
fi
f_log "debug" "f_ipset ::: name: initial, mode: ${mode:-"-"}, logchain_dst: ${ban_logchain_dst:-"-"}, out_rc: ${out_rc}"
fi
done
out_rc="${out_rc:-"${in_rc}"}"