[PATCH 05/13] net_nntp_socks: more comments around how it works

[Eric Wong <e@80x24.org>]

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(-)

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 <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 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";