GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 7a52665302 into merged_master (Bitcoin PR bitcoin/bitcoin#31239)

Browse source
This commit is contained in:
ivanlele 2026-04-02 15:45:50 +00:00
commit 5ff72e5d19
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/functional/test_framework/socks5.py
View file

@ -183,9 +183,9 @@ class Socks5Connection():
with socket.create_connection((dest["actual_to_addr"], dest["actual_to_port"])) as conn_to:
forward_sockets(self.conn, conn_to)
else:
logger.debug(f"Closing connection to {requested_to}: the destinations factory returned None")
logger.debug(f"Can't serve the connection to {requested_to}: the destinations factory returned None")
else:
logger.debug(f"Closing connection to {requested_to}: no destinations factory")
logger.debug(f"Can't serve the connection to {requested_to}: no destinations factory")
# Fall through to disconnect
except Exception as e:
@ -194,6 +194,8 @@ class Socks5Connection():
finally:
if not self.serv.keep_alive:
self.conn.close()
else:
logger.debug(f"Keeping client connection alive")
class Socks5Server():
def __init__(self, conf):