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

10_ZWave.pm: sec patch (Forum #38587)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@10361 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2016-01-04 21:59:25 +00:00
parent 13faf156ac
commit 81a4c4b244
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/FHEM/10_ZWave.pm
View File

@@ -2322,17 +2322,39 @@ sub
ZWave_secStart($) ZWave_secStart($)
{ {
my ($hash) = @_; my ($hash) = @_;
#~ Log3 $hash->{NAME}, 5, "$hash->{NAME}: secStart called";
my $dt = gettimeofday();
$hash->{secTime} = $dt;
InternalTimer($dt+7, "ZWave_secUnlock", $hash, 0);
#~ Log3 $hash->{NAME}, 5, "Timer for secUnlock set ($dt+7)";
return if($hash->{secInProgress}); return if($hash->{secInProgress});
#~ Log3 $hash->{NAME}, 5, "$hash->{NAME}: setting secInProgress";
$hash->{secInProgress} = 1; $hash->{secInProgress} = 1;
my @empty; my @empty;
$hash->{secStack} = \@empty; $hash->{secStack} = \@empty;
} }
sub
ZWave_secUnlock($)
{
my ($hash)= @_;
#~ Log3 $hash->{NAME}, 5, "secUnlock triggert";
my $dt = gettimeofday();
if ($dt > ($hash->{secTime} + 6)) {
Log3 $hash->{NAME}, 3, "secUnlock will call Zwave_secEnd";
ZWave_secEnd($hash);
}
}
sub sub
ZWave_secEnd($) ZWave_secEnd($)
{ {
my ($hash) = @_; my ($hash) = @_;
#~ Log3 $hash->{NAME}, 5, "$hash->{NAME}: secEnd called";
return if(!$hash->{secInProgress}); return if(!$hash->{secInProgress});
#~ Log3 $hash->{NAME}, 5, "$hash->{NAME}: secEnd removing secInProgress";
my $secStack = $hash->{secStack}; my $secStack = $hash->{secStack};
delete $hash->{secInProgress}; delete $hash->{secInProgress};
delete $hash->{secStack}; delete $hash->{secStack};
@@ -2756,6 +2778,7 @@ ZWave_secDecrypt($$$)
if ($sequenced && $secondFrame){ if ($sequenced && $secondFrame){
ZWave_secRetrieveFirstFrame ($hash, $sequenceCounter); ZWave_secRetrieveFirstFrame ($hash, $sequenceCounter);
} }
ZWave_secEnd($hash);
} }
if ($newnonce == 1) { if ($newnonce == 1) {
@@ -2976,7 +2999,13 @@ ZWave_processSendStack($)
if(index($ss->[0],"sent") == 0) { if(index($ss->[0],"sent") == 0) {
shift @{$ss}; shift @{$ss};
RemoveInternalTimer($hash) if(!ZWave_isWakeUp($hash)); if(!ZWave_isWakeUp($hash)) {
RemoveInternalTimer($hash);
if($hash->{secInProgress}) {
InternalTimer(gettimeofday()+7, "ZWave_secUnlock", $hash, 0);
}
}
} }
if(@{$ss} == 0) { if(@{$ss} == 0) {