From d90478448985a1e21cc240fd87fc5a14b4bb978a Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Wed, 22 Jan 2014 21:06:13 +0100 Subject: Make function ssh_channel_accept() nonblocking if timeout is 0. Reviewed-by: Andreas Schneider --- src/channels.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/channels.c b/src/channels.c index 17aed906..6974301d 100644 --- a/src/channels.c +++ b/src/channels.c @@ -2022,7 +2022,11 @@ static ssh_channel ssh_channel_accept(ssh_session session, int channeltype, * 50 ms. So we need to decrement by 100 ms. */ for (t = timeout_ms; t >= 0; t -= 100) { - ssh_handle_packets(session, 50); + if (timeout_ms == 0) { + ssh_handle_packets(session, 0); + } else { + ssh_handle_packets(session, 50); + } if (session->ssh_message_list) { iterator = ssh_list_get_iterator(session->ssh_message_list); -- cgit v1.2.3