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

Cleaner way to record external ips from port checkers

Browse source
This commit is contained in:
shortcutme 2019-01-24 15:20:37 +01:00
parent 37979b4f9c
commit fdb06ad973
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/File/FileServer.py
View file

@ -173,18 +173,14 @@ class FileServer(ConnectionServer):
self.log.info("Invalid IPv6 address from port check: %s" % res_ipv6["ip"]) self.log.info("Invalid IPv6 address from port check: %s" % res_ipv6["ip"])
res_ipv6["opened"] = False res_ipv6["opened"] = False
if res_ipv4["ip"]: config.ip_external = []
config.ip_external = res_ipv4["ip"] for res_ip in [res_ipv4, res_ipv6]:
SiteManager.peer_blacklist.append((res_ipv4["ip"], self.port)) if res_ip["ip"] and res_ip["ip"] not in config.ip_external:
else: config.ip_external.append(res_ip["ip"])
config.ip_external = False SiteManager.peer_blacklist.append((res_ip["ip"], self.port))
if res_ipv6["ip"]:
SiteManager.peer_blacklist.append((res_ipv6["ip"], self.port))
self.log.info("Server port opened ipv4: %s, ipv6: %s" % (res_ipv4["opened"], res_ipv6["opened"])) self.log.info("Server port opened ipv4: %s, ipv6: %s" % (res_ipv4["opened"], res_ipv6["opened"]))
res = {"ipv4": res_ipv4["opened"], "ipv6": res_ipv6["opened"]} res = {"ipv4": res_ipv4["opened"], "ipv6": res_ipv6["opened"]}
self.port_opened.update(res) self.port_opened.update(res)