From 3a7af64d8cd0996483680b706fed3afcc43e7ca9 Mon Sep 17 00:00:00 2001 From: Aedan Renner Date: Tue, 30 Sep 2014 08:50:31 -0700 Subject: [PATCH] mwan3-luci: update to 1.3-3 corrected name of last_resort option from "main" to "default" added blackhole option to policy selection on rule configuration Signed-off-by: Aedan Renner --- net/mwan3-luci/Makefile | 2 +- .../usr/lib/lua/luci/model/cbi/mwan3/mwan3_policy.lua | 10 +++++----- .../lua/luci/model/cbi/mwan3/mwan3_policyconfig.lua | 2 +- .../lib/lua/luci/model/cbi/mwan3/mwan3_ruleconfig.lua | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/net/mwan3-luci/Makefile b/net/mwan3-luci/Makefile index 25ae76763a..5405fc10a6 100644 --- a/net/mwan3-luci/Makefile +++ b/net/mwan3-luci/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-mwan3 PKG_VERSION:=1.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Aedan Renner PKG_LICENSE:=GPLv2 diff --git a/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policy.lua b/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policy.lua index ef09451fbd..84d610f619 100644 --- a/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policy.lua +++ b/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policy.lua @@ -72,12 +72,12 @@ last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last reso last_resort.rawhtml = true function last_resort.cfgvalue(self, s) local str = self.map:get(s, "last_resort") - if str == "unreachable" or str == "" or str == null then - return "unreachable (reject)" - elseif str == "blackhole" then + if str == "blackhole" then return "blackhole (drop)" - elseif str == "main" then - return "main (use main routing table)" + elseif str == "default" then + return "default (use main routing table)" + else + return "unreachable (reject)" end end diff --git a/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policyconfig.lua b/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policyconfig.lua index dfd7253378..ddcff57940 100644 --- a/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policyconfig.lua +++ b/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policyconfig.lua @@ -50,7 +50,7 @@ last_resort = mwan_policy:option(ListValue, "last_resort", translate("Last resor last_resort.default = "unreachable" last_resort:value("unreachable", translate("unreachable (reject)")) last_resort:value("blackhole", translate("blackhole (drop)")) - last_resort:value("main", translate("main (use main routing table)")) + last_resort:value("default", translate("default (use main routing table)")) -- ------ currently configured members ------ -- diff --git a/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_ruleconfig.lua b/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_ruleconfig.lua index 21a01b8638..404c27f8ba 100644 --- a/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_ruleconfig.lua +++ b/net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_ruleconfig.lua @@ -83,8 +83,9 @@ proto = mwan_rule:option(Value, "proto", translate("Protocol"), use_policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned")) cbi_add_policy(use_policy) - use_policy:value("unreachable") - use_policy:value("default") + use_policy:value("unreachable", translate("unreachable (reject)")) + use_policy:value("blackhole", translate("blackhole (drop)")) + use_policy:value("default", translate("default (use main routing table)")) -- ------ currently configured policies ------ -- -- 2.30.2