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

Updates sat. compatibility

This commit is contained in:
fbsanchez 2020-04-01 18:16:57 +02:00
parent e249233205
commit bb1ad4d2a9
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/lib/PandoraFMS/Recon/Base.pm
View File

@ -1421,6 +1421,8 @@ sub scan_subnet($) {
# By default 200, (20 * 10) # By default 200, (20 * 10)
my $host_block_size = $self->{'block_size'}; my $host_block_size = $self->{'block_size'};
$host_block_size = 50 unless defined($self->{'block_size'});
# The first 50% of the recon task approx. # The first 50% of the recon task approx.
my $step = 25.0 / scalar(@subnets) / (($total_hosts / $host_block_size)+1); my $step = 25.0 / scalar(@subnets) / (($total_hosts / $host_block_size)+1);
my $subnet_step = 50.0 / (($total_hosts / $host_block_size)+1); my $subnet_step = 50.0 / (($total_hosts / $host_block_size)+1);

2
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -1453,6 +1453,8 @@ sub pandora_block_ping($@) {
my ($pa_config, @hosts) = @_; my ($pa_config, @hosts) = @_;
my ($cmd, $output); my ($cmd, $output);
return () if is_empty(@hosts);
if (-x $pa_config->{'fping'}) { if (-x $pa_config->{'fping'}) {
# fping timeout in milliseconds # fping timeout in milliseconds
$cmd = $pa_config->{'fping'} . " -a -q -t " . (1000 * $pa_config->{'networktimeout'}) . " " . (join (' ', @hosts)); $cmd = $pa_config->{'fping'} . " -a -q -t " . (1000 * $pa_config->{'networktimeout'}) . " " . (join (' ', @hosts));