maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error when no data received (read returns SSH_AGAIN).

Browse Source
This commit is contained in:
Michael Jumper 2013-05-20 10:44:43 -07:00
parent 5fd14b3b4d
commit 639389ced8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protocols/ssh/src/ssh_client.c
View File

@ -154,7 +154,7 @@ void* ssh_client_thread(void* data) {
guac_socket* socket = client->socket; guac_socket* socket = client->socket;
char buffer[8192]; char buffer[8192];
int bytes_read; int bytes_read = -1234;
int stdout_fd = client_data->stdout_pipe_fd[1]; int stdout_fd = client_data->stdout_pipe_fd[1];
@ -244,11 +244,14 @@ void* ssh_client_thread(void* data) {
/* While data available, write to terminal */ /* While data available, write to terminal */
while (channel_is_open(client_data->term_channel) while (channel_is_open(client_data->term_channel)
&& !channel_is_eof(client_data->term_channel) && !channel_is_eof(client_data->term_channel)) {
&& (bytes_read = channel_read(client_data->term_channel, buffer, sizeof(buffer), 0)) > 0) {
if (__write_all(stdout_fd, buffer, bytes_read) <= 0) /* Repeat read if necessary */
return NULL; if ((bytes_read = channel_read(client_data->term_channel, buffer, sizeof(buffer), 0)) == SSH_AGAIN)
continue;
if (bytes_read > 0)
__write_all(stdout_fd, buffer, bytes_read);
} }