summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--lib/Smokeping/probes/DismanPing.pm8
2 files changed, 7 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 6a6b063..ad3adc9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+* Integrated Disman probe ( DISMAN-PING-MIB: RFC Ping ) by Bill Fenner. This
+ work has been sponsored by Juniper.
+
* removed smoketrace support. this and more functionality is now provided by
remocular (www.remocular.org)
diff --git a/lib/Smokeping/probes/DismanPing.pm b/lib/Smokeping/probes/DismanPing.pm
index c264c31..4c53d2f 100644
--- a/lib/Smokeping/probes/DismanPing.pm
+++ b/lib/Smokeping/probes/DismanPing.pm
@@ -55,8 +55,8 @@ This probe requires read/write access to the pingCtlTable.
It also requires read-only access to the pingResultsTable and the
pingHistoryTable. The DISMAN-PING-MIB is structured such that
it is possible to restrict by pingCtlOwnerIndex. This probe
-uses a pingCtlOwnerIndex of "SP on hostname ICPM ping"
-by default; use B<ownerindex> to configure this if needed.
+uses a pingCtlOwnerIndex of "SP on hostname"
+as ownerindex by default; use B<ownerindex> to configure this if needed.
${e}head2 SAMPLE JUNOS CONFIGURATION
@@ -413,9 +413,9 @@ sub ping($) {
# get a unique test name.
sub idx ($) {
my $t = shift;
- my $ownerindex = substr($t->{vars}{ownerindex} || 'SP on '.hostname().' ICMP ping',0,32);
+ my $ownerindex = substr($t->{vars}{ownerindex} || 'SP on '.hostname(),0,32);
print STDERR $ownerindex;
- my $testname = $t->{vars}{host};
+ my $testname = substr($t->{vars}{host} . ' ICMP ping',0,32);
return join( ".",
length($ownerindex), unpack( "C*", $ownerindex ),
length($testname), unpack( "C*", $testname )