scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-02 19:37:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

opensync: fix ssid-ratelimiting

Browse Source 
Fix ssid ratelimiting bugs

Signed-off-by: Chaitanya Godavarthi <chaitanya.kiran@netexperience.com>
This commit is contained in:
Chaitanya Godavarthi
2021-02-12 22:20:34 -05:00
parent 3741e3c999
commit d92c28e5cb
3 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
feeds/wlan-ap/nft-qos/files/lib/mac-rate.sh
View File

@@ -17,9 +17,10 @@ handle_interface() {
elif [ $2 == "upload" ]; then
config_get rate $iface curate
fi
# Convert from Kbits to KBytes
rate=$((rate/8))
fi
# Convert from Kbits to KBytes
rate=$((rate/8))
}
if [ -z "$1" -o -z "$2" -o -z "$3" ]; then
@@ -40,7 +41,11 @@ if [ "$1" == "add" ]; then
logger -t "mac-rate" "old_drate=$old_drate"
if [ "$old_drate" -ne "$rate" ]; then
changed=1
logger -t "mac-rate" "changed DL $old_drate to $rate"
id=`nft list chain bridge nft-qos-ssid-lan-bridge download -a | grep -i $3 | awk -F "handle " '{print $2;exit}'`
if [ -n "$id" ]; then
nft delete rule bridge nft-qos-ssid-lan-bridge download handle $id
fi
logger -t "mac-rate" "changed DL $old_drate to $rate, del $3"
else
changed=0
logger -t "mac-rate" "Not changed DL $old_drate to $rate"
@@ -59,7 +64,12 @@ if [ "$1" == "add" ]; then
old_urate=`nft list chain bridge nft-qos-ssid-lan-bridge upload -a | grep -i $3 | awk -F'kbytes' '{print $1}' | awk '{print $NF}'`
if [ "$old_urate" -ne "$rate" ]; then
changed=1
logger -t "mac-rate" "changed UL $old_urate to $rate"
id=`nft list chain bridge nft-qos-ssid-lan-bridge upload -a | grep -i $3 | awk -F "handle " '{print $2;exit}'`
if [ -n "$id" ]; then
nft delete rule bridge nft-qos-ssid-lan-bridge upload handle $id
fi
logger -t "mac-rate" "changed UL $old_urate to $rate del $3"
else
changed=0
logger -t "mac-rate" "Not changed UL $old_urate to $rate"

47
feeds/wlan-ap/nft-qos/files/lib/ssid_ratelimit.sh
View File

@@ -3,12 +3,18 @@
. /lib/nft-qos/core.sh
# append rule for ssid_ratelimit qos
qosdef_append_rule_ssid() { # <section> <operator> <default-unit> <default-rate>
qosdef_append_rule_ssid() { # <section> <operator> <bridge>
local unit rate iface rlimit
local operator=$2
local bridge=$3
iface=$1
br=`/usr/opensync/bin/ovsh s Wifi_VIF_Config bridge -w if_name==$iface | grep -ic $bridge`
if [ $br -eq 0 ]; then
return
fi
config_get disabled $1 disabled
if [ "$disabled" == "1" ]; then
return
@@ -19,7 +25,11 @@ qosdef_append_rule_ssid() { # <section> <operator> <default-unit> <default-rate>
return
fi
config_get unit $1 unit $3
config_get unit $1 unit
if [ -z "$unit" ]; then
unit=kbytes
fi
if [ $operator == "oif" ]; then
config_get rate $1 drate $4
# Convert from Kbits to KBytes
@@ -32,7 +42,7 @@ qosdef_append_rule_ssid() { # <section> <operator> <default-unit> <default-rate>
rate=$((rate/8))
fi
if [ -z "$iface" -o -z "$rate" ]; then
if [ -z "$iface" -o -z "$rate" -o $rate == 0 ]; then
logger -t "nft-qos" "Error: No interface $iface or rate $rate present"
return
fi
@@ -56,20 +66,20 @@ qosdef_append_rule_ssid() { # <section> <operator> <default-unit> <default-rate>
}
# append chain for static qos
qosdef_append_chain_ssid() { # <hook> <name> <section> <unit> <rate>
qosdef_append_chain_ssid() { # <hook> <name> <section> <bridge>
local hook=$1 name=$2
local config=$3 operator
local bridge=$4
case "$name" in
download) operator="oif";;
upload) operator="iif";;
download*) operator="oif";;
upload*) operator="iif";;
esac
uci_load wireless
qosdef_appendx "\tchain $name {\n"
qosdef_append_chain_def filter $hook 0 accept
qosdef_append_rule_limit_whitelist $name
config_foreach qosdef_append_rule_ssid $config $operator $4 $5
config_foreach qosdef_append_rule_ssid $config $operator $bridge
qosdef_appendx "\t}\n"
}
@@ -82,11 +92,26 @@ qosdef_flush_ssid_ratelimit() {
qosdef_init_ssid_ratelimit() {
exec 500>/tmp/rlimit.lock
flock 500
local hook_ul="input" hook_dl="output"
local dchain
local uchain
logger -t "nft-qos" "`date -I'seconds'` "INIT" $0"
qosdef_appendx "table $NFT_QOS_BRIDGE_FAMILY nft-qos-ssid-lan-bridge {\n"
qosdef_append_chain_ssid $hook_ul upload wifi-iface $ssid_ratelimit_unit_ul $ssid_ratelimit_rate_ul
qosdef_append_chain_ssid $hook_dl download wifi-iface $ssid_ratelimit_unit_dl $ssid_ratelimit_rate_dl
local hook_ul="forward" hook_dl="forward"
uchain="upload"
dchain="download"
qosdef_append_chain_ssid $hook_ul $uchain wifi-iface wan
qosdef_append_chain_ssid $hook_dl $dchain wifi-iface wan
local hook_ul="input" hook_dl="output"
uchain="upload_nat"
dchain="download_nat"
qosdef_append_chain_ssid $hook_ul $uchain wifi-iface lan
qosdef_append_chain_ssid $hook_dl $dchain wifi-iface lan
qosdef_appendx "}\n"
exec 500>&-
}

1
feeds/wlan-ap/opensync/files/etc/hotplug.d/net/40-rlimit-ssid
View File

@@ -3,6 +3,5 @@
[ "$ACTION" = "add" ] || exit 0
rlimit=$(uci get wireless.${DEVICENAME}.rlimit)
[ -z "$rlimit" -o "$rlimit" = 0 ] && exit 0
/etc/init.d/nft-qos restart
exit 0