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

Improved network discovery

Browse source
This commit is contained in:
Luca Deri 2018-03-08 10:34:42 +01:00
parent 66ac40e598
commit 10e541c34f
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/lua/modules/discover_utils.lua
View file

@ -397,7 +397,7 @@ local function findDevice(ip, mac, manufacturer, _mdns, ssdp_str, ssdp_entries,
return 'workstation', discover.asset_icons['workstation']..' (Windows)', nil
elseif(mdns["_workstation._tcp.local"] ~= nil) then
interface.setMacOperatingSystem(mac, 1) -- 1 = Linux
-- return 'workstation', discover.asset_icons['workstation']..' (Linux)', nil
return 'workstation', discover.asset_icons['workstation']..' (Linux)', nil
else
interface.setMacOperatingSystem(mac, 0) -- Unknown
end
@ -586,11 +586,18 @@ local function findDevice(ip, mac, manufacturer, _mdns, ssdp_str, ssdp_entries,
return 'networking', discover.asset_icons['networking'], nil
end
if((ssdp["_printer._tcp.local"] ~= nil)
or (ssdp["_scanner._tcp.local"] ~= nil)) then
if((mdns["_printer._tcp.local"] ~= nil) or (mdns["_scanner._tcp.local"] ~= nil)) then
return 'printer', discover.asset_icons['printer'], nil
end
if((mdns["_edcp._udp.local"] ~= nil) or (mdns["_afpovertcp._tcp.local"] ~= nil) or (mdns["_smb._tcp.local"] ~= nil)) then
return 'nas', discover.asset_icons['nas'], nil
end
if(discover.debug) then
tprint(ssdp)
tprint(mdns)
end
return 'unknown', "", nil
end
@ -765,7 +772,7 @@ function discovery2config(interface_name)
if(disc) then
for _,dev in pairs(disc.devices) do
if(dev.device_type.."" ~= "unknown") then
io.write(dev.mac .. " = " .. dev.device_type .. "\n")
-- io.write(dev.mac .. " = " .. dev.device_type .. "\n")
end
end
end