From 204bc5b9ab66cc6e49295bac43ebc789b0889866 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 26 Jun 2019 12:42:25 +0200 Subject: [PATCH 1/2] luci-proto-qmi: add missing delay option The proto handler qmi does support the delay option for modem initialization. Add that missing option to the advanced tab to configure that with LuCI. Signed-off-by: Florian Eckert --- .../luasrc/model/cbi/admin_network/proto_qmi.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua index e11201d213..a7a1c67279 100644 --- a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua +++ b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua @@ -4,7 +4,7 @@ local map, section, net = ... local device, apn, pincode, username, password -local auth, ipv6 +local auth, ipv6, delay device = section:taboption("general", Value, "device", translate("Modem device")) @@ -43,3 +43,9 @@ if luci.model.network:has_ipv6() then ipv6 = section:taboption("advanced", Flag, "ipv6", translate("Enable IPv6 negotiation")) ipv6.default = ipv6.disabled end + +delay = section:taboption("advanced", Value, "delay", + translate("Modem init timeout"), + translate("Maximum amount of seconds to wait for the modem to become ready")) +delay.placeholder = "10" +delay.datatype = "min(1)" From f17227d3f5000cb28385c6e065246937326437fb Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 26 Jun 2019 13:04:47 +0200 Subject: [PATCH 2/2] luci-proto-qmi: only show password and username if auth is selected Only show username and password if we use PAP/CHAP, PAP or CHAP authentication. Signed-off-by: Florian Eckert --- .../model/cbi/admin_network/proto_qmi.lua | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua index a7a1c67279..9cc1ae0cf5 100644 --- a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua +++ b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua @@ -26,18 +26,26 @@ apn = section:taboption("general", Value, "apn", translate("APN")) pincode = section:taboption("general", Value, "pincode", translate("PIN")) -username = section:taboption("general", Value, "username", translate("PAP/CHAP username")) - - -password = section:taboption("general", Value, "password", translate("PAP/CHAP password")) -password.password = true - auth = section:taboption("general", Value, "auth", translate("Authentication Type")) -auth:value("", translate("-- Please choose --")) auth:value("both", "PAP/CHAP (both)") auth:value("pap", "PAP") auth:value("chap", "CHAP") auth:value("none", "NONE") +auth.default = "none" + + +username = section:taboption("general", Value, "username", translate("PAP/CHAP username")) +username:depends("auth", "pap") +username:depends("auth", "chap") +username:depends("auth", "both") + + +password = section:taboption("general", Value, "password", translate("PAP/CHAP password")) +password:depends("auth", "pap") +password:depends("auth", "chap") +password:depends("auth", "both") +password.password = true + if luci.model.network:has_ipv6() then ipv6 = section:taboption("advanced", Flag, "ipv6", translate("Enable IPv6 negotiation"))