mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix SQM and enable it again for VPN

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-04-26 17:14:07 +02:00
parent 36f028b8cf
commit e9fbdf0238
2 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -349,14 +349,16 @@ function wizard_add()
ucic:set("sqm",intf,"qdisc","fq_codel") ucic:set("sqm",intf,"qdisc","fq_codel")
ucic:set("sqm",intf,"script","simple.qos") ucic:set("sqm",intf,"script","simple.qos")
ucic:set("sqm",intf,"qdisc_advanced","0") ucic:set("sqm",intf,"qdisc_advanced","0")
ucic:set("sqm",intf,"linklayer","none") ucic:set("sqm",intf,"linklayer","atm")
ucic:set("sqm",intf,"overhead","40")
ucic:set("sqm",intf,"enabled","0") ucic:set("sqm",intf,"enabled","0")
ucic:set("sqm",intf,"debug_logging","0") ucic:set("sqm",intf,"debug_logging","0")
ucic:set("sqm",intf,"verbosity","5") ucic:set("sqm",intf,"verbosity","5")
ucic:set("sqm",intf,"download","0") ucic:set("sqm",intf,"download","0")
ucic:set("sqm",intf,"upload","0") ucic:set("sqm",intf,"upload","0")
ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost") ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress")
ucic:set("sqm",intf,"eqdisc_opts","dual-srchost") --ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost")
--ucic:set("sqm",intf,"eqdisc_opts","dual-srchost")
end end
if downloadspeed ~= "0" and downloadspeed ~= "" then if downloadspeed ~= "0" and downloadspeed ~= "" then
@ -379,8 +381,9 @@ function wizard_add()
end end
if sqmenabled == "1" then if sqmenabled == "1" then
ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost") ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress")
ucic:set("sqm",intf,"eqdisc_opts","dual-srchost") --ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost")
--ucic:set("sqm",intf,"eqdisc_opts","dual-srchost")
ucic:set("sqm",intf,"enabled","1") ucic:set("sqm",intf,"enabled","1")
ucic:set("qos",intf,"enabled","1") ucic:set("qos",intf,"enabled","1")
else else

36
openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
View file

@ -74,24 +74,24 @@ if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then
fi fi
fi fi
#if [ "$(uci -q get sqm.omrvpn)" = "" ]; then if [ "$(uci -q get sqm.omrvpn)" = "" ]; then
# uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
# set sqm.omrvpn=queue set sqm.omrvpn=queue
# set sqm.omrvpn.qdisc="fq_codel" set sqm.omrvpn.qdisc="cake"
# set sqm.omrvpn.script="simple.qos" set sqm.omrvpn.script="piece_of_cake.qos"
# set sqm.omrvpn.qdisc_advanced='0' set sqm.omrvpn.qdisc_advanced='0'
# set sqm.omrvpn.linklayer='none' set sqm.omrvpn.linklayer='none'
# set sqm.omrvpn.enabled='1' set sqm.omrvpn.enabled='1'
# set sqm.omrvpn.interface=tun0 set sqm.omrvpn.interface=tun0
# set sqm.omrvpn.download='0' set sqm.omrvpn.download='0'
# set sqm.omrvpn.upload='0' set sqm.omrvpn.upload='0'
# set sqm.omrvpn.debug_logging='0' set sqm.omrvpn.debug_logging='0'
# set sqm.omrvpn.verbosity='5' set sqm.omrvpn.verbosity='5'
# set sqm.omrvpn.iqdisc_opts='autorate-ingress dual-dsthost' set sqm.omrvpn.overhead='40'
# set sqm.omrvpn.eqdisc_opts='dual-srchost' set sqm.omrvpn.iqdisc_opts='autorate-ingress'
# commit sqm commit sqm
# EOF EOF
#fi fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache