From 93ff9ef2ee6db2ca6fa7046113caf46e1c561bfb Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 12 Dec 2019 10:32:38 +0100 Subject: [PATCH 1/2] luci-app-mwan3: fix require field message if httping is selected If these two values are not removed, then httping cannot be selected as the tracking method. The field size is a must field for ping but it is not displayed because httping does not need it. Signed-off-by: Florian Eckert --- .../luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index 606b1ae766..d3a367a308 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -87,8 +87,6 @@ size:value("1016") size:value("1472") size:value("2040") size.datatype = "range(1, 65507)" -size.rmempty = false -size.optional = false max_ttl = mwan_interface:option(Value, "max_ttl", translate("Max TTL")) max_ttl.default = "60" From 1cab592bf93d16cea5e1ac33676cc91376b4636e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 12 Dec 2019 15:48:12 +0100 Subject: [PATCH 2/2] luci-app-mwan3: save httping_ssl config whether is set or not Always write this configuration parameter into the config. Signed-off-by: Florian Eckert --- .../luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index d3a367a308..bcbf03d54e 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -59,6 +59,7 @@ end httping_ssl = mwan_interface:option(Flag, "httping_ssl", translate("Enable ssl tracking"), translate("Enables https tracking on ssl port 443")) httping_ssl:depends("track_method", "httping") +httping_ssl.rmempty = false httping_ssl.default = httping_ssl.enabled reliability = mwan_interface:option(Value, "reliability", translate("Tracking reliability"),