FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

00_MQTT2_CLIENT.pm: protocol sending for disconnect debugging (Forum #93642)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17848 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-11-26 09:04:02 +00:00
parent 13344aa549
commit 58df72cb41
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fhem/FHEM/00_MQTT2_CLIENT.pm
View File

@ -119,7 +119,7 @@ MQTT2_CLIENT_doinit($)
($usr ? (pack("n", length($usr)).$usr) : ""). ($usr ? (pack("n", length($usr)).$usr) : "").
($pwd ? (pack("n", length($pwd)).$pwd) : ""); ($pwd ? (pack("n", length($pwd)).$pwd) : "");
$hash->{connecting} = 2; $hash->{connecting} = 2;
addToWritebuffer($hash, MQTT2_CLIENT_send($hash,
pack("C",0x10). pack("C",0x10).
MQTT2_CLIENT_calcRemainingLength(length($msg)).$msg); MQTT2_CLIENT_calcRemainingLength(length($msg)).$msg);
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
@ -135,7 +135,7 @@ MQTT2_CLIENT_doinit($)
pack("n", $hash->{FD}). # packed Identifier pack("n", $hash->{FD}). # packed Identifier
join("", map { pack("n", length($_)).$_.pack("C",0) } # QOS:0 join("", map { pack("n", length($_)).$_.pack("C",0) } # QOS:0
split(" ", $s)); split(" ", $s));
addToWritebuffer($hash, MQTT2_CLIENT_send($hash,
pack("C",0x80). pack("C",0x80).
MQTT2_CLIENT_calcRemainingLength(length($msg)).$msg); MQTT2_CLIENT_calcRemainingLength(length($msg)).$msg);
$hash->{connecting} = 3; $hash->{connecting} = 3;
@ -151,7 +151,7 @@ MQTT2_CLIENT_keepalive($)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
return if(ReadingsVal($name, "state", "") ne "opened"); return if(ReadingsVal($name, "state", "") ne "opened");
Log3 $name, 5, "$name: keepalive $keepalive"; Log3 $name, 5, "$name: keepalive $keepalive";
addToWritebuffer($hash, pack("C",0xC0).pack("C",0)); # PINGREQ MQTT2_CLIENT_send($hash, pack("C",0xC0).pack("C",0)); # PINGREQ
InternalTimer(gettimeofday()+$keepalive, "MQTT2_CLIENT_keepalive", $hash, 0); InternalTimer(gettimeofday()+$keepalive, "MQTT2_CLIENT_keepalive", $hash, 0);
} }
@ -171,7 +171,7 @@ MQTT2_CLIENT_Disco($;$)
$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, split(" ", $ond, 2), 0, 1) if($ond); MQTT2_CLIENT_doPublish($hash, split(" ", $ond, 2), 0, 1) if($ond);
DevIo_SimpleWrite($hash, pack("C",0xE0).pack("C",0), 0); # 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);
} }
@ -327,7 +327,7 @@ MQTT2_CLIENT_Read($@)
$off += 2; $off += 2;
} }
$val = substr($pl, $off); $val = substr($pl, $off);
addToWritebuffer($hash, pack("CCnC*", 0x40, 2, $pid)) if($qos); # PUBACK MQTT2_CLIENT_send($hash, pack("CCnC*", 0x40, 2, $pid)) if($qos); # PUBACK
if(!IsDisabled($name)) { if(!IsDisabled($name)) {
$val = "" if(!defined($val)); $val = "" if(!defined($val));
@ -355,12 +355,27 @@ MQTT2_CLIENT_doPublish($@)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
return if(IsDisabled($name)); return if(IsDisabled($name));
$val = "" if(!defined($val)); $val = "" if(!defined($val));
Log3 $name, 5, "$name: sending PUBLISH $topic $val";
my $msg = pack("C",0x30). my $msg = pack("C",0x30).
MQTT2_CLIENT_calcRemainingLength(2+length($topic)+length($val)). MQTT2_CLIENT_calcRemainingLength(2+length($topic)+length($val)).
pack("n", length($topic)). pack("n", length($topic)).
$topic.$val; $topic.$val;
MQTT2_CLIENT_send($hash, $msg, $immediate)
}
sub
MQTT2_CLIENT_send($$;$)
{
my ($hash, $msg, $immediate) = @_;
# Lowlevel debugging
my $name = $hash->{NAME};
if(AttrVal($name, "verbose", 1) >= 5) {
my $cmd = $cptype{ord($msg)>>4};
my $msgTxt = $msg;
$msgTxt =~ s/([^ -~])/"(".ord($1).")"/ge;
Log3 $name, 5, "$name: sending $cmd $msgTxt";
}
if($immediate) { if($immediate) {
DevIo_SimpleWrite($hash, $msg, 0); DevIo_SimpleWrite($hash, $msg, 0);
} else { } else {