Upnp opening function return success value

This commit is contained in:
shortcutme 2019-03-18 01:07:46 +01:00
parent a620bf2174
commit 33e4c088b9
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -340,10 +340,12 @@ def _communicate_with_igd(port=15441,
'Failed to communicate with igd using port {0} on local machine after {1} tries.'.format( 'Failed to communicate with igd using port {0} on local machine after {1} tries.'.format(
port, retries)) port, retries))
return success
def ask_to_open_port(port=15441, desc="UpnpPunch", retries=3, protos=("TCP", "UDP")): def ask_to_open_port(port=15441, desc="UpnpPunch", retries=3, protos=("TCP", "UDP")):
logger.debug("Trying to open port %d." % port) logger.debug("Trying to open port %d." % port)
_communicate_with_igd(port=port, return _communicate_with_igd(port=port,
desc=desc, desc=desc,
retries=retries, retries=retries,
fn=_create_open_message, fn=_create_open_message,
@ -353,7 +355,7 @@ def ask_to_open_port(port=15441, desc="UpnpPunch", retries=3, protos=("TCP", "UD
def ask_to_close_port(port=15441, desc="UpnpPunch", retries=3, protos=("TCP", "UDP")): def ask_to_close_port(port=15441, desc="UpnpPunch", retries=3, protos=("TCP", "UDP")):
logger.debug("Trying to close port %d." % port) logger.debug("Trying to close port %d." % port)
# retries=1 because multiple successes cause 500 response and failure # retries=1 because multiple successes cause 500 response and failure
_communicate_with_igd(port=port, return _communicate_with_igd(port=port,
desc=desc, desc=desc,
retries=retries, retries=retries,
fn=_create_close_message, fn=_create_close_message,
@ -368,11 +370,11 @@ if __name__ == "__main__":
s = time.time() s = time.time()
print("Opening port...") print("Opening port...")
print(ask_to_open_port(15443, "ZeroNet", protos=["TCP"])) print("Success:", ask_to_open_port(15443, "ZeroNet", protos=["TCP"]))
print("Done in", time.time() - s) print("Done in", time.time() - s)
"""
print("Closing port...") print("Closing port...")
print(ask_to_close_port(15443, "ZeroNet", protos=["TCP"])) print("Success:", ask_to_close_port(15443, "ZeroNet", protos=["TCP"]))
print("Done in", time.time() - s) print("Done in", time.time() - s)
"""