From: bluhm Date: Wed, 22 Dec 2021 16:18:49 +0000 (+0000) Subject: Replace IO::Socket::INET with IO::Socket::IP. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c4b71373113ef453d35526c47c0438391ff2eaaf;p=openbsd 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 85375681575..1240bf390f4 100644 --- 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 c2d108e26fb..932b3466185 100644 --- 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 484e1fc5725..da5658cca8b 100644 --- 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 790098618ca..38cdf09550e 100644 --- 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 0e7194766ca..997ef1371ca 100644 --- 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 56806b933f1..e8c634d2a5a 100644 --- 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 68506c86b19..47aa7159d9b 100644 --- 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 acc86323cc0..98f28d2f5f7 100644 --- 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 a5ad9f40116..fa5a8aa98bf 100644 --- 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 563426c0993..72c8f2ffde2 100644 --- 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 4a04c16cb76..b30ccaee7e5 100644 --- 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 3a240d1ff5c..cb0948e0ab5 100644 --- 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 d7446435c79..17cd890ef4c 100644 --- 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 86a034c7ed3..e5e0a94fca3 100644 --- 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 40e9809ab03..48ba5fdc560 100644 --- 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 394c4b9aceb..a065460581c 100644 --- 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 efbc314ea5d..9067999b395 100644 --- 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 8eca55b43e2..3f370395600 100644 --- 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',