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

10_ZWave.pm: streamline the multi_node security patch (Forum #65842)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13946 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-04-09 08:32:38 +00:00
parent 8240dce2c9
commit b2e89159f8
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
FHEM/10_ZWave.pm
View File

@ -3378,16 +3378,7 @@ ZWave_secStart($)
my ($hash) = @_;
my $dt = gettimeofday();
if($hash->{ZWaveSubDevice} eq 'yes') { # store secMsg in parent-device
my $pHash = $modules{ZWave}{defptr}{$hash->{homeId}." ".
substr($hash->{nodeIdHex}, 0, 2)};
if(!$pHash) {
Log 3, "ERROR: secStart aborted for orphan child ($hash->{NAME})";
return;
}
$hash = $pHash;
}
$hash = $defs{$hash->{endpointParent}} if($hash->{endpointParent});
$hash->{secTime} = $dt;
$hash->{secTimer} = { hash => $hash };
InternalTimer($dt+7, "ZWave_secUnlock", $hash->{secTimer}, 0);
@ -3436,7 +3427,7 @@ ZWave_secIsSecureClass($$)
if ($cc_cmd =~m/(..)(..)/) {
my ($cc, $cmd) = ($1, $2);
my $cc_name = $zwave_id2class{lc($cc)};
my $sec_classes = AttrVal($hash->{ZWaveSubDevice} eq 'yes' ?
my $sec_classes = AttrVal($hash->{endpointParent} ?
$hash->{endpointParent} : $name, "secure_classes", "");
if (($sec_classes =~ m/$cc_name/) && ($cc_name ne 'SECURITY')){
@ -3571,16 +3562,7 @@ ZWave_secPutMsg ($$$)
my ($hash, $s, $cmd) = @_;
my $name = $hash->{NAME};
if($hash->{ZWaveSubDevice} eq 'yes') { # store secMsg in parent-device
my $pHash = $modules{ZWave}{defptr}{$hash->{homeId}." ".
substr($hash->{nodeIdHex}, 0, 2)};
if(!$pHash) {
Log 3, "ERROR: secStart aborted for orphan child ($hash->{NAME})";
return;
}
$hash = $pHash;
}
$hash = $defs{$hash->{endpointParent}} if($hash->{endpointParent});
if (!$hash->{secMsg}) {
my @arr = ();
$hash->{secMsg} = \@arr;