From d4a1764d209fa5e1817bff16ef060b532a1f2171 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 6 Apr 2018 18:18:10 +0200 Subject: [PATCH] Rev3408, Use fixed 15441 port in tor always mode --- src/Config.py | 5 +++-- src/File/FileServer.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Config.py b/src/Config.py index a2a6b4f3..1d68b753 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.2" - self.rev = 3407 + self.rev = 3408 self.argv = argv self.action = None self.config_file = "zeronet.conf" @@ -257,7 +257,8 @@ class Config(object): self.parser.add_argument('--tor_controller', help='Tor controller address', metavar='ip:port', default='127.0.0.1:9051') self.parser.add_argument('--tor_proxy', help='Tor proxy address', metavar='ip:port', default='127.0.0.1:9050') self.parser.add_argument('--tor_password', help='Tor controller password', metavar='password') - self.parser.add_argument('--tor_hs_limit', help='Maximum number of hidden services', metavar='limit', type=int, default=10) + self.parser.add_argument('--tor_hs_limit', help='Maximum number of hidden services in Tor always mode', metavar='limit', type=int, default=10) + self.parser.add_argument('--tor_hs_port', help='Hidden service port in Tor always mode', metavar='limit', type=int, default=15441) self.parser.add_argument('--version', action='version', version='ZeroNet %s r%s' % (self.version, self.rev)) self.parser.add_argument('--end', help='Stop multi value argument parsing', action='store_true') diff --git a/src/File/FileServer.py b/src/File/FileServer.py index 65882bbd..55c1a1b1 100644 --- a/src/File/FileServer.py +++ b/src/File/FileServer.py @@ -25,8 +25,10 @@ class FileServer(ConnectionServer): self.log = logging.getLogger("FileServer") ip = ip.replace("*", "0.0.0.0") - should_use_random_port = port == 0 or config.tor == "always" - if should_use_random_port: + if config.tor == "always": + port = config.tor_hs_port + config.fileserver_port = port + elif port == 0: # Use random port port_range_from, port_range_to = map(int, config.fileserver_port_range.split("-")) port = self.getRandomPort(ip, port_range_from, port_range_to) config.fileserver_port = port