FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

72_FRITZBOX.pm: get <name> tr064Command gehärtet

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27336 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jowiemann 2023-03-17 15:03:29 +00:00
parent bcea6ae060
commit 0b4f783dad
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
fhem/FHEM/72_FRITZBOX.pm
View File

@ -41,7 +41,7 @@ use warnings;
use Blocking; use Blocking;
use HttpUtils; use HttpUtils;
my $ModulVersion = "07.50.9b"; my $ModulVersion = "07.50.9c";
my $missingModul = ""; my $missingModul = "";
my $missingModulWeb = ""; my $missingModulWeb = "";
my $missingModulTR064 = ""; my $missingModulTR064 = "";
@ -246,7 +246,7 @@ sub FRITZBOX_Define($$)
$hash->{NAME} = $name; $hash->{NAME} = $name;
$hash->{VERSION} = $ModulVersion; $hash->{VERSION} = $ModulVersion;
$hash->{HOST} = "undefined"; $hash->{HOST} = "fritz.box";
$hash->{HOST} = $args[2] if defined $args[2] && $args[2] =~ m=$URL_MATCH=i; $hash->{HOST} = $args[2] if defined $args[2] && $args[2] =~ m=$URL_MATCH=i;
$hash->{fhem}{definedHost} = $hash->{HOST}; # to cope with old attribute definitions $hash->{fhem}{definedHost} = $hash->{HOST}; # to cope with old attribute definitions
@ -4501,33 +4501,43 @@ sub FRITZBOX_TR064_Cmd($$$)
-> uri( "urn:dslforum-org:service:".$service ) -> uri( "urn:dslforum-org:service:".$service )
-> proxy('https://'.$host.":".$port."/upnp/control/".$control, ssl_opts => [ SSL_verify_mode => 0 ], timeout => 10 ) -> proxy('https://'.$host.":".$port."/upnp/control/".$control, ssl_opts => [ SSL_verify_mode => 0 ], timeout => 10 )
-> readable(1); -> readable(1);
my $res = $soap -> call( $action => @soapParams );
unless( $res ) { # Transport-Error my $res = eval { $soap -> call( $action => @soapParams )};
FRITZBOX_Log $hash, 5, "DEBUG: TR064-Transport-Error: ".$soap->transport->status;
my %errorMsg = ( "Error" => $soap->transport->status );
push @retArray, \%errorMsg;
$FRITZBOX_TR064pwd = undef;
}
elsif( $res->fault ) { # SOAP Error - will be defined if Fault element is in the message
# my $fcode = $s->faultcode; #
# my $fstring = $s->faultstring; # also available
# my $factor = $s->faultactor;
my $ecode = $res->faultdetail->{'UPnPError'}->{'errorCode'}; if ($@) {
my $edesc = $res->faultdetail->{'UPnPError'}->{'errorDescription'}; FRITZBOX_Log $hash, 2, "INFO: TR064-PARAM-Error: " . $@;
my %errorMsg = ( "Error" => $@ );
push @retArray, \%errorMsg;
$FRITZBOX_TR064pwd = undef;
FRITZBOX_Log $hash, 5, "DEBUG: TR064 error $ecode:$edesc ($logMsg)"; } else {
@{$cmdArray} = (); unless( $res ) { # Transport-Error
# my $fdetail = Dumper($res->faultdetail); # returns value of 'detail' element as string or object FRITZBOX_Log $hash, 5, "DEBUG: TR064-Transport-Error: ".$soap->transport->status;
# return "Error\n".$fdetail; my %errorMsg = ( "Error" => $soap->transport->status );
push @retArray, \%errorMsg;
$FRITZBOX_TR064pwd = undef;
}
elsif( $res->fault ) { # SOAP Error - will be defined if Fault element is in the message
# my $fcode = $s->faultcode; #
# my $fstring = $s->faultstring; # also available
# my $factor = $s->faultactor;
push @retArray, $res->faultdetail; my $ecode = $res->faultdetail->{'UPnPError'}->{'errorCode'};
$FRITZBOX_TR064pwd = undef; my $edesc = $res->faultdetail->{'UPnPError'}->{'errorDescription'};
}
else { # normal result FRITZBOX_Log $hash, 5, "DEBUG: TR064 error $ecode:$edesc ($logMsg)";
push @retArray, $res->body;
@{$cmdArray} = ();
# my $fdetail = Dumper($res->faultdetail); # returns value of 'detail' element as string or object
# return "Error\n".$fdetail;
push @retArray, $res->faultdetail;
$FRITZBOX_TR064pwd = undef;
}
else { # normal result
push @retArray, $res->body;
}
} }
} }