diff options
Diffstat (limited to 'lib/PublicInbox/NetNNTPSocks.pm')
| -rw-r--r-- | lib/PublicInbox/NetNNTPSocks.pm | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lib/PublicInbox/NetNNTPSocks.pm b/lib/PublicInbox/NetNNTPSocks.pm index 8495204a..d27efba1 100644 --- a/lib/PublicInbox/NetNNTPSocks.pm +++ b/lib/PublicInbox/NetNNTPSocks.pm @@ -1,14 +1,13 @@ -# Copyright (C) 2021 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> -# wrap Net::NNTP client with SOCKS support +# wrap Net::NNTP client with SOCKS support. Convoluted, but AFAIK this +# is the only way to get SOCKS working with Net::NNTP w/o LD_PRELOAD. package PublicInbox::NetNNTPSocks; -use strict; -use v5.10.1; +use v5.12; use Net::NNTP; -our %OPT; +our %OPT; # used to pass options between ->new_socks and our ->new our @ISA = qw(IO::Socket::Socks); -my @SOCKS_KEYS = qw(ProxyAddr ProxyPort SocksVersion SocksDebug SocksResolve); # use this instead of Net::NNTP->new if using Proxy* sub new_socks { @@ -17,17 +16,21 @@ sub new_socks { local @Net::NNTP::ISA = (qw(Net::Cmd), __PACKAGE__); local %OPT = map {; defined($opt{$_}) ? ($_ => $opt{$_}) : () - } @SOCKS_KEYS; - Net::NNTP->new(%opt); # this calls our new() below: + } qw(ProxyAddr ProxyPort SocksVersion SocksDebug SocksResolve); + no warnings 'uninitialized'; # needed for $SOCKS_ERROR + my $ret = Net::NNTP->new(%opt); # calls PublicInbox::NetNNTPSocks::new + return $ret if $ret || $!{EINTR}; + $ret // die "errors: \$!=$! SOCKS=", + eval('$IO::Socket::Socks::SOCKS_ERROR // ""'), + ', SSL=', + (eval('IO::Socket::SSL->errstr') // ''), "\n"; } # called by Net::NNTP->new sub new { my ($self, %opt) = @_; @OPT{qw(ConnectAddr ConnectPort)} = @opt{qw(PeerAddr PeerPort)}; - my $ret = $self->SUPER::new(%OPT) or - die 'SOCKS error: '.eval('$IO::Socket::Socks::SOCKS_ERROR'); - $ret; + $self->SUPER::new(%OPT); } 1; |