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

HttpUtils.pm: add some comments

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16768 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-05-24 08:53:41 +00:00
parent 4c34f8e4bc
commit 2f87b513cf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FHEM/HttpUtils.pm
View File

@ -189,15 +189,15 @@ HttpUtils_gethostbyname($$$$)
if(!$dnsServer) { # use the blocking libc to get the IP if(!$dnsServer) { # use the blocking libc to get the IP
if($haveInet6) { if($haveInet6) {
$host = $1 if($host =~ m/^\[([a-f0-9:]+)\]+$/); $host = $1 if($host =~ m/^\[([a-f0-9:]+)\]+$/); # remove [] from IPV6
my $iaddr = Socket6::inet_pton(AF_INET6, $host); my $iaddr = Socket6::inet_pton(AF_INET6, $host); # Try it as IPV6
return $fn->($hash, undef, $iaddr) if($iaddr); return $fn->($hash, undef, $iaddr) if($iaddr);
$iaddr = Socket6::inet_pton(AF_INET , $host); $iaddr = Socket6::inet_pton(AF_INET , $host); # Try it as IPV4
return $fn->($hash, undef, $iaddr) if($iaddr); return $fn->($hash, undef, $iaddr) if($iaddr);
my ($s4, $s6); my ($s4, $s6);
my @res = Socket6::getaddrinfo($host, 80); my @res = Socket6::getaddrinfo($host, 80); # gethostbyname, blocks
for(my $i=0; $i+5<=@res; $i+=5) { for(my $i=0; $i+5<=@res; $i+=5) {
$s4 = $res[$i+3] if($res[$i] == AF_INET && !$s4); $s4 = $res[$i+3] if($res[$i] == AF_INET && !$s4);
$s6 = $res[$i+3] if($res[$i] == AF_INET6 && !$s6); $s6 = $res[$i+3] if($res[$i] == AF_INET6 && !$s6);
@ -389,11 +389,12 @@ HttpUtils_Connect($)
Socket6::pack_sockaddr_in6($port, $iaddr); Socket6::pack_sockaddr_in6($port, $iaddr);
my $ret = connect($hash->{conn}, $sa); my $ret = connect($hash->{conn}, $sa);
if(!$ret) { if(!$ret) {
if($!{EINPROGRESS} || int($!)==10035 || if($!{EINPROGRESS} ||
int($!)==10035 || # WSAEWOULDBLOCK
(int($!)==140 && $^O eq "MSWin32")) { # Nonblocking connect (int($!)==140 && $^O eq "MSWin32")) { # Nonblocking connect
$hash->{FD} = $hash->{conn}->fileno(); $hash->{FD} = $hash->{conn}->fileno();
my %timerHash=(hash=>$hash,sts=>$selectTimestamp,msg=>"connect to"); my %timerHash = (hash=>$hash,sts=>$selectTimestamp,msg=>"connect to");
$hash->{directWriteFn} = sub() { $hash->{directWriteFn} = sub() {
delete($hash->{FD}); delete($hash->{FD});
delete($hash->{directWriteFn}); delete($hash->{directWriteFn});