From d70e2e83d1b47df3e068592fab9628f13bb8d8fd Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sat, 17 Aug 2013 06:45:31 +0000
Subject: [PATCH] Blocking.pm: allowfrom telnet attribute added

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3721 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/Blocking.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FHEM/Blocking.pm b/FHEM/Blocking.pm
index 1840acef1..e61c3c79f 100644
--- a/FHEM/Blocking.pm
+++ b/FHEM/Blocking.pm
@@ -4,11 +4,11 @@ package main;
 
 =pod
 ### Usage:
-sub TestBlocking() { BlockingCall("DoSleep", 5, "SleepDone", 8, "AbortFn", "AbortArg"); }
+sub TestBlocking   { BlockingCall("DoSleep", {h=>$defs{CUL}, to=>3,cmd=>"CmdTxt"}, 
+                     "SleepDone", 8, "AbortFn", "AbortArg"); }
 sub DoSleep($)     { sleep(shift); return "I'm done"; }
 sub SleepDone($)   { Log 1, "SleepDone: " . shift; }
 sub AbortFn($)     { Log 1, "Aborted: " . shift; }
-sub TestBlocking2() { BlockingCall("DoSleep", 5, "SleepDone", 2, "AbortFn", "AbortArg"); }
 =cut
 
 
@@ -38,7 +38,8 @@ BlockingCall($$@)
     foreach my $d (sort keys %defs) {
       my $h = $defs{$d};
       next if(!$h->{TYPE} || $h->{TYPE} ne "telnet" || $h->{SNAME});
-      next if($attr{$d}{SSL} || $attr{$d}{password} || $attr{$d}{allowfrom});
+      next if($attr{$d}{SSL} || $attr{$d}{password} ||
+              AttrVal($d, "allowfrom", "127.0.0.1") ne "127.0.0.1");
       next if($h->{DEF} =~ m/IPV6/);
       $telnetDevice = $d;
       last;
@@ -51,6 +52,7 @@ BlockingCall($$@)
       CommandAttr(undef, "$tName room hidden");
       $telnetDevice = $tName;
       $defs{$tName}{TEMPORARY} = 1;
+      $attr{$tName}{allowfrom} = "127.0.0.1";
     }
   }