Merge branch 'mnowak/replace-IO-Socket-INET6-with-IO-Socket-IP-9.11' into 'bind-9.11'
[9.11] IO::Socket::INET6 has been replaced by IO::Socket::IP See merge request isc-projects/bind9!8913
This commit is contained in:
@@ -578,7 +578,7 @@ multiple servers to run locally and communicate with one another). These
|
||||
IP addresses can be configured by running the command bin/tests/system/
|
||||
ifconfig.sh up as root.
|
||||
|
||||
Some tests require Perl and the Net::DNS and/or IO::Socket::INET6 modules,
|
||||
Some tests require Perl and the Net::DNS and/or IO::Socket::IP modules,
|
||||
and will be skipped if these are not available. Some tests require Python
|
||||
and the dnspython module and will be skipped if these are not available.
|
||||
See bin/tests/system/README for further details.
|
||||
|
||||
@@ -594,7 +594,7 @@ multiple servers to run locally and communicate with one another). These
|
||||
IP addresses can be configured by running the command
|
||||
`bin/tests/system/ifconfig.sh up` as root.
|
||||
|
||||
Some tests require Perl and the `Net::DNS` and/or `IO::Socket::INET6` modules,
|
||||
Some tests require Perl and the `Net::DNS` and/or `IO::Socket::IP` modules,
|
||||
and will be skipped if these are not available. Some tests require Python
|
||||
and the `dnspython` module and will be skipped if these are not available.
|
||||
See bin/tests/system/README for further details.
|
||||
|
||||
@@ -160,7 +160,7 @@ PERL=@PERL@
|
||||
|
||||
testsock6() {
|
||||
if test -n "$PERL" \
|
||||
&& $PERL -e "use IO::Socket::INET6;" 2> /dev/null \
|
||||
&& $PERL -e "use IO::Socket::IP;" 2> /dev/null \
|
||||
&& grep "^#define WANT_IPV6 1" "$TOP/config.h" > /dev/null 2>&1
|
||||
then
|
||||
$PERL "$TOP/bin/tests/system/testsock6.pl" "$@"
|
||||
|
||||
@@ -161,7 +161,7 @@ PERL=/usr/bin/perl
|
||||
|
||||
testsock6() {
|
||||
if test -n "$PERL" \
|
||||
&& $PERL -e "use IO::Socket::INET6;" 2> /dev/null \
|
||||
&& $PERL -e "use IO::Socket::IP;" 2> /dev/null \
|
||||
&& grep "^#define WANT_IPV6 1" "$TOP/config.h" > /dev/null 2>&1
|
||||
then
|
||||
$PERL "$TOP/bin/tests/system/testsock6.pl" "$@"
|
||||
|
||||
@@ -11,13 +11,14 @@
|
||||
|
||||
require 5.001;
|
||||
|
||||
use IO::Socket::INET6;
|
||||
use IO::Socket::IP;
|
||||
|
||||
foreach $addr (@ARGV) {
|
||||
my $sock;
|
||||
$sock = IO::Socket::INET6->new(LocalAddr => $addr,
|
||||
LocalPort => 0,
|
||||
Proto => tcp)
|
||||
$sock = IO::Socket::IP->new(LocalAddr => $addr,
|
||||
Domain => PF_INET6,
|
||||
LocalPort => 0,
|
||||
Proto => tcp)
|
||||
or die "Can't bind : $@\n";
|
||||
close($sock);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user