wifilife: firewall.mbid: update func and file names

This commit is contained in:
Jakob Olsson 2019-05-15 15:54:30 +02:00
parent 950365bd83
commit 5a3b12f451

View file

@ -2,18 +2,18 @@
. /lib/functions/mbid.sh
remove_rpt_rules() {
old_rules="$(cat "/tmp/mbid_macs" 2>/dev/null)"
remove_mbid_rules() {
old_rules="$(cat "/tmp/mbid_rules" 2>/dev/null)"
IFS=$'\n'
for old_rule in $old_rules; do
old_rule=${old_rule/-A /-D }
eval $old_rule
eval $old_rule 2>/dev/null
done
rm /tmp/mbid_macs
rm /tmp/mbid_rules
}
# read firewall parental rules and add repeated addresses
append_rpt_rules() {
append_mbid_rules() {
[ "$(uci -q get owsd.ubusproxy.enable)" == "1" ] || return
octets=$(get_octets)
@ -43,7 +43,7 @@ append_rpt_rules() {
eval $rule
rpt_macs=$(repeated_macs $octets $oct2 $oct3 $mac | awk '{print toupper($0)}')
> /tmp/mbid_macs
> /tmp/mbid_rules
for rpt_mac in $rpt_macs; do
[ -z "$rpt_mac" ] && continue
rpt_rule=${rule/$mac/$rpt_mac}
@ -53,7 +53,7 @@ append_rpt_rules() {
done
eval $rpt_rule
echo $rpt_rule >> /tmp/mbid_macs
echo $rpt_rule >> /tmp/mbid_rules
done
done
}
@ -62,6 +62,6 @@ while [ -f /tmp/mbid.lock ]; do
sleep 2
done
touch /tmp/mbid.lock
remove_rpt_rules
append_rpt_rules
remove_mbid_rules
append_mbid_rules
rm /tmp/mbid.lock