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

Update server_info on port open status change

Browse source
This commit is contained in:
shortcutme 2017-11-05 23:43:51 +01:00
parent 3b7750c24e
commit 4465146615
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/File/FileServer.py
View file

@ -29,6 +29,7 @@ class FileServer(ConnectionServer):
self.sites = {} self.sites = {}
self.last_request = time.time() self.last_request = time.time()
self.files_parsing = {} self.files_parsing = {}
self.ui_server = None
# Handle request to fileserver # Handle request to fileserver
def handleRequest(self, connection, message): def handleRequest(self, connection, message):
@ -80,7 +81,7 @@ class FileServer(ConnectionServer):
if self.testOpenport(port)["result"] is True: if self.testOpenport(port)["result"] is True:
self.upnp_port_opened = True self.upnp_port_opened = True
return True return True
else:
self.log.info("Upnp mapping failed :( Please forward port %s on your router to your ipaddress" % port) self.log.info("Upnp mapping failed :( Please forward port %s on your router to your ipaddress" % port)
return False return False
@ -90,8 +91,11 @@ class FileServer(ConnectionServer):
port = self.port port = self.port
back = self.testOpenportPortchecker(port) back = self.testOpenportPortchecker(port)
if back["result"] is not True and use_alternative: # If no success try alternative checker if back["result"] is not True and use_alternative: # If no success try alternative checker
return self.testOpenportCanyouseeme(port) back = self.testOpenportCanyouseeme(port)
else:
if self.ui_server:
self.ui_server.updateWebsocket()
return back return back
def testOpenportP2P(self, port=None): def testOpenportP2P(self, port=None):

1
src/main.py
View file

@ -163,6 +163,7 @@ class Actions(object):
file_server = FileServer() file_server = FileServer()
logging.info("Creating UiServer....") logging.info("Creating UiServer....")
ui_server = UiServer() ui_server = UiServer()
file_server.ui_server = ui_server
logging.info("Removing old SSL certs...") logging.info("Removing old SSL certs...")
from Crypt import CryptConnection from Crypt import CryptConnection