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

Add automatic speedtest in wizard

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2023-08-08 12:51:50 +02:00
parent da603e9310
commit 2d3b37888d
3 changed files with 62 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -415,6 +415,7 @@ function wizard_add()
local downloadspeed = luci.http.formvalue("cbid.sqm.%s.download" % intf) or "0"
local uploadspeed = luci.http.formvalue("cbid.sqm.%s.upload" % intf) or "0"
local testspeed = luci.http.formvalue("cbid.sqm.%s.testspeed" % intf) or "0"
if not ucic:get("qos",intf) ~= "" then
ucic:set("qos",intf,"interface")
@ -438,7 +439,7 @@ function wizard_add()
ucic:set("sqm",intf,"script","piece_of_cake.qos")
ucic:set("sqm",intf,"qdisc_advanced","0")
ucic:set("sqm",intf,"linklayer","atm")
ucic:set("sqm",intf,"overhead","40")
ucic:set("sqm",intf,"overhead","44")
ucic:set("sqm",intf,"enabled","0")
ucic:set("sqm",intf,"debug_logging","0")
ucic:set("sqm",intf,"verbosity","5")
@ -454,6 +455,10 @@ function wizard_add()
ucic:set("sqm",intf,"qdisc","cake")
ucic:set("sqm",intf,"script","piece_of_cake.qos")
end
ucic:set("openmptcprouter",intf,"testspeed",testspeed)
if testspeed == "1" then
ucic:set("openmptcprouter",intf,"testspeed_lc")
end
if downloadspeed ~= "0" and downloadspeed ~= "" then
if sqmautorate == "1" and (ucic:get("network",intf,"downloadspeed") ~= downloadspeed or ucic:get("sqm",intf,"max_download") == "" or ucic:get("sqm",intf,"download") == "0") then
ucic:set("sqm",intf,"download",math.ceil(downloadspeed*65/100))

18
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -272,7 +272,7 @@
local method=uci:get("openmptcprouter","settings","encryption")
if method == nil and ut.trim(sys.exec("cat /proc/cpuinfo | grep aes")) ~= "" then
method="aes-256-gcm"
else
elseif method == nil then
method="chacha20"
end
%>
@ -993,12 +993,22 @@
end
%>
<div class="cbi-value" data-index="19">
<label class="cbi-value-title"><%:Calculate speed%></label>
<div class="cbi-value-field">
<input class="cbi-input-checkbox" type="checkbox" name="cbid.sqm.<%=ifname%>.testspeed" value="1" <% if uci:get("openmptcprouter",ifname,"testspeed") == "1" or uci:get("openmptcprouter",ifname,"testspeed") == nil then %>checked<% end %> />
<br />
<div class="cbi-value-description">
<%:Run an automatic speedtest to calculate max speed.%>
</div>
</div>
</div>
<div class="cbi-value" data-index="20">
<label class="cbi-value-title"><%:Download speed (Kb/s)%></label>
<div class="cbi-value-field">
<input type="text" name="cbid.sqm.<%=ifname%>.download" class="cbi-input-text" value="<%=download%>" data-type="uinteger">
<br />
<div class="cbi-value-description">
<%:Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value.%>
<%:Used by Glorytun UDP and SQM/QoS if enabled.%>
</div>
<!--
<br />
@ -1008,13 +1018,13 @@
-->
</div>
</div>
<div class="cbi-value" data-index="20">
<div class="cbi-value" data-index="21">
<label class="cbi-value-title"><%:Upload speed (Kb/s)%></label>
<div class="cbi-value-field">
<input type="text" name="cbid.sqm.<%=ifname%>.upload" class="cbi-input-text" value="<%=upload%>" data-type="uinteger">
<br />
<div class="cbi-value-description">
<%:Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value.%>
<%:Used by Glorytun UDP and SQM/QoS if enabled.%>
</div>
<!--
<br />