FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

DevIo.pm: fix reconnect bug for Nonblocking HTTP (Forum #53309)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11725 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-06-29 09:19:07 +00:00
parent 5a76c9897e
commit daabfd67c2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/DevIo.pm
View File

@ -201,7 +201,7 @@ DevIo_OpenDev($$$;$)
($dev, $baudrate) = split("@", $dev);
my ($databits, $parity, $stopbits) = (8, 'none', 1);
my $doCb = sub ($$) {
my $doCb = sub ($) {
my ($r) = @_;
$callback->($hash,$r) if($callback);
return $r;
@ -302,7 +302,7 @@ DevIo_OpenDev($$$;$)
# for non-existent devices has a delay of 3 sec, we are sitting all the
# time in this connect. NEXT_OPEN tries to avoid this problem.
if($hash->{NEXT_OPEN} && time() < $hash->{NEXT_OPEN}) {
return &$doCb(undef);
return undef;
}
my $timeout = $hash->{TIMEOUT} ? $hash->{TIMEOUT} : 3;
@ -336,17 +336,16 @@ DevIo_OpenDev($$$;$)
noConn2 => 1,
callback=> sub() {
my ($h, $err, undef) = @_;
return $callback->($hash, $err) if($err);
return &$doCb("") if(!&$doTcpTail($h->{conn}));
return &$doCb(&$doTailWork());
&$doTcpTail($err ? undef : $h->{conn});
return &$doCb($err ? $err : &$doTailWork());
}
});
return &$doCb($err) if($err);
return undef;
return undef; # no double callback: connect is running in bg now
} else {
my $conn = IO::Socket::INET->new(PeerAddr => $dev, Timeout => $timeout);
return &$doCb("") if(!&$doTcpTail($conn));
return "" if(!&$doTcpTail($conn)); # no callback: no doCb
}
} elsif($baudrate && lc($baudrate) eq "directio") { # w/o Device::SerialPort