FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

00_MQTT2_SERVER.pm: prevent publish without valid CONNECT (Forum #124699)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25332 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2021-12-10 18:42:32 +00:00
parent e428cf3e17
commit 5907b524fa
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/00_MQTT2_SERVER.pm
View File

@ -244,7 +244,7 @@ MQTT2_SERVER_out($$$;$)
if($dump) {
my $cpt = $cptype{ord(substr($msg,0,1)) >> 4};
$msg =~ s/([^ -~])/"(".ord($1).")"/ge;
Log3 $dump, 5, "out: $cpt: $msg";
Log3 $dump, 5, "out\@$hash->{FD} $cpt: $msg";
}
}
@ -311,7 +311,7 @@ MQTT2_SERVER_Read($@)
if($dump) {
my $msg = substr($hash->{BUF}, 0, $off+$tlen);
$msg =~ s/([^ -~])/"(".ord($1).")"/ge;
Log3 $sname, 5, "in: $cpt: $msg";
Log3 $sname, 5, "in\@$hash->{FD} $cpt: $msg";
}
$hash->{BUF} = substr($hash->{BUF}, $tlen+$off);
@ -334,7 +334,8 @@ MQTT2_SERVER_Read($@)
$hash->{protoNum} = unpack('C*', substr($pl,$off++,1)); # 3 or 4
$hash->{cflags} = unpack('C*', substr($pl,$off++,1));
$hash->{keepalive} = unpack('n', substr($pl, $off, 2)); $off += 2;
($hash->{cid}, $off) = MQTT2_SERVER_getStr($hash, $pl, $off);
my $cid;
($cid, $off) = MQTT2_SERVER_getStr($hash, $pl, $off);
if($hash->{protoNum} > 4) {
return MQTT2_SERVER_out($hash, pack("C*", 0x20, 2, 0, 1), $dump,
@ -370,6 +371,7 @@ MQTT2_SERVER_Read($@)
$hash->{subscriptions} = {};
$defs{$sname}{clients}{$cname} = 1;
$hash->{cid} = $cid; #124699
Log3 $sname, 4, " $cname cid:$hash->{cid} $cpt V:$hash->{protoNum} $desc";
MQTT2_SERVER_out($hash, pack("C*", 0x20, 2, 0, 0), $dump); # CONNACK+OK

2
fhem/FHEM/10_ZWave.pm
View File

@ -5234,7 +5234,7 @@ ZWave_Parse($$@)
if($iodev->{setReadingOnAck}) {
my $ackCmd = $zwave_cbid2cmd{"$lname $callbackid"};
if($ackCmd) {
#Log 1, "ACK: $callbackid => $ackCmd";
#Log 1, "ACK: $lname $msg $callbackid => $ackCmd";
my ($type, $reading, $val) = split(" ", $ackCmd, 3);
readingsBulkUpdate($lhash, $reading, $val, 1)
if($type eq "set" && defined($val));