nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Call every new user input consumer when it's set up.

Browse Source 
This fixes further embarrassing hangs in the wake of the big
restructuring, in which we'd assign a new function pointer into
ssh->current_user_input_fn but not immediately call it to let it
process whatever might already be waiting for it in the user input
queue.
This commit is contained in:
Simon Tatham 2018-05-18 11:40:21 +01:00
parent d294d1d0dc
commit 9c5e4947f5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh.c
View File

@ -3405,6 +3405,7 @@ static void do_ssh_init(Ssh ssh)
ssh->current_user_input_fn = ssh1_login_input; ssh->current_user_input_fn = ssh1_login_input;
} }
queue_idempotent_callback(&ssh->incoming_data_consumer); queue_idempotent_callback(&ssh->incoming_data_consumer);
queue_idempotent_callback(&ssh->user_input_consumer);
if (ssh->version == 2) if (ssh->version == 2)
queue_idempotent_callback(&ssh->ssh2_transport_icb); queue_idempotent_callback(&ssh->ssh2_transport_icb);
@ -3554,6 +3555,7 @@ static void do_ssh_connection_init(Ssh ssh)
ssh->current_incoming_data_fn = ssh2_bare_connection_rdpkt; ssh->current_incoming_data_fn = ssh2_bare_connection_rdpkt;
queue_idempotent_callback(&ssh->incoming_data_consumer); queue_idempotent_callback(&ssh->incoming_data_consumer);
ssh->current_user_input_fn = ssh2_connection_input; ssh->current_user_input_fn = ssh2_connection_input;
queue_idempotent_callback(&ssh->user_input_consumer);
update_specials_menu(ssh->frontend); update_specials_menu(ssh->frontend);
ssh->state = SSH_STATE_BEFORE_SIZE; ssh->state = SSH_STATE_BEFORE_SIZE;
@ -5255,6 +5257,7 @@ static void do_ssh1_login(void *vctx)
if (ssh->packet_dispatch[i] == ssh1_coro_wrapper_initial) if (ssh->packet_dispatch[i] == ssh1_coro_wrapper_initial)
ssh->packet_dispatch[i] = ssh1_coro_wrapper_session; ssh->packet_dispatch[i] = ssh1_coro_wrapper_session;
ssh->current_user_input_fn = ssh1_connection_input; ssh->current_user_input_fn = ssh1_connection_input;
queue_idempotent_callback(&ssh->user_input_consumer);
} }
crFinishV; crFinishV;
@ -11493,6 +11496,7 @@ static void do_ssh2_userauth(void *vctx)
*/ */
do_ssh2_connection(ssh); do_ssh2_connection(ssh);
ssh->current_user_input_fn = ssh2_connection_input; ssh->current_user_input_fn = ssh2_connection_input;
queue_idempotent_callback(&ssh->user_input_consumer);
crFinishV; crFinishV;
} }