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

00_MQTT2_SERVER.pm: add encoding unicode support (Forum #126088)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25699 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2022-02-18 16:16:55 +00:00
parent c82f77ee6a
commit cb7641a1ba
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/00_MQTT2_SERVER.pm
View File

@ -387,6 +387,7 @@ MQTT2_SERVER_Read($@)
$off += 2; $off += 2;
} }
$val = (length($pl)>$off ? substr($pl, $off) : ""); $val = (length($pl)>$off ? substr($pl, $off) : "");
$val = Encode::decode('UTF-8', $val) if($unicodeEncoding);
Log3 $sname, 4, " $cname $hash->{cid} $cpt $tp:$val"; Log3 $sname, 4, " $cname $hash->{cid} $cpt $tp:$val";
# PUBACK # PUBACK
MQTT2_SERVER_out($hash, pack("CCnC*", 0x40, 2, $pid), $dump) if($qos); MQTT2_SERVER_out($hash, pack("CCnC*", 0x40, 2, $pid), $dump) if($qos);
@ -524,6 +525,14 @@ MQTT2_SERVER_sendto($$$$)
return if(IsDisabled($hash->{NAME})); return if(IsDisabled($hash->{NAME}));
$val = "" if(!defined($val)); $val = "" if(!defined($val));
my $dump = (AttrVal($shash->{NAME},"verbose",1)>=5) ? $shash->{NAME} :undef; my $dump = (AttrVal($shash->{NAME},"verbose",1)>=5) ? $shash->{NAME} :undef;
my $ltopic = $topic;
my $lval = $val;
if($unicodeEncoding) {
$ltopic = Encode::encode('UTF-8', $topic);
$lval = Encode::encode('UTF-8', $val);
}
foreach my $s (keys %{$hash->{subscriptions}}) { foreach my $s (keys %{$hash->{subscriptions}}) {
my $re = $s; my $re = $s;
$re =~ s,^#$,.*,g; $re =~ s,^#$,.*,g;
@ -533,9 +542,9 @@ MQTT2_SERVER_sendto($$$$)
Log3 $shash, 5, " $hash->{NAME} $hash->{cid} => $topic:$val"; Log3 $shash, 5, " $hash->{NAME} $hash->{cid} => $topic:$val";
MQTT2_SERVER_out($hash, # PUBLISH MQTT2_SERVER_out($hash, # PUBLISH
pack("C",0x30). pack("C",0x30).
MQTT2_SERVER_calcRemainingLength(2+length($topic)+length($val)). MQTT2_SERVER_calcRemainingLength(2+length($ltopic)+length($lval)).
pack("n", length($topic)). pack("n", length($ltopic)).
$topic.$val, $dump); $ltopic.$lval, $dump);
last; # send a message only once last; # send a message only once
} }
} }
@ -602,6 +611,7 @@ MQTT2_SERVER_getStr($$$)
my $l = unpack("n", substr($in, $off, 2)); my $l = unpack("n", substr($in, $off, 2));
my $r = substr($in, $off+2, $l); my $r = substr($in, $off+2, $l);
$hash->{stringError} = 1 if(index($r, "\0") >= 0); $hash->{stringError} = 1 if(index($r, "\0") >= 0);
$r = Encode::decode('UTF-8', $r) if($unicodeEncoding);
return ($r, $off+2+$l); return ($r, $off+2+$l);
} }