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

FRITZBOX: bugfix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@10245 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
grompo 2015-12-23 19:30:42 +00:00
parent 719a4454db
commit 178c7e1610
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
FHEM/72_FRITZBOX.pm
View File

@ -1655,15 +1655,17 @@ sub FRITZBOX_Readout_Process($$)
} }
# adapt TR064-Mode # adapt TR064-Mode
if ( defined $values{box_tr064} && $values{box_tr064} eq "off" && defined $hash->{SECPORT} ) { if ( defined $values{box_tr064} ) {
if ( $values{box_tr064} eq "off" && defined $hash->{SECPORT} ) {
FRITZBOX_Log $hash, 3, "TR-064 is switched off"; FRITZBOX_Log $hash, 3, "TR-064 is switched off";
delete $hash->{SECPORT}; delete $hash->{SECPORT};
} }
elsif ( defined $values{box_tr064} && $values{box_tr064} eq "on" && not defined $hash->{SECPORT} ) { elsif ( $values{box_tr064} eq "on" && not defined $hash->{SECPORT} ) {
FRITZBOX_Log $hash, 3, "TR-064 is switched on"; FRITZBOX_Log $hash, 3, "TR-064 is switched on";
my $tr064Port = FRITZBOX_TR064_Init ($hash, $hash->{HOST}); my $tr064Port = FRITZBOX_TR064_Init ($hash, $hash->{HOST});
$hash->{SECPORT} = $tr064Port if $tr064Port; $hash->{SECPORT} = $tr064Port if $tr064Port;
} }
}
my $msg = keys( %values )." values captured in ".$values{readoutTime}." s"; my $msg = keys( %values )." values captured in ".$values{readoutTime}." s";
readingsBulkUpdate( $hash, "lastReadout", $msg ); readingsBulkUpdate( $hash, "lastReadout", $msg );
@ -3106,11 +3108,12 @@ sub FRITZBOX_Ring_Run_Web($)
$result = FRITZBOX_Web_CmdGet( $hash, \@getCmdArray ) $result = FRITZBOX_Web_CmdGet( $hash, \@getCmdArray )
if int( @getCmdArray ) > 0; if int( @getCmdArray ) > 0;
if ($result->[0] == 1) { if ( $result->[0] == 1 ) {
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sid", $result->[1]; FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sid", $result->[1];
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sidTime", time(); FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sidTime", time();
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "readoutTime", sprintf( "%.2f", time()-$startTime);
} }
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "readoutTime", sprintf( "%.2f", time()-$startTime);
my $returnStr = join('|', @roReadings ); my $returnStr = join('|', @roReadings );
FRITZBOX_Log $hash, 5, "Handover to main process: ".$returnStr; FRITZBOX_Log $hash, 5, "Handover to main process: ".$returnStr;
return $name."|2|".encode_base64($returnStr,""); return $name."|2|".encode_base64($returnStr,"");
@ -4017,7 +4020,7 @@ sub FRITZBOX_TR064_Cmd($$$)
} }
# Set Password und User for TR064 access # Set Password und User for TR064 access
$FRITZBOX_TR064pwd = FRITZBOX_readPassword($hash); $FRITZBOX_TR064pwd = FRITZBOX_readPassword($hash) unless defined $FRITZBOX_TR064pwd;
$FRITZBOX_TR064user = AttrVal( $name, "boxUser", "dslf-config" ); $FRITZBOX_TR064user = AttrVal( $name, "boxUser", "dslf-config" );
my $host = $hash->{HOST}; my $host = $hash->{HOST};
@ -4052,6 +4055,7 @@ sub FRITZBOX_TR064_Cmd($$$)
FRITZBOX_Log $hash, 2, "TR064-Transport-Error: ".$soap->transport->status; FRITZBOX_Log $hash, 2, "TR064-Transport-Error: ".$soap->transport->status;
my %errorMsg = ( "Error" => $soap->transport->status ); my %errorMsg = ( "Error" => $soap->transport->status );
push @retArray, \%errorMsg; push @retArray, \%errorMsg;
$FRITZBOX_TR064pwd = undef;
} }
elsif( $res->fault ) { # SOAP Error - will be defined if Fault element is in the message elsif( $res->fault ) { # SOAP Error - will be defined if Fault element is in the message
# my $fcode = $s->faultcode; # # my $fcode = $s->faultcode; #
@ -4064,6 +4068,7 @@ sub FRITZBOX_TR064_Cmd($$$)
# my $fdetail = Dumper($res->faultdetail); # returns value of 'detail' element as string or object # my $fdetail = Dumper($res->faultdetail); # returns value of 'detail' element as string or object
# return "Error\n".$fdetail; # return "Error\n".$fdetail;
push @retArray, $res->faultdetail; push @retArray, $res->faultdetail;
$FRITZBOX_TR064pwd = undef;
} }
else { # normal result else { # normal result
push @retArray, $res->body; push @retArray, $res->body;
@ -4287,7 +4292,7 @@ sub FRITZBOX_Web_CmdPost($$@)
my $sid = FRITZBOX_Web_OpenCon($hash); my $sid = FRITZBOX_Web_OpenCon($hash);
unless ($sid) { unless ($sid) {
my @retArray = (0, "Didn't get a session ID"); my @retArray = (2, "Didn't get a session ID");
return \@retArray; return \@retArray;
} }
@ -4375,9 +4380,8 @@ sub FRITZBOX_Web_Query($$@)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $sid = FRITZBOX_Web_OpenCon( $hash ); my $sid = FRITZBOX_Web_OpenCon( $hash );
unless ($sid) unless ($sid) {
{ my %retHash = ( "Error" => "Didn't get a session ID", "ResetSID" => "1" ) ;
my %retHash = ( "Error" => "Didn't get a session ID" ) ;
return \%retHash; return \%retHash;
} }
@ -4396,10 +4400,6 @@ sub FRITZBOX_Web_Query($$@)
return \%retHash; return \%retHash;
} }
if ($response->is_error) {
my %retHash = ("Error" => $response->status_line);
return \%retHash;
}
if ($response->content =~ /<html>|"pid": "logout"/) { if ($response->content =~ /<html>|"pid": "logout"/) {
my %retHash = ("Error" => "Old SID not valid anymore.", "ResetSID" => "1"); my %retHash = ("Error" => "Old SID not valid anymore.", "ResetSID" => "1");
return \%retHash; return \%retHash;