From 390bab2a3ab1d3e4158248b1a538a5112e45c9b1 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Mon, 21 Mar 2016 22:22:36 +0100 Subject: [PATCH] UPnP fixes: - external port iterator fix - error handler fix --- src/upnp.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/upnp.py b/src/upnp.py index 19f211f9..3827d7ef 100644 --- a/src/upnp.py +++ b/src/upnp.py @@ -160,7 +160,7 @@ class Router: logger.error("UPnP error: %s", respData) raise UPnPError(errinfo[0].childNodes[0].data) except: - raise UPnPError("Unable to parse SOAP error: %s", respData) + raise UPnPError("Unable to parse SOAP error: %s" %(respData)) return resp class uPnPThread(threading.Thread, StoppableThread): @@ -194,7 +194,10 @@ class uPnPThread(threading.Thread, StoppableThread): lastSent = 0 while shared.shutdown == 0 and shared.safeConfigGetBoolean('bitmessagesettings', 'upnp'): if time.time() - lastSent > self.sendSleep and len(self.routers) == 0: - self.sendSearchRouter() + try: + self.sendSearchRouter() + except: + pass lastSent = time.time() try: while shared.shutdown == 0 and shared.safeConfigGetBoolean('bitmessagesettings', 'upnp'): @@ -269,7 +272,7 @@ class uPnPThread(threading.Thread, StoppableThread): extPort = self.extPort # try external port from last time next else: extPort = randint(32767, 65535) - logger.debug("Requesting UPnP mapping for %s:%i on external port %i", localIP, self.localPort, extPort) + logger.debug("Attempt %i, requesting UPnP mapping for %s:%i on external port %i", i, localIP, self.localPort, extPort) router.AddPortMapping(extPort, self.localPort, localIP, 'TCP', 'BitMessage') shared.extPort = extPort self.extPort = extPort