mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TcpServerUtils.pm: remove SSL/HTTP check (Forum #108926), add FWTP Hook

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21344 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2020-03-03 11:10:07 +00:00
parent 5cd7d830f8
commit 11d3c8dee7
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/TcpServerUtils.pm
View File

@@ -131,17 +131,12 @@ TcpServer_Accept($$)
$err = "" if(!$err); $err = "" if(!$err);
$err .= " ".($SSL_ERROR ? $SSL_ERROR : IO::Socket::SSL::errstr()); $err .= " ".($SSL_ERROR ? $SSL_ERROR : IO::Socket::SSL::errstr());
my $errLevel = ($err =~ m/error:14094416:SSL/ ? 5 : 1); # 61511 my $errLevel = ($err =~ m/error:14094416:SSL/ ? 5 : 1); # 61511
if($err =~ m/http request/) { # HTTP on HTTPS.
Log3 $name, $errLevel, "HTTP connect to HTTP socket (peer: $caddr)";
} else {
Log3 $name, $errLevel, "$type SSL/HTTPS error: $err (peer: $caddr)" Log3 $name, $errLevel, "$type SSL/HTTPS error: $err (peer: $caddr)"
if($err !~ m/error:00000000:lib.0.:func.0.:reason.0./); #Forum 56364 if($err !~ m/error:00000000:lib.0.:func.0.:reason.0./); #Forum 56364
close($clientinfo[0]); close($clientinfo[0]);
return undef; return undef;
} }
} }
}
my $cname = "${name}_${caddr}_${port}"; my $cname = "${name}_${caddr}_${port}";
my %nhash; my %nhash;
@@ -314,6 +309,12 @@ TcpServer_WriteBlocking($$)
{ {
my( $hash, $txt ) = @_; my( $hash, $txt ) = @_;
if($hash->{WriteFn}) { # FWTP needs it
no strict "refs";
return &{$hash->{WriteFn}}($hash, \$txt);
use strict "refs";
}
my $sock = $hash->{CD}; my $sock = $hash->{CD};
return undef if(!$sock); return undef if(!$sock);
my $off = 0; my $off = 0;