LBRYCommunity/aioupnp
1
0
Fork 0
Code Issues 7 Pull requests 1 Projects Releases 1 Packages Wiki Activity

more

Browse source
This commit is contained in:
Jack Robison 2018-08-02 10:02:52 -04:00
parent c745bbac01
commit 6eb5624273
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
txupnp/upnp.py
View file

@ -11,12 +11,12 @@ log = logging.getLogger(__name__)
class UPnP(object): class UPnP(object):
def __init__(self, reactor, miniupnpc_fallback=True): def __init__(self, reactor, try_miniupnpc_fallback=True):
self._reactor = reactor self._reactor = reactor
self._miniupnpc_fallback = miniupnpc_fallback self.try_miniupnpc_fallback = try_miniupnpc_fallback
self.soap_manager = SOAPServiceManager(reactor) self.soap_manager = SOAPServiceManager(reactor)
self.miniupnpc_runner = None self.miniupnpc_runner = None
self._miniupnpc_igd_url = None self.miniupnpc_igd_url = None
@property @property
def lan_address(self): def lan_address(self):
@ -27,7 +27,7 @@ class UPnP(object):
try: try:
return self.soap_manager.get_runner() return self.soap_manager.get_runner()
except UPnPError as err: except UPnPError as err:
if self._miniupnpc_fallback and self.miniupnpc_runner: if self.try_miniupnpc_fallback and self.miniupnpc_runner:
return self.miniupnpc_runner return self.miniupnpc_runner
log.warning("upnp is not available: %s", err) log.warning("upnp is not available: %s", err)
@ -55,17 +55,24 @@ class UPnP(object):
finally: finally:
if not keep_listening: if not keep_listening:
self.soap_manager.sspd_factory.disconnect() self.soap_manager.sspd_factory.disconnect()
if not self.commands: if not found and self.try_miniupnpc_fallback:
found = yield self.start_miniupnpc_fallback()
defer.returnValue(found)
@defer.inlineCallbacks
def start_miniupnpc_fallback(self):
found = False
if not self.commands and not self.miniupnpc_runner:
log.debug("trying miniupnpc fallback") log.debug("trying miniupnpc fallback")
fallback = UPnPFallback() fallback = UPnPFallback()
success = yield fallback.discover() success = yield fallback.discover()
self._miniupnpc_igd_url = fallback.device_url self.miniupnpc_igd_url = fallback.device_url
if success: if success:
log.info("successfully started miniupnpc fallback") log.info("successfully started miniupnpc fallback")
self.miniupnpc_runner = fallback self.miniupnpc_runner = fallback
found = True found = True
if not found: if not found:
log.warning("failed to find upnp gateway") log.warning("failed to find upnp gateway using miniupnpc fallback")
defer.returnValue(found) defer.returnValue(found)
def get_external_ip(self): def get_external_ip(self):
@ -169,7 +176,7 @@ class UPnP(object):
return x return x
return json.dumps({ return json.dumps({
'txupnp': self.soap_manager.debug(include_gateway_xml=include_gateway_xml), 'txupnp': self.soap_manager.debug(include_gateway_xml=include_gateway_xml),
'miniupnpc_igd_url': self._miniupnpc_igd_url 'miniupnpc_igd_url': self.miniupnpc_igd_url
}, },
indent=2, default=default_byte indent=2, default=default_byte
) )