From bc20665c3e76fb8dc2f304ee88bad51c40c8b40b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 9 Nov 2023 10:09:38 +0000 Subject: net_nntp_socks: more comments around how it works This is convoluted as hell but I can't figure out a better way to make Net::NNTP work with SOCKS. --- lib/PublicInbox/NetNNTPSocks.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/PublicInbox/NetNNTPSocks.pm') diff --git a/lib/PublicInbox/NetNNTPSocks.pm b/lib/PublicInbox/NetNNTPSocks.pm index 5b15dd59..306dcacb 100644 --- a/lib/PublicInbox/NetNNTPSocks.pm +++ b/lib/PublicInbox/NetNNTPSocks.pm @@ -1,13 +1,13 @@ # Copyright (C) all contributors # License: AGPL-3.0+ -# 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 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 { @@ -16,9 +16,10 @@ sub new_socks { local @Net::NNTP::ISA = (qw(Net::Cmd), __PACKAGE__); local %OPT = map {; defined($opt{$_}) ? ($_ => $opt{$_}) : () - } @SOCKS_KEYS; + } qw(ProxyAddr ProxyPort SocksVersion SocksDebug SocksResolve); no warnings 'uninitialized'; # needed for $SOCKS_ERROR - Net::NNTP->new(%opt) // die "errors: \$!=$! SOCKS=", + my $ret = Net::NNTP->new(%opt); # calls PublicInbox::NetNNTPSocks::new + $ret // die "errors: \$!=$! SOCKS=", eval('$IO::Socket::Socks::SOCKS_ERROR // ""'), ', SSL=', (eval('IO::Socket::SSL->errstr') // ''), "\n"; -- cgit v1.2.3-24-ge0c7