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

Only try to close upnp opened port if necessary

Browse source
This commit is contained in:
shortcutme 2016-11-07 22:36:14 +01:00
parent cb214476e4
commit 3ba2ecedce
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/File/FileServer.py
View file

@ -24,6 +24,7 @@ class FileServer(ConnectionServer):
SiteManager.peer_blacklist.append((config.ip_external, self.port)) # Add myself to peer blacklist SiteManager.peer_blacklist.append((config.ip_external, self.port)) # Add myself to peer blacklist
else: else:
self.port_opened = None # Is file server opened on router self.port_opened = None # Is file server opened on router
self.upnp_port_opened = False
self.sites = {} self.sites = {}
self.last_request = time.time() self.last_request = time.time()
self.files_parsing = {} self.files_parsing = {}
@ -77,6 +78,7 @@ class FileServer(ConnectionServer):
return False return False
if self.testOpenport(port)["result"] is True: if self.testOpenport(port)["result"] is True:
self.upnp_port_opened = True
return True return True
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)
@ -276,7 +278,7 @@ class FileServer(ConnectionServer):
self.log.debug("Stopped.") self.log.debug("Stopped.")
def stop(self): def stop(self):
if self.running and self.port_opened: if self.running and self.upnp_port_opened:
self.log.debug('Closing port %d' % self.port) self.log.debug('Closing port %d' % self.port)
try: try:
UpnpPunch.ask_to_close_port(self.port, protos=["TCP"]) UpnpPunch.ask_to_close_port(self.port, protos=["TCP"])