From 738e81ba248f528c384c0a2390f3c74fcfd38ec4 Mon Sep 17 00:00:00 2001
From: grompo <>
Date: Tue, 6 Dec 2016 18:59:31 +0000
Subject: [PATCH] FRITZBOX: adaptation to current labor version

git-svn-id: https://svn.fhem.de/fhem/trunk@12721 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/72_FRITZBOX.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/fhem/FHEM/72_FRITZBOX.pm b/fhem/FHEM/72_FRITZBOX.pm
index a97e7fef6..0627d1578 100644
--- a/fhem/FHEM/72_FRITZBOX.pm
+++ b/fhem/FHEM/72_FRITZBOX.pm
@@ -1254,8 +1254,8 @@ sub FRITZBOX_Readout_Run_Web($)
    my $queryStr = "&radio=configd:settings/WEBRADIO/list(Name)"; # Webradio
    $queryStr .= "&box_dect=dect:settings/enabled"; # DECT Sender
    $queryStr .= "&handset=dect:settings/Handset/list(User,Manufacturer,Model,FWVersion)"; # DECT Handsets
-   $queryStr .= "&wlanList=wlan:settings/wlanlist/list(mac,speed,speed_rx,rssi)"; # WLAN devices #wlan:settings/wlanlist/list(hostname,mac,UID,state,rssi,quality,is_turbo,cipher,wmm_active,powersave,is_ap,ap_state,is_repeater,flags,flags_set,mode,is_guest,speed,speed_rx,channel_width,streams)   #wlan:settings/wlanlist/list(hostname,mac,UID,state,rssi,quality,is_turbo,wmm_active,cipher,powersave,is_repeater,flags,flags_set,mode,is_guest,speed,speed_rx,speed_rx_max,speed_tx_max,channel_width,streams,mu_mimo_group,is_fail_client)   
-   $queryStr .= "&lanDevice=landevice:settings/landevice/list(ip,ethernet,ethernet_port,guest,name,mac,active,online,wlan,speed)"; # LAN devices
+   $queryStr .= "&wlanList=wlan:settings/wlanlist/list(mac,speed,speed_rx,speedrx,rssi)"; # WLAN devices, fw=6.69 speedrx ersetzt speed_rx #wlan:settings/wlanlist/list(hostname,mac,UID,state,rssi,quality,is_turbo,cipher,wmm_active,powersave,is_ap,ap_state,is_repeater,flags,flags_set,mode,is_guest,speed,speed_rx,channel_width,streams)   #wlan:settings/wlanlist/list(hostname,mac,UID,state,rssi,quality,is_turbo,wmm_active,cipher,powersave,is_repeater,flags,flags_set,mode,is_guest,speed,speed_rx,speed_rx_max,speed_tx_max,channel_width,streams,mu_mimo_group,is_fail_client)   
+   $queryStr .= "&lanDevice=landevice:settings/landevice/list(ip,ethernet,ethernet_port,port,guest,name,mac,active,online,wlan,speed)"; # LAN devices, fw=6.69 port ersetzt ethernet_port
    #landevice:settings/landevice/list(name,ip,mac,UID,dhcp,wlan,ethernet,active,static_dhcp,manu_name,wakeup,deleteable,source,online,speed,wlan_UIDs,auto_wakeup,guest,url,wlan_station_type,vendorname)
    #landevice:settings/landevice/list(name,ip,mac,parentname,parentuid,ethernet_port,wlan_show_in_monitor,plc,ipv6_ifid,parental_control_abuse,plc_UIDs)   #landevice:settings/landevice/list(name,ip,mac,UID,dhcp,wlan,ethernet,active,static_dhcp,manu_name,wakeup,deleteable,source,online,speed,wlan_UIDs,auto_wakeup,guest,url,wlan_station_type,vendorname,parentname,parentuid,ethernet_port,wlan_show_in_monitor,plc,ipv6_ifid,parental_control_abuse,plc_UIDs)
    $queryStr .= "&init=telcfg:settings/Foncontrol"; # Init
@@ -1358,8 +1358,7 @@ sub FRITZBOX_Readout_Run_Web($)
       my $dectUser = $dectFonID{$dectUserID}{User};
       my $intern = $dectFonID{$dectUserID}{Intern};
       
-      if ($dectUser)
-      {
+      if ($dectUser) {
          FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "dect".$dectUser."_manufacturer", $_->{Manufacturer};
          FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "dect".$dectUser."_model",        $_->{Model},         "model";
          FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "dect".$dectUser."_fwVersion",    $_->{FWVersion};
@@ -1400,9 +1399,10 @@ sub FRITZBOX_Readout_Run_Web($)
          $mac =~ s/:/_/g;
          $wlanList{$mac}{speed} = $_->{speed};
          $wlanList{$mac}{speed_rx} = $_->{speed_rx};
+         $wlanList{$mac}{speed_rx} = $_->{speedrx} if $_->{speedrx} ne "";
          $wlanList{$mac}{rssi} = $_->{rssi};
          FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->wlanDevice->".$mac."->speed", $_->{speed};
-         FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->wlanDevice->".$mac."->speed_rx", $_->{speed_rx};
+         FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->wlanDevice->".$mac."->speed_rx", $wlanList{$mac}{speed_rx};
          FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->wlanDevice->".$mac."->rssi", $_->{rssi};
       }
    }
@@ -1436,7 +1436,8 @@ sub FRITZBOX_Readout_Run_Web($)
             if ( $_->{ethernet} == 1 ) {
                $dName .= " (";
                $dName .= "g"         if $_->{guest};
-               $dName .= "LAN" . $_->{ethernet_port};
+               $dName .= "LAN" . $_->{ethernet_port}  if $_->{ethernet_port} ne "";
+               $dName .= "LAN" . $_->{port}  if $_->{port} ne "";
                $dName .= ", 1 Gbit/s"    if $_->{speed} == 1000;
                $dName .= ", " . $_->{speed} . " Mbit/s"   if $_->{speed} != 1000 && $_->{speed} != 0;
                $dName .= ")";
@@ -4351,7 +4352,7 @@ sub FRITZBOX_Web_OpenCon ($)
    $sid = (FB_doCheckPW($host, $user, $pwd));
    
    if ($sid) {
-      FRITZBOX_Log $hash, 4, "Web session opened with $sid";
+      FRITZBOX_Log $hash, 4, "Web session opened with sid $sid";
       return $sid;
    }