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

The default SNMP community used in discovery is now read from preferences and "public" is used only as fallback

Browse source
This commit is contained in:
Luca Deri 2018-01-07 16:29:13 +01:00
parent 5427a6735a
commit 2655d422e4
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -754,6 +754,12 @@ end
-- #############################################################################
function discover.discover2table(interface_name, recache)
local snmp_community = ntop.getPref("ntopng.prefs.default_snmp_community")
if isEmptyString(snmp_community) then
snmp_community = "public"
end
interface.select(interface_name)
if recache ~= true then
@ -792,14 +798,14 @@ function discover.discover2table(interface_name, recache)
interface.mdnsQueueNameToResolve(ip)
interface.snmpGetBatch(ip, "public", "1.3.6.1.2.1.1.5.0", 0)
interface.snmpGetBatch(ip, snmp_community, "1.3.6.1.2.1.1.5.0", 0)
if(string.contains(manufacturer, "HP")
or string.contains(manufacturer, "Hewlett Packard")
or string.contains(manufacturer, "Hon Hai")
) then
-- Query printer model
interface.snmpGetBatch(ip, "public", "1.3.6.1.2.1.25.3.2.1.3.1", 0)
interface.snmpGetBatch(ip, snmp_community, "1.3.6.1.2.1.25.3.2.1.3.1", 0)
end
else
local ip_addr = mac
@ -840,7 +846,7 @@ function discover.discover2table(interface_name, recache)
-- Query sysDescr for the hosts that have replied
for ip,rsp in pairsByValues(snmp, asc) do
-- io.write("Requesting sysDescr for "..ip.."\n")
interface.snmpGetBatch(ip, "public", "1.3.6.1.2.1.1.1.0", 0)
interface.snmpGetBatch(ip, snmp_community, "1.3.6.1.2.1.1.1.0", 0)
end
if(discover.debug) then io.write("Collecting MDNS OSX responses\n") end