Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1981 from hanipouspilot/ncm

Browse source 
luci-proto-ncm: remove unrelated options
This commit is contained in:
Jo-Philipp Wich 2018-07-21 21:36:07 +02:00 committed by GitHub
commit a8a5b2feb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
View file

@ -12,9 +12,8 @@ You may obtain a copy of the License at
local map, section, net = ... local map, section, net = ...
local device, apn, service, pincode, username, password, dialnumber local device, apn, service, pincode, username, password
local ipv6, maxwait, defaultroute, metric, peerdns, dns, local ipv6, delay, defaultroute, metric, peerdns, dns
keepalive_failure, keepalive_interval, demand
device = section:taboption("general", Value, "device", translate("Modem device")) device = section:taboption("general", Value, "device", translate("Modem device"))
@ -60,8 +59,6 @@ username = section:taboption("general", Value, "username", translate("PAP/CHAP u
password = section:taboption("general", Value, "password", translate("PAP/CHAP password")) password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
password.password = true password.password = true
dialnumber = section:taboption("general", Value, "dialnumber", translate("Dial number"))
dialnumber.placeholder = "*99***1#"
if luci.model.network:has_ipv6() then if luci.model.network:has_ipv6() then
@ -74,12 +71,12 @@ if luci.model.network:has_ipv6() then
end end
maxwait = section:taboption("advanced", Value, "maxwait", delay = section:taboption("advanced", Value, "delay",
translate("Modem init timeout"), translate("Modem init timeout"),
translate("Maximum amount of seconds to wait for the modem to become ready")) translate("Maximum amount of seconds to wait for the modem to become ready"))
maxwait.placeholder = "20" delay.placeholder = "10"
maxwait.datatype = "min(1)" delay.datatype = "min(1)"
defaultroute = section:taboption("advanced", Flag, "defaultroute", defaultroute = section:taboption("advanced", Flag, "defaultroute",
@ -110,55 +107,3 @@ dns:depends("peerdns", "")
dns.datatype = "ipaddr" dns.datatype = "ipaddr"
dns.cast = "string" dns.cast = "string"
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
translate("LCP echo failure threshold"),
translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
function keepalive_failure.cfgvalue(self, section)
local v = m:get(section, "keepalive")
if v and #v > 0 then
return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
end
end
function keepalive_failure.write() end
function keepalive_failure.remove() end
keepalive_failure.placeholder = "0"
keepalive_failure.datatype = "uinteger"
keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
translate("LCP echo interval"),
translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
function keepalive_interval.cfgvalue(self, section)
local v = m:get(section, "keepalive")
if v and #v > 0 then
return tonumber(v:match("^%d+[ ,]+(%d+)"))
end
end
function keepalive_interval.write(self, section, value)
local f = tonumber(keepalive_failure:formvalue(section)) or 0
local i = tonumber(value) or 5
if i < 1 then i = 1 end
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
m:del(section, "keepalive")
end
end
keepalive_interval.remove = keepalive_interval.write
keepalive_interval.placeholder = "5"
keepalive_interval.datatype = "min(1)"
demand = section:taboption("advanced", Value, "demand",
translate("Inactivity timeout"),
translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
demand.placeholder = "0"
demand.datatype = "uinteger"