diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua | 74 |
1 files changed, 13 insertions, 61 deletions
diff --git a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua index 917c88c92c..b258dfc598 100644 --- a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua +++ b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua @@ -12,9 +12,8 @@ You may obtain a copy of the License at local map, section, net = ... -local device, apn, service, pincode, username, password, dialnumber -local ipv6, maxwait, defaultroute, metric, peerdns, dns, - keepalive_failure, keepalive_interval, demand +local device, apn, service, pincode, username, password +local ipv6, delay, defaultroute, metric, peerdns, dns device = section:taboption("general", Value, "device", translate("Modem device")) @@ -32,7 +31,7 @@ end mode = section:taboption("general", Value, "mode", translate("Service Type")) -mode.default = "auto" +mode:value("", translate("Modem default")) mode:value("preferlte", translate("Prefer LTE")) mode:value("preferumts", translate("Prefer UMTS")) mode:value("lte", "LTE") @@ -41,6 +40,13 @@ mode:value("gsm", translate("GPRS only")) mode:value("auto", translate("auto")) +mode = section:taboption("general", Value, "pdptype", translate("IP Protocol")) +mode.default = "IP" +mode:value("IP", translate("IPv4")) +mode:value("IPV4V6", translate("IPv4+IPv6")) +mode:value("IPV6", translate("IPv6")) + + apn = section:taboption("general", Value, "apn", translate("APN")) @@ -53,8 +59,6 @@ username = section:taboption("general", Value, "username", translate("PAP/CHAP u password = section:taboption("general", Value, "password", translate("PAP/CHAP password")) password.password = true -dialnumber = section:taboption("general", Value, "dialnumber", translate("Dial number")) -dialnumber.placeholder = "*99***1#" if luci.model.network:has_ipv6() then @@ -67,12 +71,12 @@ if luci.model.network:has_ipv6() then end -maxwait = section:taboption("advanced", Value, "maxwait", +delay = section:taboption("advanced", Value, "delay", translate("Modem init timeout"), translate("Maximum amount of seconds to wait for the modem to become ready")) -maxwait.placeholder = "20" -maxwait.datatype = "min(1)" +delay.placeholder = "10" +delay.datatype = "min(1)" defaultroute = section:taboption("advanced", Flag, "defaultroute", @@ -103,55 +107,3 @@ dns:depends("peerdns", "") dns.datatype = "ipaddr" 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" |