mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

00_KNXIO.pm: maintenace update (Forum #127792)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@30442 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
erwin
2025-10-24 12:41:21 +00:00
parent 182ffdfb77
commit 017677a01d
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
fhem/FHEM/00_KNXIO.pm
View File

@@ -86,9 +86,11 @@
# use AttrNum instead of AttrVal where possible # use AttrNum instead of AttrVal where possible
# PBP remove postfix if # PBP remove postfix if
# 20/02/2025 add a few responseIDs in readH fn. # 20/02/2025 add a few responseIDs in readH fn.
# xx/06/2025 modify some Log-msgs _ReadH fn # 27/07/2025 modify some Log-msgs _ReadH fn
# fix rollover in seqcntrRx # fix rollover in seqcntrRx
# rework _readST, _dispatch, _processFIFo, _deldupes subs # rework _readST, _dispatch, _processFIFo, _deldupes subs
# 25/10/2025 modify error handling (dupl. msg received) mode H
# modify _processFIFO fn
package KNXIO; ## no critic 'package' package KNXIO; ## no critic 'package'
@@ -503,24 +505,31 @@ sub KNXIO_ReadH {
my $discardFrame = undef; my $discardFrame = undef;
my $cntrdiff = $rxseqcntr - $hash->{KNXIOhelper}->{SEQUENCECNTR}; my $cntrdiff = $rxseqcntr - $hash->{KNXIOhelper}->{SEQUENCECNTR};
if (($cntrdiff == -1) || ($cntrdiff == 255)) { # rollover... if ($cntrdiff == 0) {
KNXIO_Log ($name, 3, q{TunnelRequest duplicate message received - ack it } . KNXIO_Log ($name, 4, q{TunnelRequest received - send Ack and decode } .
qq{seqcntrRx=$rxseqcntr}); qq{seqcntrRx=$rxseqcntr});
}
elsif (($cntrdiff == -1) || ($cntrdiff == 255)) { # rollover...
KNXIO_Log ($name, 3, q{TunnelRequest duplicate message received } .
qq{CCID=$ccid seqcntrRx=$rxseqcntr} . q{ - ack and verify connection});
$discardFrame = 1; # one packet duplicate... we ack it but do not process $discardFrame = 1; # one packet duplicate... we ack it but do not process
} }
elsif ($cntrdiff != 0) { # really out of sequence else { # really out of sequence
KNXIO_Log ($name, 3, q{TunnelRequest messaage out of sequence received: } . KNXIO_Log ($name, 3, q{TunnelRequest message out of sequence received: } .
qq{(seqcntrRx=$rxseqcntr seqcntrTx=$hash->{KNXIOhelper}->{SEQUENCECNTR} ) - no ack & discard}); q{seqcntrRx received/expected= } . $rxseqcntr .
q{/} . $hash->{KNXIOhelper}->{SEQUENCECNTR} . q{ - no ack & discard});
KNXIO_keepAlive($hash); # send connectionstaterequest
return; return;
} }
if (! defined($discardFrame)) {
KNXIO_Log ($name, 4, q{TunnelRequest received - send Ack and decode. } .
qq{seqcntrRx=$hash->{KNXIOhelper}->{SEQUENCECNTR}} );
}
my $tacksend = pack('nnnCCCC',0x0610,0x0421,10,4,$ccid,$rxseqcntr,0); # send ack my $tacksend = pack('nnnCCCC',0x0610,0x0421,10,4,$ccid,$rxseqcntr,0); # send ack
$hash->{KNXIOhelper}->{SEQUENCECNTR} = ($rxseqcntr + 1) % 256;
::DevIo_SimpleWrite($hash,$tacksend,0); ::DevIo_SimpleWrite($hash,$tacksend,0);
return if ($discardFrame); # duplicate frame $hash->{KNXIOhelper}->{SEQUENCECNTR} = ($rxseqcntr + 1) % 256;
if (defined($discardFrame)) { # send connectionstaterequest
KNXIO_keepAlive($hash);
return;
}
#now decode & send to clients #now decode & send to clients
$buf = substr($buf,10); # strip off header (10 bytes) $buf = substr($buf,10); # strip off header (10 bytes)
@@ -1053,6 +1062,7 @@ sub KNXIO_dispatch {
return; return;
} }
=begin comment
### called from FIFO TIMER ### called from FIFO TIMER
sub KNXIO_dispatch2 { sub KNXIO_dispatch2 {
## my ($hash, $outbuf ) = ($_[0]->{h}, $_[0]->{m}); ## my ($hash, $outbuf ) = ($_[0]->{h}, $_[0]->{m});
@@ -1069,6 +1079,8 @@ sub KNXIO_dispatch2 {
KNXIO_processFIFO($hash); KNXIO_processFIFO($hash);
return; return;
} }
=end comment
=cut
### fetch msgs from FIFO and call dispatch ### fetch msgs from FIFO and call dispatch
sub KNXIO_processFIFO { sub KNXIO_processFIFO {
@@ -1085,10 +1097,12 @@ sub KNXIO_processFIFO {
if ($queentries > 0) { # process timer is not running & fifo not empty if ($queentries > 0) { # process timer is not running & fifo not empty
my $msg = shift(@{$hash->{KNXIOhelper}->{FIFO}}); my $msg = shift(@{$hash->{KNXIOhelper}->{FIFO}});
KNXIO_Log ($name, 4, qq{dispatching buf=$msg Nr_msgs=$queentries}); KNXIO_Log ($name, 4, qq{dispatching buf=$msg Nr_msgs=$queentries});
KNXIO_dispatch2($hash, $msg); # KNXIO_dispatch2($hash, $msg);
## if ($queentries > 1) { $hash->{'MSGCNT'}++; # update internals and dispatch
$hash->{'MSGTIME'} = TimeNow();
Dispatch($hash, $msg);
InternalTimer(Time::HiRes::time() + 0.05, \&KNXIO_processFIFO, $hash); # allow time for new/duplicate msgs to be read InternalTimer(Time::HiRes::time() + 0.05, \&KNXIO_processFIFO, $hash); # allow time for new/duplicate msgs to be read
## }
} }
return; return;
} }