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

resolved the channel hangs on exit issue (moved EOF to read events and removed it from exceptions).

Browse Source 
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
This commit is contained in:
Aris Adamantiadis
2005-10-26 19:13:57 +00:00
parent c53b6b907c
commit 7b416e5c52
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libssh/buffer.c
View File

@@ -31,10 +31,12 @@ BUFFER *buffer_new(){
} }
void buffer_free(BUFFER *buffer){ void buffer_free(BUFFER *buffer){
// printf("buffer %p : free(%p);\n",buffer,buffer->data);
if(buffer->data){ if(buffer->data){
memset(buffer->data,0,buffer->allocated); /* burn the data */ memset(buffer->data,0,buffer->allocated); /* burn the data */
free(buffer->data); free(buffer->data);
} }
memset(buffer,'x',sizeof (*buffer));
free(buffer); free(buffer);
} }
@@ -46,7 +48,9 @@ void buffer_reinit(BUFFER *buffer){
static void realloc_buffer(BUFFER *buffer,int needed){ static void realloc_buffer(BUFFER *buffer,int needed){
needed=(needed+0x7f) & ~0x7f; needed=(needed+0x7f) & ~0x7f;
// printf("buffer %p : realloc(%x,%d)=",buffer,buffer->data,needed);
buffer->data=realloc(buffer->data,needed); buffer->data=realloc(buffer->data,needed);
// printf("%p\n",buffer->data);
buffer->allocated=needed; buffer->allocated=needed;
} }

5
libssh/channels.c
View File

@@ -722,7 +722,8 @@ static int channel_protocol_select(CHANNEL **rchans, CHANNEL **wchans, CHANNEL *
ssh_handle_packets(chan->session); ssh_handle_packets(chan->session);
} }
if( (chan->stdout_buffer && buffer_get_len(chan->stdout_buffer)>0) || 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; rout[j]=chan;
++j; ++j;
} }
@@ -741,7 +742,7 @@ static int channel_protocol_select(CHANNEL **rchans, CHANNEL **wchans, CHANNEL *
j=0; j=0;
for(i=0;echans[i];++i){ for(i=0;echans[i];++i){
chan=echans[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; eout[j]=chan;
++j; ++j;
} }

2
libssh/wrapper.c
View File

@@ -239,7 +239,7 @@ void sha1(unsigned char *digest,int len,unsigned char *hash){
} }
MD5CTX md5_init(){ MD5CTX md5_init(){
MD5CTX c=malloc(sizeof(c)); MD5CTX c=malloc(sizeof(*c));
MD5_Init(c); MD5_Init(c);
return c; return c;
} }