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

WMBUS: enhanced error checking

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17722 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
kaihs 2018-11-10 16:18:34 +00:00
parent f43d2ede31
commit 3af9e172ca
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/WMBus.pm
View File

@ -95,6 +95,7 @@ use constant {
ERR_FRAGMENT_UNSUPPORTED => 14,
ERR_UNKNOWN_COMPACT_FORMAT => 15,
ERR_CIPHER_NOT_INSTALLED => 16,
ERR_LINK_LAYER_INVALID => 17,
# TYPE C transmission uses two different frame types
# see http://www.st.com/content/ccc/resource/technical/document/application_note/3f/fb/35/5a/25/4e/41/ba/DM00233038.pdf/files/DM00233038.pdf/jcr:content/translations/en.DM00233038.pdf
@ -1863,7 +1864,11 @@ sub decodeLinkLayer($$)
my $self = shift;
my $linklayer = shift;
if (length($linklayer) < TL_BLOCK_SIZE + $self->{crc_size}) {
$self->{errormsg} = "link layer too short";
$self->{errorcode} = ERR_LINK_LAYER_INVALID;
return 0;
}
($self->{lfield}, $self->{cfield}, $self->{mfield}) = unpack('CCv', $linklayer);
$self->{afield} = substr($linklayer,4,6);
$self->{afield_id} = sprintf("%08d", $self->decodeBCD(8,substr($linklayer,4,4)));