* 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

1 files changed, 4 insertions, 3 deletions

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;
 }