citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

UPnP logging improvlement

This commit is contained in:
mailchuck 2015-11-21 10:15:20 +01:00 committed by Peter Surda
parent 3c9df7151c
commit 5432c6e0c8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/upnp.py
View File

@ -23,8 +23,18 @@ def searchRouter():
routers = [] routers = []
sock.settimeout(0.5) sock.settimeout(0.5)
try: try:
resp,(ip,port) = sock.recvfrom(1000) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
while resp: sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 2)
sock.settimeout(2)
logger.debug("Sending UPnP query")
sock.sendto(ssdpRequest, (SSDP_ADDR, SSDP_PORT))
except:
logger.exception("UPnP sock failed")
try:
while True:
resp,(ip,port) = sock.recvfrom(1000)
if resp is None:
continue
routers.append(Router(resp, ip)) routers.append(Router(resp, ip))
resp,(ip,port) = sock.recvfrom(1000) resp,(ip,port) = sock.recvfrom(1000)
except:pass except:pass
@ -146,10 +156,12 @@ class Router:
return resp return resp
def DeletePortMapping(self, externalPort, protocol): def DeletePortMapping(self, externalPort, protocol):
from debug import logger
resp = self.soapRequest('WANIPConnection:1', 'DeletePortMapping', [ resp = self.soapRequest('WANIPConnection:1', 'DeletePortMapping', [
('NewExternalPort', str(externalPort)), ('NewExternalPort', str(externalPort)),
('NewProtocol', protocol), ('NewProtocol', protocol),
]) ])
logger.info("Removed UPnP mapping on external port %i", extPort)
return resp return resp
def GetExternalIPAddress(self): def GetExternalIPAddress(self):