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

Fixes scope for nEdge system_config functions

Browse source
This commit is contained in:
Simone Mainardi 2021-01-13 17:47:03 +01:00
parent 21a009c653
commit 28cc873d43
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -398,7 +398,7 @@ function appliance_config:_guess_config()
netmask = "255.255.255.0"
else
-- The device has an IP address
local addresses = getAllInterfaceAddresses(a)
local addresses = system_config.getAllInterfaceAddresses(a)
for _, addr in pairs(addresses) do
if addr.ip == ip_devs[a] then
netmask = addr.netmask

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

@ -354,7 +354,7 @@ local function isInterfaceUp(ifname)
end
-- returns all the IP addresses associated to one interface
local function getAllInterfaceAddresses(ifname)
function system_config.getAllInterfaceAddresses(ifname)
local res = sys_utils.execShellCmd("ip addr show ".. ifname .." | grep -Po 'inet \\K[\\d.]+/[\\d]+'")
local rv = {}
@ -378,7 +378,7 @@ end
-- available excluding the recovery IP
function system_config:getInterfaceAddress(ifname)
local recovery_conf = self:getLanRecoveryIpConfig()
local addresses = getAllInterfaceAddresses(ifname)
local addresses = system_config.getAllInterfaceAddresses(ifname)
for _, addr in ipairs(addresses) do
if addr.ip ~= recovery_conf.ip then
@ -744,7 +744,7 @@ end
-- ##############################################
local function gatewayGetInterface(gateway)
function system_config.gatewayGetInterface(gateway)
-- Useful to find the interface which would route traffic to some address
local res = sys_utils.execShellCmd("ip route get " .. gateway)
@ -754,7 +754,7 @@ local function gatewayGetInterface(gateway)
end
-- TODO use more reliable information
local function ifaceGetNetwork(iface)
function system_config.ifaceGetNetwork(iface)
local res = sys_utils.execShellCmd("ip route show | grep \"scope link\" | grep \"proto kernel\" | grep \"" .. iface .. "\"")
if not isEmptyString(res) then
@ -1062,7 +1062,7 @@ end
-- ##############################################
-- Find interfaces with IP configured
function system_config.get_ip_interfaces()
function system_config.get_ip_interfaces()
local ip_devs = system_config._split_dev_names('ip addr | awk \'$1 == "inet" && $7 { split( $2, addr, "/" ); print $7, addr[1] }\'', " ")
return ip_devs
end