2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00

00_MQTT2_CLIENT.pm: fix msgAfterConnect bug (Forum #102032)

git-svn-id: https://svn.fhem.de/fhem/trunk@19784 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-07-05 09:37:34 +00:00
parent 7446304981
commit d79981e77c

View File

@ -177,8 +177,8 @@ MQTT2_CLIENT_Disco($;$)
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
$hash->{connecting} = 1 if(!$isUndef); $hash->{connecting} = 1 if(!$isUndef);
my $ond = AttrVal($hash->{NAME}, "msgBeforeDisconnect", ""); my $ond = AttrVal($hash->{NAME}, "msgBeforeDisconnect", "");
MQTT2_CLIENT_doPublish($hash, $2, $3, $1) MQTT2_CLIENT_doPublish($hash, $2, $3, $1, 1)
if($ond =~ m/^(-r\s)?([^\s]*)\s*(.*)$/); if($ond && $ond =~ m/^(-r\s)?([^\s]*)\s*(.*)$/);
MQTT2_CLIENT_send($hash, pack("C",0xE0).pack("C",0), 1); # DISCONNECT MQTT2_CLIENT_send($hash, pack("C",0xE0).pack("C",0), 1); # DISCONNECT
$isUndef ? DevIo_CloseDev($hash) : DevIo_Disconnected($hash); $isUndef ? DevIo_CloseDev($hash) : DevIo_Disconnected($hash);
} }
@ -326,8 +326,8 @@ MQTT2_CLIENT_Read($@)
if($hash->{connecting}) { if($hash->{connecting}) {
delete($hash->{connecting}); delete($hash->{connecting});
my $onc = AttrVal($name, "msgAfterConnect", ""); my $onc = AttrVal($name, "msgAfterConnect", "");
MQTT2_CLIENT_doPublish($hash, $2, $3, $1) MQTT2_CLIENT_doPublish($hash, $2, $3, $1, 1)
if($onc =~ m/^(-r\s)?([^\s]*)\s*(.*)$/); if($onc && $onc =~ m/^(-r\s)?([^\s]*)\s*(.*)$/);
} }
} elsif($cpt eq "PINGRESP") { # ignore it } elsif($cpt eq "PINGRESP") { # ignore it