From cef00a141fcccd95c3eaaac5e05d1b2aead6b49f Mon Sep 17 00:00:00 2001
From: Tobi Oetiker <tobi@oetiker.ch>
Date: Wed, 20 Sep 2006 19:16:30 +0000
Subject: fixed FTPtransfer probe to use srcfile as default for destfile.

---
 CHANGES                             | 3 ++-
 Makefile                            | 4 ++--
 bin/smokeping.dist                  | 2 +-
 bin/tSmoke.dist                     | 2 +-
 htdocs/smokeping.cgi.dist           | 2 +-
 lib/Smokeping.pm                    | 2 +-
 lib/Smokeping/probes/FTPtransfer.pm | 6 +++---
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index c7cdaca..4904c51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
+2006/9/20 -- released version 2.0.906
 
-
+* in FTPtransfer probe set destfilename to srcfilename if it is empty
 * alerts can now have a priority. if multiple prioritized alerts match,
   only the one with the highest priority will cause any action. Alerts
   without priority setting are not affected eitherway. --tobi
diff --git a/Makefile b/Makefile
index 3adee5c..05ae0d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 SHELL = /bin/sh
-VERSION = 2.0.905
+VERSION = 2.0.906
 ############ A is for features
 ############ B is for bugfixes
 ############ V.AAABBB
 ############ 2.000001
 ############ 2.000002
-NUMVERSION = 2.000905
+NUMVERSION = 2.000906
 IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|\.svn|tar\.gz|DEADJOE
 GROFF = groff
 PERL = perl
diff --git a/bin/smokeping.dist b/bin/smokeping.dist
index ec6501b..9a7726b 100755
--- a/bin/smokeping.dist
+++ b/bin/smokeping.dist
@@ -4,7 +4,7 @@
 use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
 use lib qw(lib);
 
-use Smokeping 2.000904;
+use Smokeping 2.000906;
  
 Smokeping::main("etc/config.dist");
 
diff --git a/bin/tSmoke.dist b/bin/tSmoke.dist
index e1aa915..d29a288 100755
--- a/bin/tSmoke.dist
+++ b/bin/tSmoke.dist
@@ -53,7 +53,7 @@ use strict;
 use lib qw(lib);
 use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 
-use Smokeping 2.000904;
+use Smokeping 2.000906;
 use Net::SMTP;
 use Getopt::Long;
 use Pod::Usage;
diff --git a/htdocs/smokeping.cgi.dist b/htdocs/smokeping.cgi.dist
index c08a03f..eb6fc24 100755
--- a/htdocs/smokeping.cgi.dist
+++ b/htdocs/smokeping.cgi.dist
@@ -5,7 +5,7 @@ use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
 use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 use CGI::Carp qw(fatalsToBrowser);
 
-use Smokeping 2.000904;
+use Smokeping 2.000906;
 
 Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 5535df1..b64c50a 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -28,7 +28,7 @@ use Smokeping::RRDtools;
 
 # globale persistent variables for speedy
 use vars qw($cfg $probes $VERSION $havegetaddrinfo $cgimode);
-$VERSION="2.000904";
+$VERSION="2.000906";
 
 # we want opts everywhere
 my %opt;
diff --git a/lib/Smokeping/probes/FTPtransfer.pm b/lib/Smokeping/probes/FTPtransfer.pm
index d3dd41d..6be72fc 100644
--- a/lib/Smokeping/probes/FTPtransfer.pm
+++ b/lib/Smokeping/probes/FTPtransfer.pm
@@ -75,7 +75,7 @@ DOC
 sub ProbeDesc ($) {
         my $self = shift;  
         my $srcfile = $self->{properties}{srcfile};
-        my $destfile = $self->{properties}{destfile};
+        my $destfile = $self->{properties}{destfile} || $self->{properties}{srcfile};
         my $mode = $self->{properties}{mode};
 	my $size = $mode eq 'get' ? -s $destfile : -s $srcfile;
 	return sprintf("FTP File transfers (%.0f KB)",$size/1024);
@@ -95,7 +95,7 @@ sub pingone {
 	my $vars = $target->{vars};
 	my $mininterval = $self->{properties}{min_interval};
 	my $srcfile = $self->{properties}{srcfile};
-	my $destfile = $self->{properties}{destfile};
+	my $destfile = $self->{properties}{destfile} || $self->{properties}{srcfile};
 	my $mode = $self->{properties}{mode};
 	my $username = $vars->{username};
 
@@ -174,7 +174,7 @@ DOC
 		destfile => {
 			_doc => <<DOC,
 Normally the destination filename is the same as the source filename. If you keep files in different directories
-this may not work, and you have to specify a destfilename as well.
+this may not work, and you have to specify destfile as well.
 DOC
 			_example => 'destinationfile',
 		},
-- 
cgit v1.2.3-24-g4f1b