diff --git a/FHEM/72_FRITZBOX.pm b/FHEM/72_FRITZBOX.pm index 75c39329c..612ecd8c3 100644 --- a/FHEM/72_FRITZBOX.pm +++ b/FHEM/72_FRITZBOX.pm @@ -346,8 +346,7 @@ sub FRITZBOX_Set($$@) } # set call elsif ( lc $cmd eq 'call') { - if (int @val > 0) - { + if (int @val > 0) { Log3 $name, 3, "FRITZBOX: set $name $cmd ".join(" ", @val); push @cmdBuffer, "call ".join(" ", @val); return FRITZBOX_Set_Cmd_Start $hash->{helper}{TimerCmd}; @@ -1254,7 +1253,7 @@ sub FRITZBOX_Readout_Run_Web($) $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) - $queryStr .= "&lanDevice=landevice:settings/landevice/list(ip,ethernet,ethernet_port,name,mac,active,online,wlan,speed)"; # LAN devices + $queryStr .= "&lanDevice=landevice:settings/landevice/list(ip,ethernet,ethernet_port,guest,name,mac,active,online,wlan,speed)"; # LAN devices #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) @@ -1411,6 +1410,7 @@ sub FRITZBOX_Readout_Run_Web($) } %landevice = (); my $wlanCount = 0; + my $gWlanCount = 0; foreach ( @{ $result->{lanDevice} } ) { my $dIp = $_->{ip}; my $dName = $_->{name}; @@ -1422,7 +1422,7 @@ sub FRITZBOX_Readout_Run_Web($) $mac =~ s/:/_/g; if ($_->{ethernet} == 0 && $_->{wlan} == 1) { $dName .= " ("; - $dName .= "guest" if $_->{guest}; + $dName .= "g" if $_->{guest}; $dName .= "WLAN"; $dName .= ", " . $wlanList{$mac}{speed} . " / " . $wlanList{$mac}{speed_rx} . " Mbit/s, ". $wlanList{$mac}{rssi} if defined $wlanList{$mac}; @@ -1430,7 +1430,7 @@ sub FRITZBOX_Readout_Run_Web($) } if ( $_->{ethernet} == 1 ) { $dName .= " ("; - $dName .= "guest" if $_->{guest}; + $dName .= "g" if $_->{guest}; $dName .= "LAN" . $_->{ethernet_port}; $dName .= ", 1 Gbit/s" if $_->{speed} == 1000; $dName .= ", " . $_->{speed} . " Mbit/s" if $_->{speed} != 1000 && $_->{speed} != 0; @@ -1439,11 +1439,13 @@ sub FRITZBOX_Readout_Run_Web($) my $rName = "mac_".$mac; FRITZBOX_Readout_Add_Reading $hash, \@roReadings, $rName, $dName; $wlanCount++ if $_->{wlan} == 1; + $gWlanCount++ if $_->{wlan} == 1 && $_->{guest} == 1; # Remove mac address from oldLanDevice-List delete $oldLanDevice{$rName} if exists $oldLanDevice{$rName}; } } FRITZBOX_Readout_Add_Reading ($hash, \@roReadings, "box_wlanCount", $wlanCount); + FRITZBOX_Readout_Add_Reading ($hash, \@roReadings, "box_guestWlanCount", $gWlanCount); # Remove inactive or non existing mac-readings in two steps foreach ( keys %oldLanDevice ) { @@ -4961,6 +4963,7 @@ sub FRITZBOX_fritztris($)