vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve passive mode interface selection

Browse source
This commit is contained in:
Alfredo Cardigliano 2020-11-24 12:22:22 +01:00
parent 9a37185c79
commit a9ecc7be54
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
scripts/lua/modules/system_config/appliance_config.lua
View file

@ -82,12 +82,12 @@ end
-- nf_config overrides this
function appliance_config:getPhysicalLanInterfaces()
local mode = self:getOperatingMode()
if not mode then return {} end
if mode == "passive" then
return { self.config.globals.available_modes[mode].interfaces.lan, }
elseif mode == "bridging" then
return self.config.globals.available_modes[mode].interfaces.lan
else
return {}
end
end
@ -95,11 +95,9 @@ end
-- nf_config and appliance_config overrides this
function appliance_config:getPhysicalWanInterfaces()
local mode = self:getOperatingMode()
if not mode or mode == "passive" then
return {}
else
return self.config.globals.available_modes.bridging.interfaces.wan
end
if not mode then return {} end
return self.config.globals.available_modes[mode].interfaces.wan
end
-- ##############################################
@ -263,15 +261,23 @@ function appliance_config:_guess_config()
local passive = {}
if(wired_default ~= nil) then
local management = nil
if wan_iface then
management = wan_iface
elseif table.len(wired) > 1 then
management = wired[0]
end
if management ~= nil then
passive["interfaces"] = {}
passive["interfaces"]["lan"] = management
passive["interfaces"]["wan"] = {}
passive["interfaces"]["unused"] = {}
passive["interfaces"]["lan"] = wired_default
passive["comment"] = "Passive monitoring appliance"
for a, b in pairsByKeys(wired) do
if a ~= wired_default then
table.insert(passive["interfaces"]["unused"], a)
if a ~= passive["interfaces"]["lan"] then
-- table.insert(passive["interfaces"]["unused"], a)
table.insert(passive["interfaces"]["wan"], a)
end
end