diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2008-10-29 00:25:31 +0000 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2008-10-29 00:25:31 +0000 |
commit | 3b25cbf13406cb2f775a8298d2224b187de16275 (patch) | |
tree | bcc58a530ec6299b225a54d17558f300ee928f75 /libssh/channels1.c | |
parent | 4a3554b2fa794edec0a628610e7bfb3749d76129 (diff) | |
download | libssh-3b25cbf13406cb2f775a8298d2224b187de16275.tar.gz libssh-3b25cbf13406cb2f775a8298d2224b187de16275.tar.xz libssh-3b25cbf13406cb2f775a8298d2224b187de16275.zip |
fixed a bug where channel_poll could wait forever for a packet already in socket buffer.
Inc'ed libtool numbers
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@184 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/channels1.c')
-rw-r--r-- | libssh/channels1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libssh/channels1.c b/libssh/channels1.c index d90d2398..d7affa58 100644 --- a/libssh/channels1.c +++ b/libssh/channels1.c @@ -62,7 +62,7 @@ int channel_open_session1(CHANNEL *chan){ * much simplier under ssh2. I just hope the defaults values are ok ... */ -int channel_request_pty_size1(CHANNEL *channel, char *terminal, int col, +int channel_request_pty_size1(CHANNEL *channel, char *terminal, int col, int row){ STRING *str; SSH_SESSION *session=channel->session; @@ -163,13 +163,13 @@ static void channel_rcv_data1(SSH_SESSION *session, int is_stderr){ channel_default_bufferize(channel,str->string,string_len(str), is_stderr); free(str); -} +} static void channel_rcv_close1(SSH_SESSION *session){ CHANNEL *channel=session->channels; u32 status; buffer_get_u32(session->in_buffer,&status); - /* it's much more than a channel closing. spec says it's the last + /* it's much more than a channel closing. spec says it's the last * message sent by server (strange) */ /* actually status is lost somewhere */ @@ -190,7 +190,7 @@ void channel_handle1(SSH_SESSION *session, int type){ break; default: ssh_say(0,"Unexepected message %d\n",type); - + } } |