izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mosh.pl: restore compatibility with older Socket module.

Browse Source 
Also require Perl 5.14, which is the new compatibility
floor.

Fixes #758.
This commit is contained in:
John Hood
2016-05-24 10:57:54 -04:00
parent 5bc1c6c032
commit 30eb5bb515
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mosh.pl
+5 -2
View File
@@ -30,12 +30,15 @@
# this exception statement from all source files in the program, then # this exception statement from all source files in the program, then
# also delete it here. # also delete it here.
use 5.14.0;
use warnings; use warnings;
use strict; use strict;
use Getopt::Long; use Getopt::Long;
use IO::Socket; use IO::Socket;
use Text::ParseWords; use Text::ParseWords;
use Socket qw( :addrinfo IPPROTO_IP IPPROTO_IPV6 IPPROTO_TCP IPPROTO_UDP ); use Socket qw( getaddrinfo getnameinfo AI_CANONNAME AI_NUMERICHOST NI_NUMERICHOST
IPPROTO_IP IPPROTO_IPV6 IPPROTO_TCP IPPROTO_UDP );
use Errno qw(EINTR); use Errno qw(EINTR);
use POSIX qw(_exit); use POSIX qw(_exit);
@@ -473,7 +476,7 @@ sub resolvename {
( $err, @res ) = getaddrinfo( $host, $port, \%hints ); ( $err, @res ) = getaddrinfo( $host, $port, \%hints );
die "$0: could not get canonical name for $host: ${err}\n" if $err; die "$0: could not get canonical name for $host: ${err}\n" if $err;
# Then get final resolution of the canonical name. # Then get final resolution of the canonical name.
$hints{flags} = undef; delete $hints{flags};
my @newres; my @newres;
( $err, @newres ) = getaddrinfo( $res[0]{canonname}, $port, \%hints ); ( $err, @newres ) = getaddrinfo( $res[0]{canonname}, $port, \%hints );
die "$0: could not resolve canonical name ${res[0]{canonname}} for ${host}: ${err}\n" if $err; die "$0: could not resolve canonical name ${res[0]{canonname}} for ${host}: ${err}\n" if $err;