vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

System DNS configuration

Browse source
This commit is contained in:
Alfredo Cardigliano 2020-11-26 19:34:10 +01:00
parent 72502711ea
commit 159564bd95
5 changed files with 130 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

54
scripts/lua/modules/system_config/system_config.lua
View file

@ -600,6 +600,19 @@ function system_config:_writeNetworkInterfaceConfig(f, iface, network_conf, brid
self.conf_handler.writeNetworkInterfaceConfig(f, iface, network_conf, dns_config, bridge_ifaces)
end
function system_config:_writePassiveModeNetworkConfig(f)
local network_config = self.config.interfaces.configuration
local mode_config = self.config.globals.available_modes["passive"]
-- Lan interface
self:_writeNetworkInterfaceConfig(f, mode_config.lan, network_config[mode_config.lan].network)
-- Capture interfaces
-- for _, iface in ipairs(mode_config.interfaces.wan) do
-- self:_writeNetworkInterfaceConfig(f, iface, {mode="manual"})
-- end
end
function system_config:_writeBridgeModeNetworkConfig(f)
local network_config = self.config.interfaces.configuration
local mode_config = self.config.globals.available_modes["bridging"]
@ -661,7 +674,9 @@ function system_config:_writeNetworkInterfaces()
self:_writeNetworkInterfaceConfig(f, "lo", {mode="loopback"})
end
if mode == "bridging" then
if mode == "passive" then
self:_writePassiveModeNetworkConfig(f)
elseif mode == "bridging" then
self:_writeBridgeModeNetworkConfig(f)
elseif mode == "routing" then
self:_writeRoutingModeNetworkConfig(f)
@ -839,24 +854,6 @@ end
-- ##############################################
local function findDnsPreset(preset_name)
require("prefs_utils")
for _, preset in pairs(DNS_PRESETS) do
if preset.id == preset_name then
return preset
end
end
return nil
end
function system_config:_get_default_global_dns_preset()
return findDnsPreset("google")
end
-- ##############################################
function system_config:getDnsConfig()
return self.config.globals.dns
end
@ -887,13 +884,6 @@ end
-- ##############################################
-- nf_config overrides this
function system_config:isMultipathRoutingEnabled()
return false
end
-- ##############################################
-- NOTE: can't rely on the main routing table when having multiple gateways!
function system_config._interface_get_default_gateway(iface)
local res = sys_utils.execShellCmd("ip route show | grep \"^default via\" | grep \"" .. iface .. "\"")
@ -1053,6 +1043,18 @@ end
-- ##############################################
-- Find the wan interface reading the default gw
function system_config.get_default_gw_interface()
local dev = sys_utils.execShellCmd("ip route show | grep \"default via\" | awk '{printf \"%s\", $5}'")
if not isEmptyString(dev) then
return dev
end
return nil
end
-- ##############################################
-- nf_config and appliance_config override this
function system_config:_guess_config()
local config = {}