Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Conversation 0 Commits 399 Files Changed 133 +6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e82e33fa51 - Show all commits

6
src/upnp.py
View File

@ -6,6 +6,7 @@ import threading
import time import time
from helper_threading import * from helper_threading import *
import shared import shared
import tr
def createRequestXML(service, action, arguments=[]): def createRequestXML(service, action, arguments=[]):
from xml.dom.minidom import Document from xml.dom.minidom import Document
@ -196,6 +197,7 @@ class uPnPThread(threading.Thread, StoppableThread):
logger.debug("Found UPnP router at %s", ip) logger.debug("Found UPnP router at %s", ip)
self.routers.append(newRouter) self.routers.append(newRouter)
self.createPortMapping(newRouter) self.createPortMapping(newRouter)
shared.UISignalQueue.put(('updateStatusBar', tr.translateText("MainWindow",'UPnP port mapping established')))
break break
except socket.timeout as e: except socket.timeout as e:
pass pass
@ -206,10 +208,14 @@ class uPnPThread(threading.Thread, StoppableThread):
self.createPortMapping(router) self.createPortMapping(router)
self.sock.shutdown(socket.SHUT.RDWR) self.sock.shutdown(socket.SHUT.RDWR)
self.sock.close() self.sock.close()
deleted = False
for router in self.routers: for router in self.routers:
if router.extPort is not None: if router.extPort is not None:
deleted = True
self.deletePortMapping(router) self.deletePortMapping(router)
shared.extPort = None shared.extPort = None
if deleted:
shared.UISignalQueue.put(('updateStatusBar', tr.translateText("MainWindow",'UPnP port mapping removed')))
logger.debug("UPnP thread done") logger.debug("UPnP thread done")
def sendSearchRouter(self): def sendSearchRouter(self):