shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 12:20:42 +09:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug in sample that made the client running in infinite loop.

Browse Source 
hunted a bug in channel_poll that returned 0 when EOF.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@35 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Aris Adamantiadis
2005-08-31 02:20:36 +00:00
parent c7a059f0d3
commit 1b20b8df85
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libssh/channels.c
View File

@@ -674,6 +674,8 @@ int channel_poll(CHANNEL *channel, int is_stderr){
} else
return 0; /* nothing is available has said fd_poll */
}
if(channel->remote_eof)
return 1;
return buffer_get_len(buffer);
}

1
libssh/server.c
View File

@@ -27,6 +27,7 @@ MA 02111-1307, USA. */
#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <errno.h>
#include <string.h>

10
sample.c
View File

@@ -155,7 +155,7 @@ void select_loop(SSH_SESSION *session,CHANNEL *channel){
}
}
if(outchannel[0]){
while(channel_poll(outchannel[0],0)){
while(channel && channel_poll(outchannel[0],0)){
lus=channel_read(outchannel[0],readbuf,0,0);
if(lus==-1){
ssh_say(0,"error reading channel : %s\n",ssh_get_error(session));
@@ -163,10 +163,12 @@ void select_loop(SSH_SESSION *session,CHANNEL *channel){
}
if(lus==0){
ssh_say(1,"EOF received\n");
channel_free(channel);
channel=NULL;
} else
write(1,buffer_get(readbuf),lus);
}
while(channel_poll(outchannel[0],1)){ /* stderr */
while(channel && channel_poll(outchannel[0],1)){ /* stderr */
lus=channel_read(outchannel[0],readbuf,0,1);
if(lus==-1){
ssh_say(0,"error reading channel : %s\n",ssh_get_error(session));
@@ -174,11 +176,13 @@ void select_loop(SSH_SESSION *session,CHANNEL *channel){
}
if(lus==0){
ssh_say(1,"EOF received\n");
channel_free(channel);
channel=NULL;
} else
write(2,buffer_get(readbuf),lus);
}
}
if(!channel_is_open(channel)){
if(channel && !channel_is_open(channel)){
channel_free(channel);
channel=NULL;
}