FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-28 15:04:51 +00:00
Code Issues Releases Wiki Activity

AF_INET6() is better

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@834 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-02-06 08:50:25 +00:00
parent 69088ba06a
commit 451458c088
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/fhem.pl
View File

@ -167,7 +167,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool my $duplidx=0; # helper for the above pool
my $cvsid = '$Id: fhem.pl,v 1.130 2011-02-06 08:30:05 rudolfkoenig Exp $'; my $cvsid = '$Id: fhem.pl,v 1.131 2011-02-06 08:50:25 rudolfkoenig Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@ -406,7 +406,7 @@ while (1) {
sockaddr_in6($clientinfo[1]) : sockaddr_in6($clientinfo[1]) :
sockaddr_in($clientinfo[1]); sockaddr_in($clientinfo[1]);
my $caddr = $ipv6 ? my $caddr = $ipv6 ?
inet_ntop(AF_INET6, $iaddr): inet_ntop(AF_INET6(), $iaddr):
inet_ntoa($iaddr); inet_ntoa($iaddr);
my $af = $attr{global}{allowfrom}; my $af = $attr{global}{allowfrom};
if($af) { if($af) {
@ -1553,7 +1553,7 @@ GlobalAttr($$)
my $server2; my $server2;
my @opts = ( my @opts = (
Domain => ($ipv6 ? AF_INET6 : AF_UNSPEC), # Linux bug Domain => ($ipv6 ? AF_INET6() : AF_UNSPEC), # Linux bug
LocalHost => ($global ? undef : "localhost"), LocalHost => ($global ? undef : "localhost"),
LocalPort => $port, LocalPort => $port,
Listen => 10, Listen => 10,

4
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -103,7 +103,7 @@ FW_Define($$)
} }
my @opts = ( my @opts = (
Domain => ($hash->{IPV6} ? AF_INET6 : AF_UNSPEC), # Linux bug Domain => ($hash->{IPV6} ? AF_INET6() : AF_UNSPEC), # Linux bug
LocalHost => ($global ? undef : "localhost"), LocalHost => ($global ? undef : "localhost"),
LocalPort => $port, LocalPort => $port,
Listen => 10, Listen => 10,
@ -172,7 +172,7 @@ FW_Read($)
my %nhash; my %nhash;
my $cname = "FHEMWEB:". my $cname = "FHEMWEB:".
($hash->{IPV6} ? ($hash->{IPV6} ?
inet_ntop(AF_INET6, $clientsock[1]) : inet_ntop(AF_INET6(), $clientsock[1]) :
inet_ntoa($clientsock[1])) .":".$clientsock[0]; inet_ntoa($clientsock[1])) .":".$clientsock[0];
$nhash{NR} = $devcount++; $nhash{NR} = $devcount++;
$nhash{NAME} = $cname; $nhash{NAME} = $cname;