diff --git a/limitator b/limitator index f21106c..3e16c55 100644 --- a/limitator +++ b/limitator @@ -23,8 +23,6 @@ config_get USED_BYTES_FILE limitator used_bytes_file '/root/limitator/used_bytes config_get LOG_FILE limitator log_file '/root/limitator/log' # A persistent file to log. config_get IPTABLES_CHAIN limitator iptables_chain 'LIMITATOR' # Name of iptables chain. config_get IPTABLES_FORWARD limitator iptables_forward 'forwarding_rule' # Name of iptables rule for forward. -config_get IPTABLES_INPUT limitator iptables_input 'input_rule' # Name of iptables rule for input. -config_get IPTABLES_OUTPUT limitator iptables_output 'output_rule' # Name of iptables rule for output. get_saved_used_bytes(){ local used_bytes @@ -116,13 +114,10 @@ reset_quota(){ del_iptables_rule(){ iptables --wait -F $IPTABLES_CHAIN - for chain_name in $IPTABLES_FORWARD $IPTABLES_INPUT $IPTABLES_OUTPUT + while true do - while true - do - line=$(iptables --wait -L $chain_name|sed -e '1,2d'|grep -n $IPTABLES_CHAIN|head -1|cut -d : -f 1 2>/dev/null) - [ -n "$(echo $line|grep -E ^[[:digit:]]+$)" ] && iptables --wait -D $chain_name $line || break - done + line=$(iptables --wait -L $IPTABLES_FORWARD|sed -e '1,2d'|grep -n $IPTABLES_CHAIN|head -1|cut -d : -f 1 2>/dev/null) + [ -n "$(echo $line|grep -E ^[[:digit:]]+$)" ] && iptables --wait -D $IPTABLES_FORWARD $line || break done iptables --wait -D $IPTABLES_FORWARD 1 iptables --wait -X $IPTABLES_CHAIN @@ -152,8 +147,6 @@ set_iptables_rule(){ iptables --wait -I $IPTABLES_FORWARD 1 -d $INTRANET -s $INTRANET -j ACCEPT iptables -I $IPTABLES_FORWARD 2 -j $IPTABLES_CHAIN - iptables -I $IPTABLES_INPUT -i $WAN_DEV ! -s $INTRANET -j $IPTABLES_CHAIN - iptables -I $IPTABLES_OUTPUT -o $WAN_DEV ! -d $INTRANET -j $IPTABLES_CHAIN } check_time_is_valid(){