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

mwan3-luci: update to 1.3-3

Browse source 
corrected name of last_resort option from "main" to "default"
added blackhole option to policy selection on rule configuration

Signed-off-by: Aedan Renner <chipdankly@gmail.com>
This commit is contained in:
Aedan Renner 2014-09-30 08:50:31 -07:00
parent b3a1d3e39a
commit 3a7af64d8c
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mwan3-luci/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-mwan3 PKG_NAME:=luci-app-mwan3
PKG_VERSION:=1.3 PKG_VERSION:=1.3
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=Aedan Renner <chipdankly@gmail.com> PKG_MAINTAINER:=Aedan Renner <chipdankly@gmail.com>
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

10
net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policy.lua
View file

@ -72,12 +72,12 @@ last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last reso
last_resort.rawhtml = true last_resort.rawhtml = true
function last_resort.cfgvalue(self, s) function last_resort.cfgvalue(self, s)
local str = self.map:get(s, "last_resort") local str = self.map:get(s, "last_resort")
if str == "unreachable" or str == "" or str == null then if str == "blackhole" then
return "unreachable (reject)"
elseif str == "blackhole" then
return "blackhole (drop)" return "blackhole (drop)"
elseif str == "main" then elseif str == "default" then
return "main (use main routing table)" return "default (use main routing table)"
else
return "unreachable (reject)"
end end
end end

2
net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policyconfig.lua
View file

@ -50,7 +50,7 @@ last_resort = mwan_policy:option(ListValue, "last_resort", translate("Last resor
last_resort.default = "unreachable" last_resort.default = "unreachable"
last_resort:value("unreachable", translate("unreachable (reject)")) last_resort:value("unreachable", translate("unreachable (reject)"))
last_resort:value("blackhole", translate("blackhole (drop)")) 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 ------ -- -- ------ currently configured members ------ --

5
net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_ruleconfig.lua
View file

@ -83,8 +83,9 @@ proto = mwan_rule:option(Value, "proto", translate("Protocol"),
use_policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned")) use_policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned"))
cbi_add_policy(use_policy) cbi_add_policy(use_policy)
use_policy:value("unreachable") use_policy:value("unreachable", translate("unreachable (reject)"))
use_policy:value("default") use_policy:value("blackhole", translate("blackhole (drop)"))
use_policy:value("default", translate("default (use main routing table)"))
-- ------ currently configured policies ------ -- -- ------ currently configured policies ------ --