jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: server_thread should get server and handler

Browse Source
This commit is contained in:
Roman Zeyde
2015-06-17 18:01:47 +03:00
parent 78d701ecdf
commit 49b7c5e2b5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sshagent/server.py
View File

@@ -45,9 +45,8 @@ def handle_connection(conn, handler):
raise
def server_thread(server, keys, signer):
def server_thread(server, handler):
log.debug('server thread started')
handler = protocol.Handler(keys=keys, signer=signer)
while True:
log.debug('waiting for connection on %s', server.getsockname())
try:
@@ -76,7 +75,8 @@ def serve(key_files, signer, sock_path=None):
keys = [formats.parse_public_key(k) for k in key_files]
environ = {'SSH_AUTH_SOCK': sock_path, 'SSH_AGENT_PID': str(os.getpid())}
with unix_domain_socket_server(sock_path) as server:
with spawn(server_thread, server=server, keys=keys, signer=signer):
handler = protocol.Handler(keys=keys, signer=signer)
with spawn(server_thread, server=server, handler=handler):
try:
yield environ
finally: