From 2706741af70170a9af25b3a75a6176d59a57e6d1 Mon Sep 17 00:00:00 2001 From: tupol <> Date: Sun, 30 Sep 2018 18:24:58 +0000 Subject: [PATCH] Fritzbox: Fixed PERL WARNING: Use of uninitialized value in string eq at ./FHEM/72_FRITZBOX.pm line 1577. git-svn-id: https://svn.fhem.de/fhem/trunk@17437 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/72_FRITZBOX.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/72_FRITZBOX.pm b/fhem/FHEM/72_FRITZBOX.pm index 9fe3979a0..8a5a670f3 100644 --- a/fhem/FHEM/72_FRITZBOX.pm +++ b/fhem/FHEM/72_FRITZBOX.pm @@ -1394,7 +1394,7 @@ sub FRITZBOX_Readout_Run_Web($) my $result2; my $newQueryPart; - # gets WLAN speed for fw>=6.69 + # gets WLAN speed for fw>=6.69 and < 7 $queryStr=""; foreach ( @{ $result->{wlanListNew} } ) { $newQueryPart = "&".$_->{_node}."=wlan:settings/".$_->{_node}."/speed_rx"; @@ -1408,7 +1408,7 @@ sub FRITZBOX_Readout_Run_Web($) } } - # gets LAN-Port for fw>=6.69 + # gets LAN-Port for fw>=6.69 and fw<7 foreach ( @{ $result->{lanDeviceNew} } ) { $newQueryPart = "&".$_->{_node}."=landevice:settings/".$_->{_node}."/ethernet_port"; if (length($queryStr.$newQueryPart) < 4050) { @@ -1537,7 +1537,7 @@ sub FRITZBOX_Readout_Run_Web($) foreach ( @{ $result->{wlanList} } ) { my $mac = $_->{mac}; $mac =~ s/:/_/g; - # Anscheinend gibt es sowohl für repeater als auch für FBoxen Anmeldungen + # Anscheinend gibt es Anmeldungen sowohl für Repeater als auch für FBoxen $wlanList{$mac}{speed} = $_->{speed} if ! defined $wlanList{$mac}{speed} || $_->{speed} ne "0"; $wlanList{$mac}{speed_rx} = $_->{speed_rx} if ! defined $wlanList{$mac}{speed_rx} || $_->{speed_rx} ne "0"; #$wlanList{$mac}{speed_rx} = $result_lan->{$_->{_node}}; @@ -1573,8 +1573,10 @@ sub FRITZBOX_Readout_Run_Web($) $mac =~ s/:/_/g; # if ( !$_->{ethernet} && $_->{wlan} ) { # funktioniert nicht mehr seit v7 if ( defined $wlanList{$mac} ) { + # Copes with fw>=7 + $_->{guest} = $wlanList{$mac}{is_guest} if defined $wlanList{$mac}{is_guest} && $_->{guest} eq ""; $wlanCount++; - $gWlanCount++ if $_->{guest} eq "1" || $wlanList{$mac}{is_guest} eq "1" ; + $gWlanCount++ if $_->{guest} eq "1"; $dName .= " ("; $dName .= "g" if $_->{guest}; $dName .= "WLAN";