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

Properly handles Host os without shadows

Browse source
This commit is contained in:
Simone Mainardi 2019-01-25 14:28:15 +01:00
parent 50e32be5a7
commit d187b82560
10 changed files with 80 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/lua/modules/delete_data_utils.lua
View file

@ -62,19 +62,20 @@ end
local function delete_host_redis_keys(interface_id, host_info)
local status = "OK"
local hostkey = hostinfo2hostkey(host_info, nil, true)
local serialized_k, dns_k, devnames_k, devtypes_k
local serialized_k, dns_k, devnames_k, devtypes_k, drop_k, label_k, dhcp_k
if not isMacAddress(host_info["host"]) then
-- this is an IP address, see HOST_SERIALIZED_KEY (ntop_defines.h)
serialized_k = string.format("ntopng.serialized_hosts.ifid_%u__%s@%d", interface_id, host_info["host"], host_info["vlan"] or "0")
dns_k = string.format("ntopng.dns.cache.%s", host_info["host"]) -- neither vlan nor ifid implemented for the dns cache
elseif isIPv4(host_info["host"]) or isIPv6(host_info["host"]) then
drop_k = "ntopng.prefs.drop_host_traffic"
label_k = "ntopng.host_labels"
else
-- is a mac address, see MAC_SERIALIED_KEY (see ntop_defines.h)
serialized_k = string.format("ntopng.serialized_macs.ifid_%u__%s", interface_id, host_info["host"])
devnames_k = string.format("ntopng.cache.devnames.%s", host_info["host"])
devtypes_k = string.format("ntopng.prefs.device_types.%s", host_info["host"])
ntop.delHashCache("ntopng.prefs.drop_host_traffic", hostkey)
dhcp_k = getDhcpNamesKey(interface_id)
end
if not dry_run then
@ -82,7 +83,9 @@ local function delete_host_redis_keys(interface_id, host_info)
if devnames_k then ntop.delCache(devnames_k) end
if devtypes_k then ntop.delCache(devtypes_k) end
if dns_k then ntop.delCache(dns_k) end
ntop.delHashCache("ntopng.host_labels", hostkey)
if dhcp_k then ntop.delHashCache(dhcp_k, host_info["host"]) end
if drop_k then ntop.delHashCache(drop_k, hostkey) end
if label_k then ntop.delHashCache(label_k, hostkey) end
end
return {status = status}