Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

00_MQTT2_CLIENT.pm: send DISCONNECT before close (Forum #92946)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@17833 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-11-24 16:05:49 +00:00
parent 4df68adf1a
commit db90efb17a
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
FHEM/00_MQTT2_CLIENT.pm
View File

@ -159,24 +159,20 @@ sub
MQTT2_CLIENT_Undef($@) MQTT2_CLIENT_Undef($@)
{ {
my ($hash, $arg) = @_; my ($hash, $arg) = @_;
RemoveInternalTimer($hash); MQTT2_CLIENT_Disco($hash, 1);
my $ond = AttrVal($hash->{NAME}, "msgBeforeDisconnect", "");
MQTT2_CLIENT_doPublish($hash, split(" ", $ond, 2), 0, 1) if($ond);
DevIo_SimpleWrite($hash, pack("C",0xE0).pack("C",0), 0); # DISCONNECT
DevIo_CloseDev($hash);
return undef; return undef;
} }
sub sub
MQTT2_CLIENT_Disco($) MQTT2_CLIENT_Disco($;$)
{ {
my ($hash) = @_; my ($hash, $isUndef) = @_;
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
$hash->{connecting} = 1; $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, 0) if($ond); MQTT2_CLIENT_doPublish($hash, split(" ", $ond, 2), 0, 1) if($ond);
addToWritebuffer($hash, pack("C",0xE0).pack("C",0)); # DISCONNECT DevIo_SimpleWrite($hash, pack("C",0xE0).pack("C",0), 0); # DISCONNECT
DevIo_Disconnected($hash); $isUndef ? DevIo_CloseDev($hash) : DevIo_Disconnected($hash);
} }
@ -233,13 +229,14 @@ MQTT2_CLIENT_Set($@)
my $tp = shift(@a); my $tp = shift(@a);
my $val = join(" ", @a); my $val = join(" ", @a);
MQTT2_CLIENT_doPublish($hash, $tp, $val, $retain); MQTT2_CLIENT_doPublish($hash, $tp, $val, $retain);
}
if($a[0] eq "password") { } elsif($a[0] eq "password") {
return "Usage: set $name password <password>" if(@a < 1); return "Usage: set $name password <password>" if(@a < 1);
setKeyValue($name, $a[1]); setKeyValue($name, $a[1]); # will delete, if argument is empty
MQTT2_CLIENT_Disco($hash) if($init_done); MQTT2_CLIENT_Disco($hash) if($init_done);
} }
return undef;
} }
my %cptype = ( my %cptype = (
@ -473,6 +470,7 @@ MQTT2_CLIENT_getStr($$)
</li><br> </li><br>
<li>password &lt;password&gt; value<br> <li>password &lt;password&gt; value<br>
set the password, which is stored in the FHEM/FhemUtils/uniqueID file. set the password, which is stored in the FHEM/FhemUtils/uniqueID file.
If the argument is empty, the password will be deleted.
</li> </li>
</ul> </ul>
<br> <br>