* fixed parsing of slaves statements in config file, broeken since I seemingly relaxed the hostname constraints.

* removed all online testing from Curl and EchoPing probes

6 files changed, 15 insertions, 16 deletions

diff --git a/lib/Smokeping/probes/Curl.pm b/lib/Smokeping/probes/Curl.pm
index ee8541b..7328e35 100644
--- a/lib/Smokeping/probes/Curl.pm
+++ b/lib/Smokeping/probes/Curl.pm
@@ -202,16 +202,14 @@ sub test_usage {
 
 	my $arghashref = $self->features;
 	my %arghash = %$arghashref;
-
+        my $curl_man = `$bin --manual`;
 	for my $feature (keys %arghash) {
-		system("$bin $arghash{$feature} 1 0.0.0.1 >/dev/null 2>&1");
-		if ($? == 2) {
-			push @unsupported, $feature;
-			$self->do_log("Note: your curl doesn't support the $feature feature (option $arghash{$feature}), disabling it");
-		}
+		next if $curl_man =~ /\Q$arghash{$feature}/;
+        	push @unsupported, $feature;
+		$self->do_log("Note: your curl doesn't support the $feature feature (option $arghash{$feature}), disabling it");
 	}
 	map { delete $arghashref->{$_} } @unsupported;
-	if (`$bin -o /dev/null -w '<%{time_redirect}>\n' 0.0.0.1 2>&1` =~ /^<>/m) {
+	if ($curl_man !~ /\stime_redirect\s/) {
 		$self->do_log("Note: your curl doesn't support the 'time_redirect' output variable; 'include_redirects' will not function.");
 	}
 	return;
diff --git a/lib/Smokeping/probes/EchoPing.pm b/lib/Smokeping/probes/EchoPing.pm
index 4be5a0d..95d1a6e 100644
--- a/lib/Smokeping/probes/EchoPing.pm
+++ b/lib/Smokeping/probes/EchoPing.pm
@@ -88,15 +88,16 @@ sub test_usage {
 
 	my $arghashref = $self->features;
 	my %arghash = %$arghashref;
-
 	for my $feature (keys %arghash) {
-		if (`$bin $arghash{$feature} 1 0.0.0.1 2>&1` =~ /invalid option|usage/i) {
+                # when the option is invalid, then echoping would
+                # complain. if it is valid, then it will just display
+                # the usage message.
+		if (`$bin $arghash{$feature} 2>&1` !~ /^Usage/i) {
 			push @unsupported, $feature;
 			$self->do_log("Note: your echoping doesn't support the $feature feature (option $arghash{$feature}), disabling it");
 		}
 	}
 	map { delete $arghashref->{$_} } @unsupported;
-
 	return;
 }
 
diff --git a/lib/Smokeping/probes/EchoPingChargen.pm b/lib/Smokeping/probes/EchoPingChargen.pm
index 53f4386..a75153d 100644
--- a/lib/Smokeping/probes/EchoPingChargen.pm
+++ b/lib/Smokeping/probes/EchoPingChargen.pm
@@ -46,7 +46,7 @@ sub test_usage {
 	my $self = shift;
 	my $bin = $self->{properties}{binary};
 	croak("Your echoping binary doesn't support CHARGEN")
-		if `$bin -c 2>&1 0.0.0.1` =~ /(usage|not compiled|invalid option)/i;
+		if `$bin -c 2>&1` !~ /^Usage/i;
 	$self->SUPER::test_usage;
 	return;
 }
diff --git a/lib/Smokeping/probes/EchoPingDiscard.pm b/lib/Smokeping/probes/EchoPingDiscard.pm
index 2970232..490d373 100644
--- a/lib/Smokeping/probes/EchoPingDiscard.pm
+++ b/lib/Smokeping/probes/EchoPingDiscard.pm
@@ -46,7 +46,7 @@ sub test_usage {
 	my $self = shift;
 	my $bin = $self->{properties}{binary};
 	croak("Your echoping binary doesn't support DISCARD")
-		if `$bin -d 0.0.0.1 2>&1` =~ /(not compiled|invalid option|usage)/i;
+		if `$bin -d  2>&1`  !~ /^Usage/i;
 	$self->SUPER::test_usage;
 	return;
 }
diff --git a/lib/Smokeping/probes/EchoPingHttp.pm b/lib/Smokeping/probes/EchoPingHttp.pm
index 7107de6..2f5ea32 100644
--- a/lib/Smokeping/probes/EchoPingHttp.pm
+++ b/lib/Smokeping/probes/EchoPingHttp.pm
@@ -88,13 +88,13 @@ sub test_usage {
 	my $self = shift;
 	my $bin = $self->{properties}{binary};
 	croak("Your echoping binary doesn't support HTTP")
-		if `$bin -h / 0.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i;
-	if (`$bin -a -h / 0.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) {
+		if `$bin -h /  2>&1`  !~ /^Usage/;
+	if (`$bin -a -h /  2>&1`  !~ /^Usage/) {
 		carp("Note: your echoping binary doesn't support revalidating (-a), disabling it");
 		$self->{_disabled}{a} = undef;
 	}
 
-	if (`$bin -A -h / 0.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) {
+	if (`$bin -A -h /  2>&1`  !~ /^Usage/) {
 		carp("Note: your echoping binary doesn't support ignoring cache (-A), disabling it");
 		$self->{_disabled}{A} = undef;
 	}
diff --git a/lib/Smokeping/probes/EchoPingSmtp.pm b/lib/Smokeping/probes/EchoPingSmtp.pm
index a65b97c..74f7a64 100644
--- a/lib/Smokeping/probes/EchoPingSmtp.pm
+++ b/lib/Smokeping/probes/EchoPingSmtp.pm
@@ -54,7 +54,7 @@ sub test_usage {
 	my $self = shift;
 	my $bin = $self->{properties}{binary};
 	croak("Your echoping binary doesn't support SMTP")
-		if `$bin -S 0.0.0.1 2>&1` =~ /(not compiled|invalid option|usage)/i;
+		if `$bin -S  2>&1`  !~ /^Usage/;
 	$self->SUPER::test_usage;
 	return;
 }