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

fix UPnP support

Browse Source
This commit is contained in:
Kashiko Koibumi 2024-05-20 09:44:20 +09:00
parent b59536b058
commit 0fce506f11
No known key found for this signature in database
GPG Key ID: 8F06E069E37C40C4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/upnp.py
View File

@ -4,13 +4,13 @@ Complete UPnP port forwarding implementation in separate thread.
Reference: http://mattscodecave.com/posts/using-python-and-upnp-to-forward-a-port Reference: http://mattscodecave.com/posts/using-python-and-upnp-to-forward-a-port
""" """
import httplib import http.client
import re import re
import socket import socket
import time import time
import urllib2 from urllib.request import urlopen
from random import randint from random import randint
from urlparse import urlparse import urllib.parse
from xml.dom.minidom import Document # nosec B408 from xml.dom.minidom import Document # nosec B408
from defusedxml.minidom import parseString from defusedxml.minidom import parseString
@ -101,14 +101,14 @@ class Router: # pylint: disable=old-style-class
header[part[0].lower()] = part[1] header[part[0].lower()] = part[1]
try: try:
self.routerPath = urlparse(header['location']) self.routerPath = urllib.parse(header['location'])
if not self.routerPath or not hasattr(self.routerPath, "hostname"): if not self.routerPath or not hasattr(self.routerPath, "hostname"):
logger.error("UPnP: no hostname: %s", header['location']) logger.error("UPnP: no hostname: %s", header['location'])
except KeyError: except KeyError:
logger.error("UPnP: missing location header") logger.error("UPnP: missing location header")
# get the profile xml file and read it into a variable # get the profile xml file and read it into a variable
directory = urllib2.urlopen(header['location']).read() directory = urlopen(header['location']).read()
# create a DOM object that represents the `directory` document # create a DOM object that represents the `directory` document
dom = parseString(directory) dom = parseString(directory)
@ -173,7 +173,7 @@ class Router: # pylint: disable=old-style-class
def soapRequest(self, service, action, arguments=None): def soapRequest(self, service, action, arguments=None):
"""Make a request to a router""" """Make a request to a router"""
conn = httplib.HTTPConnection(self.routerPath.hostname, self.routerPath.port) conn = http.client.HTTPConnection(self.routerPath.hostname, self.routerPath.port)
conn.request( conn.request(
'POST', 'POST',
self.path, self.path,
@ -315,7 +315,7 @@ class uPnPThread(StoppableThread):
try: try:
logger.debug("Sending UPnP query") logger.debug("Sending UPnP query")
self.sock.sendto(ssdpRequest, (uPnPThread.SSDP_ADDR, uPnPThread.SSDP_PORT)) self.sock.sendto(ssdpRequest.encode(), (uPnPThread.SSDP_ADDR, uPnPThread.SSDP_PORT))
except: # noqa:E722 except: # noqa:E722
logger.exception("UPnP send query failed") logger.exception("UPnP send query failed")