From 59d4b9d1f079ae9d49ecf4b8dbb97f7b3c3f3e38 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 10 Sep 2015 09:08:13 +0200 Subject: [PATCH] Use NetAddr::IP and pandora_ping for network scans. (cherry picked from commit 8b5e103d57917851011d1f8a54d6d15b547e54f3) --- .../util/recon_scripts/snmp-recon.pl | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pandora_server/util/recon_scripts/snmp-recon.pl b/pandora_server/util/recon_scripts/snmp-recon.pl index 74c3c69d61..071d65884a 100755 --- a/pandora_server/util/recon_scripts/snmp-recon.pl +++ b/pandora_server/util/recon_scripts/snmp-recon.pl @@ -10,6 +10,7 @@ use lib '/usr/lib/perl5'; use POSIX qw/strftime/; use Socket qw/inet_aton/; +use NetAddr::IP; use PandoraFMS::Tools; use PandoraFMS::DB; @@ -1117,15 +1118,18 @@ if (defined($ROUTER) && $ROUTER ne '') { } } else { - my $np = new PandoraFMS::NmapParser; - if ($#SUBNETS >= 0) { - $np->parsescan($CONF{'nmap'}, '-nsL', @SUBNETS); + foreach my $subnet (@SUBNETS) { + my $net_addr = new NetAddr::IP ($subnet); + if (!defined($net_addr)) { + message("Invalid network: $subnet"); + exit 1; + } - my @scanned_hosts = $np->get_ips(); - foreach my $host (@scanned_hosts) { + my @hosts = map { (split('/', $_))[0] } $net_addr->hostenum; + foreach my $host (@hosts) { - # Skip network and broadcast addresses. - next if ($host =~ m/(\.0$)|(\.255$)/); + # Check if the device has already been visited. + next if (defined($VISITED_DEVICES{$host})); # Check if the host is up. next if (pandora_ping(\%CONF, $host, 1, 1) == 0);