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

Merge pull request #1905 from ldir-EDB0/bcp38

Browse source 
luci-app=bcp38: improve interface selection dropdown
This commit is contained in:
Jo-Philipp Wich 2018-06-23 10:01:42 +02:00 committed by GitHub
commit a65d55ebce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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