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

Parse ip_external on portCheck function call

Browse source
This commit is contained in:
shortcutme 2019-01-25 01:23:46 +01:00
parent 3b91be8449
commit 6460b7b0a1
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/File/FileServer.py
View file

@ -62,11 +62,6 @@ class FileServer(ConnectionServer):
self.port_opened = {} self.port_opened = {}
if config.ip_external: # Ip external defined in arguments
for ip_external in config.ip_external:
self.port_opened[helper.getIpType(ip_external)] = True
SiteManager.peer_blacklist.append((ip_external, self.port)) # Add myself to peer blacklist
self.sites = {} self.sites = {}
self.last_request = time.time() self.last_request = time.time()
self.files_parsing = {} self.files_parsing = {}
@ -151,6 +146,19 @@ class FileServer(ConnectionServer):
FileRequest = imp.load_source("FileRequest", "src/File/FileRequest.py").FileRequest FileRequest = imp.load_source("FileRequest", "src/File/FileRequest.py").FileRequest
def portCheck(self): def portCheck(self):
if config.ip_external:
for ip_external in config.ip_external:
SiteManager.peer_blacklist.append((ip_external, self.port)) # Add myself to peer blacklist
ip_external_types = set([helper.getIpType(ip) for ip in config.ip_external])
res = {
"ipv4": "ipv4" in ip_external_types,
"ipv6": "ipv6" in ip_external_types
}
self.port_opened.update(res)
self.log.info("Server port opened based on configuration ipv4: %s, ipv6: %s" % (res["ipv4"], res["ipv6"]))
return res
self.port_opened = {} self.port_opened = {}
if self.ui_server: if self.ui_server:
self.ui_server.updateWebsocket() self.ui_server.updateWebsocket()
@ -165,7 +173,7 @@ class FileServer(ConnectionServer):
if self.portchecker.portOpen(self.port): if self.portchecker.portOpen(self.port):
res_ipv4 = self.portchecker.portCheck(self.port, "ipv4") res_ipv4 = self.portchecker.portCheck(self.port, "ipv4")
if res_ipv6_thread == None: if res_ipv6_thread is None:
res_ipv6 = {"ip": None, "opened": None} res_ipv6 = {"ip": None, "opened": None}
else: else:
res_ipv6 = res_ipv6_thread.get() res_ipv6 = res_ipv6_thread.get()