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

DHCP (via ZMQ) Fixes for #7972

Browse source 
The symbolic hostname will use the DHCP name before the DNS resolved name
This commit is contained in:
Luca Deri 2024-05-02 21:46:03 +02:00
parent a3baa4be71
commit db38a5d2d5
7 changed files with 81 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,9 +57,9 @@ function flowinfo2hostname(flow_info, host_type, alerts_view, add_hostname)
-- do not return resolved name as it will hide the IP address
return(flow_info[host_type..".ip"])
end
if(flow_info == nil) then return("") end
if(host_type == "srv") then
if flow_info["host_server_name"] ~= nil and flow_info["host_server_name"] ~= "" and flow_info["host_server_name"]:match("%w") and not isIPv4(flow_info["host_server_name"]) and not isIPv6(flow_info["host_server_name"]) then
-- remove possible ports from the name
@ -69,7 +69,7 @@ function flowinfo2hostname(flow_info, host_type, alerts_view, add_hostname)
return(flow_info["protos.tls.certificate"])
end
end
local hostinfo = {
host = flow_info[host_type..".ip"],
label = flow_info[host_type..".host"],
@ -78,7 +78,7 @@ function flowinfo2hostname(flow_info, host_type, alerts_view, add_hostname)
broadcast_domain_host = flow_info[host_type..".broadcast_domain_host"],
vlan = flow_info["vlan"],
}
return(hostinfo2label(hostinfo, true, false, true))
end
@ -166,10 +166,7 @@ end
-- ##############################################
-- Just a convenience function for hostinfo2label with only IP and VLAN
function ip2label(ip, vlan, shorten_len)
return hostinfo2label({
host = ip,
vlan = (vlan or 0)
}, true, shorten_len)
return hostinfo2label({ host = ip, vlan = (vlan or 0) }, true, shorten_len)
end
-- ##############################################