FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-27 10:37:13 +00:00
Code Issues Releases Wiki Activity

Modified Patch from markus to create a telnet port if no suitable one is found

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2649 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-02-05 08:52:30 +00:00
parent 4f2c3d6034
commit 9438d4a203
1 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fhem/FHEM/Blocking.pm
View File

@ -23,6 +23,43 @@ BlockingCall($$@)
{
my ($blockingFn, $arg, $finishFn, $timeout) = @_;
# Look for the telnetport
# must be done before forking to be able to create a temporary device
my $telnetDevice;
if($finishFn) {
my $tName = "telnetForBlockingFn";
$telnetDevice = $tName if($defs{$tName});
if(!$telnetDevice) {
foreach my $d (sort keys %defs) {
my $h = $defs{$d};
next if(!$h->{TYPE} || $h->{TYPE} ne "telnet" || $h->{TEMPORARY});
next if($attr{$d}{SSL} || $attr{$d}{password});
next if($h->{DEF} =~ m/IPV6/);
$telnetDevice = $d;
last;
}
}
# If not suitable telnet device found, create a temporary one
if(!$telnetDevice) {
foreach my $port (7073..7083) {
if(!CommandDefine(undef, "$tName telnet $port")) {
$telnetDevice = $tName;
$defs{$tName}{TEMPORARY} = 1;
last;
}
}
}
if(!$telnetDevice) {
my $msg = "CallBlockingFn: No telnet port found and cannot create one.";
Log 1, $msg;
return $msg;
}
}
# do fork
my $pid = fork;
if(!defined($pid)) {
Log 1, "Cannot fork: $!";
@ -42,24 +79,8 @@ BlockingCall($$@)
BlockingExit(undef) if(!$finishFn);
# Look for the telnetport
my $tp;
foreach my $d (sort keys %defs) {
my $h = $defs{$d};
next if(!$h->{TYPE} || $h->{TYPE} ne "telnet" || $h->{TEMPORARY});
next if($attr{$d}{SSL} || $attr{$d}{password});
next if($h->{DEF} =~ m/IPV6/);
$tp = $d;
last;
}
if(!$tp) {
Log 1, "CallBlockingFn: No telnet port found for sending the data back.";
BlockingExit(undef);
}
# Write the data back, calling the function
my $addr = "localhost:$defs{$tp}{PORT}";
my $addr = "localhost:$defs{$telnetDevice}{PORT}";
my $client = IO::Socket::INET->new(PeerAddr => $addr);
Log 1, "CallBlockingFn: Can't connect to $addr\n" if(!$client);
$ret =~ s/'/\\'/g;