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

luci-app-bcp38: improve interface selection dropdown

Browse source 
Certain types of interface were excluded from bcp38's concept of
upstream wan interface e.g. pppoa-wan

Shamelessly copies the interface list generation from luci-app-sqm which
solved exactly the same problem and gives additional clues by displaying
the firewall zone (typically wan/lan etc)

Run-tested-on: DGN3500

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2018-06-23 08:43:00 +01:00
parent 5142e40f9e
commit 65cfbd8f75
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua
View file

@ -14,7 +14,8 @@ $Id$
local wa = require "luci.tools.webadmin" local wa = require "luci.tools.webadmin"
local net = require "luci.model.network".init() local net = require "luci.model.network".init()
local ifaces = net:get_interfaces() local sys = require "luci.sys"
local ifaces = sys.net:devices()
m = Map("bcp38", translate("BCP38"), m = Map("bcp38", translate("BCP38"),
translate("This function blocks packets with private address destinations " .. translate("This function blocks packets with private address destinations " ..
@ -37,10 +38,17 @@ a.rmempty = false
n = s:option(ListValue, "interface", translate("Interface name"), translate("Interface to apply the blocking to " .. n = s:option(ListValue, "interface", translate("Interface name"), translate("Interface to apply the blocking to " ..
"(should be the upstream WAN interface).")) "(should be the upstream WAN interface)."))
for _, iface in ipairs(ifaces) do for _, iface in ipairs(ifaces) do
if iface:is_up() then if not (iface == "lo" or iface:match("^ifb.*")) then
n:value(iface:name()) local nets = net:get_interface(iface)
end nets = nets and nets:get_networks() or {}
for k, v in pairs(nets) do
nets[k] = nets[k].sid
end
nets = table.concat(nets, ",")
n:value(iface, ((#nets > 0) and "%s (%s)" % {iface, nets} or iface))
end
end end
n.rmempty = false n.rmempty = false