From e36d88593da877082fbeb11f0c7bcf3612fe531d Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Tue, 23 Jun 2020 08:30:14 +0000 Subject: [PATCH] DevIo.pm: Fix reconnect for websocket (Forum #109910) git-svn-id: https://svn.fhem.de/fhem/trunk@22235 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/DevIo.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/DevIo.pm b/fhem/FHEM/DevIo.pm index 3952d309c..5d35935df 100644 --- a/fhem/FHEM/DevIo.pm +++ b/fhem/FHEM/DevIo.pm @@ -456,7 +456,7 @@ DevIo_OpenDev($$$;$) } elsif($dev =~ m,^(ws:|wss:)?([^/:]+):([0-9]+)(.*?)$,) {# TCP or websocket my ($proto, $host, $port, $path) = ($1 ? $1 : "", $2, $3, $4); - $dev = "$host:$port"; + my $hp = "$host:$port"; if($proto eq "wss:") { $hash->{SSL} = 1; $proto = "ws:"; @@ -521,7 +521,7 @@ DevIo_OpenDev($$$;$) my $err = HttpUtils_Connect({ # Nonblocking timeout => $timeout, - url => $hash->{SSL} ? "https://$dev$path" : "http://$dev$path", + url => $hash->{SSL} ? "https://$hp$path" : "http://$hp$path", NAME => $hash->{NAME}, sslargs => $hash->{sslargs} ? $hash->{sslargs} : {}, noConn2 => $proto eq "ws:" ? 0 : 1, @@ -542,8 +542,8 @@ DevIo_OpenDev($$$;$) } else { # blocking connect my $conn = $haveInet6 ? - IO::Socket::INET6->new(PeerAddr => $dev, Timeout => $timeout) : - IO::Socket::INET ->new(PeerAddr => $dev, Timeout => $timeout); + IO::Socket::INET6->new(PeerAddr => $hp, Timeout => $timeout) : + IO::Socket::INET ->new(PeerAddr => $hp, Timeout => $timeout); return "" if(!&$doTcpTail($conn)); # no callback: no doCb }