From 589ea56efaa087811c2bf0cf37781843f9992c51 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 6 Feb 2012 23:17:32 +0100
Subject: make SipSak work with sip servers implementing OPTIONS

---
 CHANGES                        |  2 ++
 lib/Smokeping/probes/SipSak.pm | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index ed31fe7..e8944a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+* Make SipSak work with sip services actually implementing OPTIONS -- tobi
+
 2012/01/11 -- released version 2.6.7
 
 * be more careful in handling input from the web to prevent xss. Thanks to
diff --git a/lib/Smokeping/probes/SipSak.pm b/lib/Smokeping/probes/SipSak.pm
index 9e6c3a2..25f1649 100644
--- a/lib/Smokeping/probes/SipSak.pm
+++ b/lib/Smokeping/probes/SipSak.pm
@@ -73,14 +73,23 @@ sub pingone {
     shift @reply;
 
     my $filter = '.*';
+    $self->do_debug("SipSak: got ".(scalar @reply)." replies, expected $pingcount");
     if (scalar @reply > $pingcount){
-        $filter = $keep eq 'yes' ? 'final' : 'provisional';
+        $filter = $keep eq 'yes' ? 'final received' : 'provisional received';
     }
     for my $item (@reply){
-        next unless $item =~ /$filter/;
-        if (/^(?:\s+and|\sreceived\safter)\s(\d+(?:\.\d+))\sms\s/){
+        $self->do_debug("SipSak: looking at '$item'");
+        if (not $item =~ /$filter/){
+            $self->do_debug("SipSak: skipping as there was not match for $filter");
+            next;
+        }
+        if ($item =~ /(?:\sand|\sreceived\safter)\s(\d+(?:\.\d+)?)\sms\s/){
+            $self->do_debug("SipSak: match");
             push @times,$1/1000;
         }
+        else {
+            $self->do_debug("SipSak: no match");
+        }
     }
     return sort { $a <=> $b } @times;
 }
-- 
cgit v1.2.3-24-g4f1b