Replace IO::Socket::INET with IO::Socket::IP.

diff --git a/regress/sys/kern/sosplice/error/args-EBUSY.pl b/regress/sys/kern/sosplice/error/args-EBUSY.pl
index 8537568..1240bf3 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-EBUSY.pl
+++ b/regress/sys/kern/sosplice/error/args-EBUSY.pl
@@ -2,25 +2,25 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EBUSY',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket connect failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
@@ -29,7 +29,7 @@ our %args = (
        $s->setsockopt(SOL_SOCKET, SO_SPLICE, pack('i', $ss->fileno()))
            or die "splice failed: $!";
 
-       my $so = IO::Socket::INET->new(
+       my $so = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-ELOOP.pl b/regress/sys/kern/sosplice/error/args-ELOOP.pl
index c2d108e..932b346 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-ELOOP.pl
+++ b/regress/sys/kern/sosplice/error/args-ELOOP.pl
@@ -2,19 +2,19 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'ELOOP',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-ENOTCONN.pl b/regress/sys/kern/sosplice/error/args-ENOTCONN.pl
index 484e1fc..da5658c 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-ENOTCONN.pl
+++ b/regress/sys/kern/sosplice/error/args-ENOTCONN.pl
@@ -2,17 +2,17 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'ENOTCONN',
     func => sub {
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
        ) or die "socket splice failed: $!";
 

diff --git a/regress/sys/kern/sosplice/error/args-EOPNOTSUPP.pl b/regress/sys/kern/sosplice/error/args-EOPNOTSUPP.pl
index 7900986..38cdf09 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-EOPNOTSUPP.pl
+++ b/regress/sys/kern/sosplice/error/args-EOPNOTSUPP.pl
@@ -2,18 +2,18 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EOPNOTSUPP',
     func => sub {
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 1,
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
        ) or die "socket splice failed: $!";
 

diff --git a/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl b/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl
index 0e71947..997ef13 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl
+++ b/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl
@@ -2,26 +2,26 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 use Config;
 
 our %args = (
     errno => 'EINVAL',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-inet-unix-EPROTONOSUPPORT.pl b/regress/sys/kern/sosplice/error/args-inet-unix-EPROTONOSUPPORT.pl
index 56806b9..e8c634d 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-inet-unix-EPROTONOSUPPORT.pl
+++ b/regress/sys/kern/sosplice/error/args-inet-unix-EPROTONOSUPPORT.pl
@@ -2,14 +2,14 @@
 
 use strict;
 use warnings;
-use IO::Socket;
-use BSD::Socket::Splice "SO_SPLICE";
+use IO::Socket::IP;
 use IO::Socket::UNIX;
+use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EPROTONOSUPPORT',
     func => sub {
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "udp",
            LocalAddr => "127.0.0.1",
        ) or die "socket bind failed: $!";

diff --git a/regress/sys/kern/sosplice/error/args-max-EINVAL.pl b/regress/sys/kern/sosplice/error/args-max-EINVAL.pl
index 68506c8..47aa715 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-max-EINVAL.pl
+++ b/regress/sys/kern/sosplice/error/args-max-EINVAL.pl
@@ -2,26 +2,26 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 use Config;
 
 our %args = (
     errno => 'EINVAL',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-splice-EBADF.pl b/regress/sys/kern/sosplice/error/args-splice-EBADF.pl
index acc8632..98f28d2 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-splice-EBADF.pl
+++ b/regress/sys/kern/sosplice/error/args-splice-EBADF.pl
@@ -2,19 +2,19 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EBADF',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-splice-EBUSY.pl b/regress/sys/kern/sosplice/error/args-splice-EBUSY.pl
index a5ad9f4..fa5a8aa 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-splice-EBUSY.pl
+++ b/regress/sys/kern/sosplice/error/args-splice-EBUSY.pl
@@ -2,25 +2,25 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EBUSY',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket connect failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
@@ -29,7 +29,7 @@ our %args = (
        $s->setsockopt(SOL_SOCKET, SO_SPLICE, pack('i', $ss->fileno()))
            or die "splice failed: $!";
 
-       my $so = IO::Socket::INET->new(
+       my $so = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-splice-EINVAL.pl b/regress/sys/kern/sosplice/error/args-splice-EINVAL.pl
index 563426c..72c8f2f 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-splice-EINVAL.pl
+++ b/regress/sys/kern/sosplice/error/args-splice-EINVAL.pl
@@ -2,25 +2,25 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EINVAL',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
        ) or die "socket splice failed: $!";
 

diff --git a/regress/sys/kern/sosplice/error/args-splice-ENOTCONN.pl b/regress/sys/kern/sosplice/error/args-splice-ENOTCONN.pl
index 4a04c16..b30ccae 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-splice-ENOTCONN.pl
+++ b/regress/sys/kern/sosplice/error/args-splice-ENOTCONN.pl
@@ -2,25 +2,25 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'ENOTCONN',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
        ) or die "socket splice failed: $!";
 

diff --git a/regress/sys/kern/sosplice/error/args-splice-ENOTSOCK.pl b/regress/sys/kern/sosplice/error/args-splice-ENOTSOCK.pl
index 3a240d1..cb0948e 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-splice-ENOTSOCK.pl
+++ b/regress/sys/kern/sosplice/error/args-splice-ENOTSOCK.pl
@@ -2,19 +2,19 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'ENOTSOCK',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-splice-EOPNOTSUPP.pl b/regress/sys/kern/sosplice/error/args-splice-EOPNOTSUPP.pl
index d744643..17cd890 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-splice-EOPNOTSUPP.pl
+++ b/regress/sys/kern/sosplice/error/args-splice-EOPNOTSUPP.pl
@@ -2,25 +2,25 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EOPNOTSUPP',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 1,
        ) or die "socket splice failed: $!";

diff --git a/regress/sys/kern/sosplice/error/args-splice-EPROTONOSUPPORT.pl b/regress/sys/kern/sosplice/error/args-splice-EPROTONOSUPPORT.pl
index 86a034c..e5e0a94 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-splice-EPROTONOSUPPORT.pl
+++ b/regress/sys/kern/sosplice/error/args-splice-EPROTONOSUPPORT.pl
@@ -2,25 +2,25 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EPROTONOSUPPORT',
     func => sub {
-       my $sl = IO::Socket::INET->new(
+       my $sl = IO::Socket::IP->new(
            Proto => "tcp",
            Listen => 5,
            LocalAddr => "127.0.0.1",
        ) or die "socket listen failed: $!";
 
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "tcp",
            PeerAddr => $sl->sockhost(),
            PeerPort => $sl->sockport(),
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "udp",
        ) or die "socket splice failed: $!";
 

diff --git a/regress/sys/kern/sosplice/error/args-udp-ELOOP.pl b/regress/sys/kern/sosplice/error/args-udp-ELOOP.pl
index 40e9809..48ba5fd 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-udp-ELOOP.pl
+++ b/regress/sys/kern/sosplice/error/args-udp-ELOOP.pl
@@ -2,18 +2,18 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'ELOOP',
     func => sub {
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "udp",
            LocalAddr => "127.0.0.1",
        ) or die "socket bind failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "udp",
            PeerAddr => $s->sockhost(),
            PeerPort => $s->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-udp-ENOTCONN.pl b/regress/sys/kern/sosplice/error/args-udp-ENOTCONN.pl
index 394c4b9..a065460 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-udp-ENOTCONN.pl
+++ b/regress/sys/kern/sosplice/error/args-udp-ENOTCONN.pl
@@ -2,18 +2,18 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'ENOTCONN',
     func => sub {
-       my $sb = IO::Socket::INET->new(
+       my $sb = IO::Socket::IP->new(
            Proto => "udp",
            LocalAddr => "127.0.0.1",
        ) or die "socket bind failed: $!";
 
-       my $sc = IO::Socket::INET->new(
+       my $sc = IO::Socket::IP->new(
            Proto => "udp",
            PeerAddr => $sb->sockhost(),
            PeerPort => $sb->sockport(),

diff --git a/regress/sys/kern/sosplice/error/args-udp-EPROTONOSUPPORT.pl b/regress/sys/kern/sosplice/error/args-udp-EPROTONOSUPPORT.pl
index efbc314..9067999 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-udp-EPROTONOSUPPORT.pl
+++ b/regress/sys/kern/sosplice/error/args-udp-EPROTONOSUPPORT.pl
@@ -2,17 +2,17 @@
 
 use strict;
 use warnings;
-use IO::Socket;
+use IO::Socket::IP;
 use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EPROTONOSUPPORT',
     func => sub {
-       my $s = IO::Socket::INET->new(
+       my $s = IO::Socket::IP->new(
            Proto => "udp",
        ) or die "socket failed: $!";
 
-       my $ss = IO::Socket::INET->new(
+       my $ss = IO::Socket::IP->new(
            Proto => "tcp",
        ) or die "socket splice failed: $!";
 

diff --git a/regress/sys/kern/sosplice/error/args-unix-EPROTONOSUPPORT.pl b/regress/sys/kern/sosplice/error/args-unix-EPROTONOSUPPORT.pl
index 8eca55b..3f37039 100644 (file)
--- a/regress/sys/kern/sosplice/error/args-unix-EPROTONOSUPPORT.pl
+++ b/regress/sys/kern/sosplice/error/args-unix-EPROTONOSUPPORT.pl
@@ -2,9 +2,8 @@
 
 use strict;
 use warnings;
-use IO::Socket;
-use BSD::Socket::Splice "SO_SPLICE";
 use IO::Socket::UNIX;
+use BSD::Socket::Splice "SO_SPLICE";
 
 our %args = (
     errno => 'EPROTONOSUPPORT',