Merge remote-tracking branch 'origin/master' into fix-start-dir

Author: caryoscelus

src/Config.py

@@ -256,6 +256,7 @@ def createArguments(self):
         self.parser.add_argument('--ip_local', help='My local ips', default=ip_local, type=int, metavar='ip', nargs='*')
         self.parser.add_argument('--ip_external', help='Set reported external ip (tested on start if None)', metavar='ip', nargs='*')
         self.parser.add_argument('--offline', help='Disable network communication', action='store_true')
+        self.parser.add_argument('--disable_port_check', help='Disable checking port', action='store_true')
 
         self.parser.add_argument('--disable_udp', help='Disable UDP connections', action='store_true')
         self.parser.add_argument('--proxy', help='Socks proxy address', metavar='ip:port')

src/File/FileServer.py

@@ -152,9 +152,13 @@ def reload(self):
         FileRequest = imp.load_source("FileRequest", "src/File/FileRequest.py").FileRequest
 
     def portCheck(self):
-        if config.offline or config.tor == 'always':
-            msg = "Offline mode" if config.offline else "Tor-only"
-            self.log.info(f'{msg}: port check disabled')
+        if config.offline or config.tor == 'always' or config.disable_port_check:
+            if config.offline:
+                self.log.info(f'Offline mode: port check disabled')
+            elif config.tor == 'always':
+                self.log.info('Tor-only mode: port check disabled')
+            else:
+                self.log.info('Port check disabled')
             res = {"ipv4": None, "ipv6": None}
             self.port_opened = res
             return res