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

Integrates updated upnppunch with project; Makes project close ports using UPnP on exit.

Browse source
This commit is contained in:
sirMackk 2016-08-10 17:03:58 +02:00
parent 931426e4fc
commit bd5ebdb2de
4 changed files with 466 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/File/FileServer.py
View file

@ -69,13 +69,13 @@ class FileServer(ConnectionServer):
self.log.info("Trying to open port using UpnpPunch...")
try:
upnp_punch = UpnpPunch.open_port(self.port, 'ZeroNet')
upnp_punch = True
except Exception, err:
self.log.error("UpnpPunch run error: %s" % Debug.formatException(err))
upnp_punch = False
UpnpPunch.ask_to_open_port(self.port, 'ZeroNet', retries=3)
except (UpnpPunch.UpnpError, UpnpPunch.IGDError) as err:
self.log.error("UpnpPunch run error: %s" %
Debug.formatException(err))
return False
if upnp_punch and self.testOpenport(port)["result"] is True:
if self.testOpenport(port)["result"] is True:
return True
self.log.info("Upnp mapping failed :( Please forward port %s on your router to your ipaddress" % port)