generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libssh2_channel_close now waits for a SSH_MSG_CHANNEL_CLOSE message

Browse Source 
from the server as mandated by the RFC.  Not doing so causes an OpenSSH
server to occasionally corrupt (truncate) short files uploaded by scp
(which manifests itself as a failure of test603 in the curl regression
test suite).
This commit is contained in:
Dan Fandrich
2007-04-12 21:24:36 +00:00
parent 0cf3845302
commit 164c6e9fc5
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -39,6 +39,9 @@ Version
Improve debugging code. Avoids many #ifdef's.
Improved session closing to avoid potentially truncated files on
OpenSSH servers (Dan Fandrich)
Version 0.14
------------

18
src/channel.c
View File

@@ -1381,6 +1381,7 @@ LIBSSH2_API int libssh2_channel_close(LIBSSH2_CHANNEL *channel)
{
LIBSSH2_SESSION *session = channel->session;
unsigned char packet[5];
int rc = 0;
if (channel->local.close) {
/* Already closed, act like we sent another close, even though we didn't... shhhhhh */
@@ -1401,9 +1402,22 @@ LIBSSH2_API int libssh2_channel_close(LIBSSH2_CHANNEL *channel)
return -1;
}
/* TODO: Wait up to a timeout value for a CHANNEL_CLOSE to come back, to avoid the problem alluded to in channel_nextid */
/* We must wait for the remote SSH_MSG_CHANNEL_CLOSE message */
if (!channel->remote.close) {
libssh2pack_t ret;
/* set blocking mode */
int bl = _libssh2_channel_set_blocking(channel, 1);
do {
ret = libssh2_packet_read(session);
if ((ret < 0) && (ret != PACKET_EAGAIN)) {
rc = -1;
}
} while (ret != SSH_MSG_CHANNEL_CLOSE && rc == 0);
return 0;
_libssh2_channel_set_blocking(channel, bl);
}
return rc;
}
/* }}} */