Browse Source

Merge pull request #384 from arfett/master

mwan3-luci: update to 1.3-4
lilik-openwrt-22.03
sbyx 10 years ago
parent
commit
fdcde6150c
5 changed files with 11 additions and 9 deletions
  1. +1
    -1
      net/mwan3-luci/Makefile
  2. +1
    -0
      net/mwan3-luci/files/etc/hotplug.d/iface/16-mwan3custombak
  3. +5
    -5
      net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policy.lua
  4. +1
    -1
      net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_policyconfig.lua
  5. +3
    -2
      net/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan3/mwan3_ruleconfig.lua

+ 1
- 1
net/mwan3-luci/Makefile View File

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


+ 1
- 0
net/mwan3-luci/files/etc/hotplug.d/iface/16-mwan3custombak View File

@ -7,6 +7,7 @@ send_alert()
{
# variable "$1" stores the mwan3 status information
# insert your code here to send the contents of "$1"
echo "$1"
}
gather_event_info()


+ 5
- 5
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
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


+ 1
- 1
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: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 ------ --


+ 3
- 2
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"))
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 ------ --


Loading…
Cancel
Save