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

74_Unifi: added attr ignoreWiredClients & ignoreWirelessClients; added AP-Name discovery for wired clients; Patch from Andre Forum: 40287

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14122 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rapster 2017-04-27 22:46:25 +00:00
parent 2b42984412
commit b50763086e
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/FHEM/74_Unifi.pm
View File

@ -63,6 +63,8 @@ sub Unifi_Initialize($$) {
$hash->{NotifyFn} = "Unifi_Notify";
$hash->{AttrList} = "disable:1,0 "
."devAlias "
."ignoreWiredClients:1,0 "
."ignoreWirelessClients:1,0 "
."httpLoglevel:1,2,3,4,5 "
."eventPeriod "
.$readingFnAttributes;
@ -802,19 +804,29 @@ sub Unifi_SetClientReadings($) {
my ($name,$self) = ($hash->{NAME},Unifi_Whoami());
Log3 $name, 5, "$name ($self) - executed.";
my ($apName,$clientName,$apRef,$clientRef);
my $apNames = {};
for my $apID (keys %{$hash->{accespoints}}) {
my $apRef = $hash->{accespoints}->{$apID};
$apNames->{$apRef->{mac}} = $apRef->{name} ? $apRef->{name} : $apRef->{ip};
}
my $ignoreWired = AttrVal($name,"ignoreWiredClients",undef);
my $ignoreWireless = AttrVal($name,"ignoreWirelessClients",undef);
my ($apName,$clientName,$clientRef);
for my $clientID (keys %{$hash->{clients}}) {
$clientRef = $hash->{clients}->{$clientID};
$clientName = Unifi_ClientNames($hash,$clientID,'makeAlias');
for my $apID (keys %{$hash->{accespoints}}) {
$apRef = $hash->{accespoints}->{$apID};
if (defined $apRef->{mac} && defined $clientRef->{ap_mac}
&& $apRef->{mac} eq $clientRef->{ap_mac}) {
$apName = ($apRef->{name}) ? $apRef->{name} : $apRef->{ip};
last;
}
next if( $ignoreWired && $clientRef->{is_wired} );
next if( $ignoreWireless && !$clientRef->{is_wired} );
$apName = "unknown";
if ($clientRef->{is_wired}
&& defined $clientRef->{sw_mac} && defined($apNames->{$clientRef->{sw_mac}}) ) {
$apName = $apNames->{$clientRef->{sw_mac}};
} elsif (defined $clientRef->{ap_mac} && defined($apNames->{$clientRef->{ap_mac}}) ) {
$apName = $apNames->{$clientRef->{ap_mac}};
}
if (defined $hash->{unifi}->{connectedClients}->{$clientID}) {