diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2005-10-26 19:13:57 +0000 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2005-10-26 19:13:57 +0000 |
| commit | 7b416e5c520c4dea21e242733d64672f304fdbd3 (patch) | |
| tree | 1322367d187ac4521e45e6c8e7358e2245b2e02b /libssh/channels.c | |
| parent | c53b6b907ce7ccaf720777c18eed3eea46807bb7 (diff) | |
| download | libssh-7b416e5c520c4dea21e242733d64672f304fdbd3.tar.gz libssh-7b416e5c520c4dea21e242733d64672f304fdbd3.tar.xz libssh-7b416e5c520c4dea21e242733d64672f304fdbd3.zip | |
resolved the channel hangs on exit issue (moved EOF to read events and removed it from exceptions).
resolved stupid cute & paste error in init_md5()
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@47 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/channels.c')
| -rw-r--r-- | libssh/channels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libssh/channels.c b/libssh/channels.c index 83686af0..78b66cb5 100644 --- a/libssh/channels.c +++ b/libssh/channels.c @@ -722,7 +722,8 @@ static int channel_protocol_select(CHANNEL **rchans, CHANNEL **wchans, CHANNEL * ssh_handle_packets(chan->session); } if( (chan->stdout_buffer && buffer_get_len(chan->stdout_buffer)>0) || - (chan->stderr_buffer && buffer_get_len(chan->stderr_buffer)>0)){ + (chan->stderr_buffer && buffer_get_len(chan->stderr_buffer)>0) || + chan->remote_eof){ rout[j]=chan; ++j; } @@ -741,7 +742,7 @@ static int channel_protocol_select(CHANNEL **rchans, CHANNEL **wchans, CHANNEL * j=0; for(i=0;echans[i];++i){ chan=echans[i]; - if(chan->session->fd==-1 || !chan->open || chan->remote_eof || chan->session->data_except){ + if(chan->session->fd==-1 || !chan->open || chan->session->data_except){ eout[j]=chan; ++j; } |