Add Tor-specific port options for IRC

docs/ENV-NOTES

@@ -86,15 +86,21 @@ BANDWIDTH_LIMIT  - per-session periodic bandwith usage limit in bytes.
 
 If you want IRC connectivity to advertise your node:
 
-IRC             - set to anything non-empty
-IRC_NICK        - the nick to use when connecting to IRC.  The default is a
-                  hash of REPORT_HOST.  Either way 'E_' will be prepended.
-REPORT_HOST     - the host to advertise.  Defaults to HOST.
-REPORT_HOST_TOR - Tor .onion address to advertise.  Uses TCP/SSL_PORT rather
-                - than REPORT_* ports.
-REPORT_TCP_PORT - the TCP port to advertise.  Defaults to TCP_PORT.
-                - '0' disables publishing the port for public use.
-REPORT_SSL_PORT - the SSL port to advertise.  Defaults to SSL_PORT.
+IRC                 - set to anything non-empty
+IRC_NICK            - the nick to use when connecting to IRC.  The default is a
+                      hash of REPORT_HOST.  Either way 'E_' will be prepended.
+REPORT_HOST         - the host to advertise.  Defaults to HOST.
+REPORT_TCP_PORT     - the TCP port to advertise.  Defaults to TCP_PORT.
+                      '0' disables publishing the port.
+REPORT_SSL_PORT     - the SSL port to advertise.  Defaults to SSL_PORT.
+                      '0' disables publishing the port.
+REPORT_HOST_TOR     - Tor .onion address to advertise.  Appends '_tor" to nick.
+REPORT_TCP_PORT_TOR - the TCP port to advertise for Tor.  Defaults to
+                      REPORT_TCP_PORT, unless it is '0', then use TCP_PORT.
+                      '0' disables publishing the port.
+REPORT_SSL_PORT_TOR - the SSL port to advertise for Tor.  Defaults to
+                      REPORT_SSL_PORT, unless it is '0', then use SSL_PORT.
+                      '0' disables publishing the port.
 
 If synchronizing from the Genesis block your performance might change
 by tweaking the following cache variables.  Cache size is only checked

server/env.py

@@ -51,12 +51,20 @@ class Env(LoggedClass):
         self.max_session_subs = self.integer('MAX_SESSION_SUBS', 50000)
         self.bandwidth_limit = self.integer('BANDWIDTH_LIMIT', 2000000)
         # IRC
+        self.irc = self.default('IRC', False)
+        self.irc_nick = self.default('IRC_NICK', None)
         self.report_tcp_port = self.integer('REPORT_TCP_PORT', self.tcp_port)
         self.report_ssl_port = self.integer('REPORT_SSL_PORT', self.ssl_port)
         self.report_host = self.default('REPORT_HOST', self.host)
+        self.report_tcp_port_tor = self.integer('REPORT_TCP_PORT_TOR',
+                                                self.report_tcp_port
+                                                if self.report_tcp_port else
+                                                self.tcp_port)
+        self.report_ssl_port_tor = self.integer('REPORT_SSL_PORT_TOR',
+                                                self.report_ssl_port
+                                                if self.report_ssl_port else
+                                                self.ssl_port)
         self.report_host_tor = self.default('REPORT_HOST_TOR', None)
-        self.irc_nick = self.default('IRC_NICK', None)
-        self.irc = self.default('IRC', False)
         # Debugging
         self.force_reorg = self.integer('FORCE_REORG', 0)
 

server/irc.py

@@ -53,8 +53,8 @@ class IRC(LoggedClass):
         if env.report_host_tor:
             self.clients.append( IrcClient(irc_address, self.nick + '_tor',
                                            env.report_host_tor,
-                                           env.tcp_port,
-                                           env.ssl_port) )
+                                           env.report_tcp_port_tor,
+                                           env.report_ssl_port_tor) )
 
         self.peer_regexp = re.compile('({}[^!]*)!'.format(self.prefix))
         self.peers = {}