From f7520e9d2710026e7e154503fdba5e8a1751423a Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@iki.fi>
Date: Mon, 14 Nov 2005 22:09:54 +0000
Subject: * lib/Smokeping/probes/FPing.pm,   doc/smokeping_upgrade.pod,  
 CHANGES:   + remove the FPing 'timeout' variable, since it never really did
 anything

---
 CHANGES                       |  2 ++
 doc/smokeping_upgrade.pod     | 10 ++++++++++
 lib/Smokeping/probes/FPing.pm | 12 ------------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8b277fd..7738785 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+* remove the FPing 'timeout' variable, since it never really did anything
+  -- niko
 * use the 'cgiurl' variable from the 'General' section for all CGI self-refering 
   links -- niko, from Christian Hammers <ch .*debian.org> (Debian bug #339019)
 
diff --git a/doc/smokeping_upgrade.pod b/doc/smokeping_upgrade.pod
index 34feea2..3b73861 100644
--- a/doc/smokeping_upgrade.pod
+++ b/doc/smokeping_upgrade.pod
@@ -23,6 +23,16 @@ An official list of changes with each release can be found in the CHANGES
 file in the Smokeping distribution. This document tries to complement
 that with upgrading instructions etc.
 
+=head1 2.0.4 to 2.0.5
+
+=head2 L<FPing|Smokeping::probes::FPing>
+
+The 'timeout' variable has been removed.
+It was used to give the C<fping> command the C<-t> parameter,
+but as this parameter is only effective in C<fping>'s I<default> mode,
+while Smokeping uses the I<counting> mode (C<-c>), it never actually
+did anything.
+
 =head1 2.0.1 to 2.0.2
 
 =head2 Edge-triggered alerts
diff --git a/lib/Smokeping/probes/FPing.pm b/lib/Smokeping/probes/FPing.pm
index e7d2a4c..9391849 100644
--- a/lib/Smokeping/probes/FPing.pm
+++ b/lib/Smokeping/probes/FPing.pm
@@ -104,7 +104,6 @@ sub ping ($){
     return unless @{$self->addresses};
     my @params = () ;
     push @params , "-b$self->{properties}{packetsize}" if $self->{properties}{packetsize};
-    push @params, "-t" . int(1000 * $self->{properties}{timeout}) if $self->{properties}{timeout};
     push @params, "-i" . int(1000 * $self->{properties}{mininterval});
     push @params, "-p" . int(1000 * $self->{properties}{hostinterval}) if $self->{properties}{hostinterval};
     my @cmd = (
@@ -157,17 +156,6 @@ sub probevars {
 			},
 			_doc => "The ping packet size (in the range of 12-64000 bytes).",
 
-		},
-		timeout => {
-			_re => '(\d*\.)?\d+',
-			_example => 1.5,
-			_doc => <<DOC,
-The fping "-t" parameter, but in (possibly fractional) seconds rather than
-milliseconds, for consistency with other Smokeping probes. From fping(1):
-
-Initial target timeout. In the default mode, this is  the  amount  of  time  that
-ping waits for a response to its first request.  Successive timeouts are multiplied by the backoff factor.
-DOC
 		},
 		hostinterval => {
 			_re => '(\d*\.)?\d+',
-- 
cgit v1.2.3-24-g4f1b