FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

DevIo.pm: websocket logging at verbose 5, wss: is allowed (Forum #109910)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22089 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-06-01 09:00:27 +00:00
parent 98a96cde97
commit 66adddc54d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/DevIo.pm
View File

@ -142,7 +142,7 @@ DevIo_DecodeWS($$)
my $i = 2;
# $op: 0=>Continuation, 1=>Text, 2=>Binary, 8=>Close, 9=>Ping, 10=>Pong
#Log 1, "OP:$op/$len/$mask/$fin";
Log3 $hash, 5, "Websocket msg: OP:$op LEN:$len MASK:$mask FIN:$fin";
if($op == 8) { # Close, Normal, empty mask. #104718
syswrite($hash->{TCPDev}, pack("CCn",0x88,0x2,1000));
DevIo_CloseDev($hash);
@ -283,7 +283,7 @@ DevIo_Expect($$$)
# Possible values for $hash->{DeviceName}:
# - device@baud[78][NEO][012] => open device, set serial-line parameters
# - hostname:port => TCP/IP client connection (set $hash->{SSL}=>1 for TLS)
# - ws:hostname:port => websocket connection
# - ws:hostname:port => websocket connection (wss: sets $hash->{SSL}=1)
# - device@directio => open device without additional "magic"
# - UNIX:(SEQPACKET|STREAM):filename => Open filename as a UNIX socket
# - FHEM:DEVIO:IoDev[:IoPort] => Cascade I/O over another FHEM Device
@ -410,10 +410,14 @@ DevIo_OpenDev($$$;$)
return &$doCb("");
}
} elsif($dev =~ m/^(ws:)?(.+):([0-9]+)$/) { # TCP (host:port) or websocket
} elsif($dev =~ m/^(ws:|wss:)?(.+):([0-9]+)$/) {# TCP (host:port) or websocket
my ($proto, $host, $port) = ($1 ? $1 : "", $2, $3);
$dev = "$host:$port";
if($proto eq "wss:") {
$hash->{SSL} = 1;
$proto = "ws:";
}
if($proto eq "ws:") {
require MIME::Base64;
return &$doCb('websocket is only supported with callback') if(!$callback);