oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a tor issue introduced in the latest changes

Browse source
This commit is contained in:
Vadim Ushakov 2020-11-04 09:25:44 +07:00
parent 325f071329
commit 90d01e6004
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Connection/ConnectionServer.py
View file

@ -102,6 +102,7 @@ class ConnectionServer(object):
CryptConnection.manager.loadCerts() CryptConnection.manager.loadCerts()
if config.tor != "disable": if config.tor != "disable":
self.tor_manager.start() self.tor_manager.start()
self.tor_manager.startOnions()
if not self.port: if not self.port:
self.log.info("No port found, not binding") self.log.info("No port found, not binding")
return False return False

9
src/File/FileServer.py
View file

@ -260,13 +260,8 @@ class FileServer(ConnectionServer):
@util.Noparallel(queue=True) @util.Noparallel(queue=True)
def recheckPort(self): def recheckPort(self):
if not self.recheck_port: if self.recheck_port:
return
if not self.port_opened:
self.portCheck() self.portCheck()
if not self.port_opened["ipv4"]:
self.tor_manager.startOnions()
self.recheck_port = False self.recheck_port = False
# Returns False if Internet is immediately available # Returns False if Internet is immediately available
@ -322,6 +317,8 @@ class FileServer(ConnectionServer):
site.invalidateUpdateTime(invalid_interval) site.invalidateUpdateTime(invalid_interval)
def updateSites(self, check_files=False): def updateSites(self, check_files=False):
self.recheckPort()
task_nr = self.update_sites_task_next_nr task_nr = self.update_sites_task_next_nr
self.update_sites_task_next_nr += 1 self.update_sites_task_next_nr += 1