firewall/ipt-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error reading IPv4/IPv6 ban list.

Browse Source
This commit is contained in:
Christoph 2019-05-12 17:10:39 +02:00
parent 949a96cd34
commit dc91143e39
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ip6t-firewall-server
View File

@ -26,6 +26,7 @@ conf_ports=${ipt_conf_dir}/ports.conf
conf_interfaces=${ipt_conf_dir}/interfaces_ipv6.conf conf_interfaces=${ipt_conf_dir}/interfaces_ipv6.conf
conf_main=${ipt_conf_dir}/main_ipv6.conf conf_main=${ipt_conf_dir}/main_ipv6.conf
conf_post_declarations=${ipt_conf_dir}/post_decalrations.conf conf_post_declarations=${ipt_conf_dir}/post_decalrations.conf
conf_ban_ipv6_list="${ipt_conf_dir}/ban_ipv6.list"
ip6t=$(which ip6tables) ip6t=$(which ip6tables)
@ -382,7 +383,7 @@ echo_done # Block IPs / Networks / Interfaces..
echononl "\tBlock IPs/Netwoks reading from file 'ban_ipv6.list' .." echononl "\tBlock IPs/Netwoks reading from file 'ban_ipv6.list' .."
if [[ -f "${CONFIG_DIR}/ban_ipv6.list" ]] ; then if [[ -f "$conf_ban_ipv6_list" ]] ; then
declare -a ban_ipv6_arr=() declare -a ban_ipv6_arr=()
declare -a no_valid_ipv6=() declare -a no_valid_ipv6=()
@ -485,7 +486,7 @@ if [[ -f "${CONFIG_DIR}/ban_ipv6.list" ]] ; then
fi fi
fi fi
done < "${CONFIG_DIR}/ban_ipv6.list" done < "$conf_ban_ipv6_list"
echo_done echo_done
if [[ ${#no_valid_ipv6_arr[@]} -gt 0 ]]; then if [[ ${#no_valid_ipv6_arr[@]} -gt 0 ]]; then

5
ipt-firewall-server
View File

@ -26,6 +26,7 @@ conf_ports=${ipt_conf_dir}/ports.conf
conf_interfaces=${ipt_conf_dir}/interfaces_ipv4.conf conf_interfaces=${ipt_conf_dir}/interfaces_ipv4.conf
conf_main=${ipt_conf_dir}/main_ipv4.conf conf_main=${ipt_conf_dir}/main_ipv4.conf
conf_post_declarations=${ipt_conf_dir}/post_decalrations.conf conf_post_declarations=${ipt_conf_dir}/post_decalrations.conf
conf_ban_ipv4_list="${ipt_conf_dir}/ban_ipv4.list"
ipt=$(which iptables) ipt=$(which iptables)
@ -441,7 +442,7 @@ echo_done # Block IPs / Networks / Interfaces..
echononl "\tBlock IPs/Netwoks reading from file 'ban_ipv4.list' .." echononl "\tBlock IPs/Netwoks reading from file 'ban_ipv4.list' .."
if [[ -f "${CONFIG_DIR}/ban_ipv4.list" ]] ; then if [[ -f "$conf_ban_ipv4_list" ]] ; then
declare -a octets declare -a octets
declare -i index declare -i index
@ -610,7 +611,7 @@ if [[ -f "${CONFIG_DIR}/ban_ipv4.list" ]] ; then
msg="$msg '${given_ipv4}'" msg="$msg '${given_ipv4}'"
fi fi
done < "${CONFIG_DIR}/ban_ipv4.list" done < "$conf_ban_ipv4_list"
echo_done echo_done
if [[ -n "$msg" ]]; then if [[ -n "$msg" ]]; then