tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2014-04-04 Ramon Novoa <rnovoa@artica.es> 

* util/recon_scripts/snmp-recon.pl: Do not load MIB files (DISPLAY-HINTS may
	  cause MAC addresses to be displayed in a different format).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9722 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2014-04-04 09:31:44 +00:00
parent dc4774fe35
commit ac93b78aed
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2014-04-04 Ramon Novoa <rnovoa@artica.es>
* util/recon_scripts/snmp-recon.pl: Do not load MIB files (DISPLAY-HINTS may
cause MAC addresses to be displayed in a different format).
2014-04-04 Ramon Novoa <rnovoa@artica.es>
* util/recon_scripts/snmp-recon.pl: Lowered the number of retries.

11
pandora_server/util/recon_scripts/snmp-recon.pl
View File

@ -163,7 +163,7 @@ sub responds_to_snmp($) {
my ($target) = @_;
foreach my $community (@SNMP_COMMUNITIES) {
`snmpwalk -r2 -t0.1 -v1 -On -Oe -c $community $target .0 2>/dev/null`;
`snmpwalk -M/dev/null -r2 -t0.1 -v1 -On -Oe -c $community $target .0 2>/dev/null`;
if ($? == 0) {
$COMMUNITIES{$target} = $community;
return $community;
@ -180,7 +180,7 @@ sub snmp_get($$$) {
my ($target, $community, $oid) = @_;
my @output;
@output = `snmpwalk -r2 -t0.1 -v1 -On -Oe -c $community $target $oid 2>/dev/null`;
@output = `snmpwalk -M/dev/null -r2 -t0.1 -v1 -On -Oe -c $community $target $oid 2>/dev/null`;
return @output;
}
@ -836,8 +836,9 @@ $ROUTER = $ARGV[5] if defined($ARGV[5]);
$ALLIFACES = $ARGV[6] if defined($ARGV[6]);
$ALLIFACES = $ARGV[6] if defined($ARGV[6]);
# Read config file
# Read config filea and start logging.
pandora_load_config(\%CONF);
pandora_start_log(\%CONF);
# Connect to the DB
$DBH = db_connect ('mysql', $CONF{'dbname'}, $CONF{'dbhost'}, $CONF{'dbport'}, $CONF{'dbuser'}, $CONF{'dbpass'});
@ -928,5 +929,7 @@ foreach my $device (values(%VISITED_DEVICES)) {
}
}
delete_unused_connections(\%CONF, $DBH, $TASK_ID,\%CONNECTIONS);
# Do not delete unused connections unless at least one connection has been found
# (prevents the script from deleting connections if there has been a network outage).
delete_unused_connections(\%CONF, $DBH, $TASK_ID,\%CONNECTIONS) if (scalar(keys(%CONNECTIONS)) > 0);