From 61392b9e7c219438eb766c5be07a0d266f23a753 Mon Sep 17 00:00:00 2001
From: markusbloch <>
Date: Sat, 30 Jan 2016 13:38:34 +0000
Subject: [PATCH] FB_CALLMONITOR: optimize TR-064 error handling

git-svn-id: https://svn.fhem.de/fhem/trunk@10667 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/72_FB_CALLMONITOR.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm
index 06ea598c0..b2527e407 100755
--- a/fhem/FHEM/72_FB_CALLMONITOR.pm
+++ b/fhem/FHEM/72_FB_CALLMONITOR.pm
@@ -1243,8 +1243,8 @@ sub FB_CALLMONITOR_identifyPhoneBooksViaTR064($;$)
     </h:InitChallenge >
   </s:Header>
   <s:Body>
-    <u:SetEnable xmlns:u="urn:dslforum-org:service:X_AVM-DE_OnTel:1">
-    </u:SetEnable>
+   <u:$TR064_service_command xmlns:u="$TR064_service_type">
+   </u:$TR064_service_command>
   </s:Body>
 </s:Envelope>
 EOD
@@ -1274,6 +1274,13 @@ EOD
         return  "received no data after requesting available phonebooks via TR-064";
     }
     
+    unless($data =~ /<Nonce>/i and $data =~ /<Realm>/i)
+    {
+        Log3 $name, 3, "FB_CALLMONITOR ($name) - received no valid TR-064 challenge response. aborting";
+        Log3 $name, 5, "FB_CALLMONITOR ($name) - received no valid TR-064 challenge response: $data";
+        return  "received no valid TR-064 challenge response. aborting";
+    }
+    
     Log3 $name, 5, "FB_CALLMONITOR ($name) - received TR-064 challenge response:\n$data";
 
     my ($nonce, $realm);