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

SFTP: preserve the original error code more

Browse Source 
Lots of places in the code translated the original error into the more
generic LIBSSH2_ERROR_SOCKET_TIMEOUT but this turns out to distort the
original error reason a lot and makes tracking down the real origin of a
problem really hard. This change makes the original error code be
preserved to a larger extent when return up to the parent function.
This commit is contained in:
Daniel Stenberg 2012-03-12 22:52:49 +01:00
parent 7194a9bd7b
commit 9a42fac055
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/sftp.c
View File

@ -1565,7 +1565,7 @@ static ssize_t sftp_readdir(LIBSSH2_SFTP_HANDLE *handle, char *buffer,
return retcode; return retcode;
else if (retcode) { else if (retcode) {
sftp->readdir_state = libssh2_NB_state_idle; sftp->readdir_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, retcode,
"Timeout waiting for status message"); "Timeout waiting for status message");
} }
@ -1942,11 +1942,11 @@ static int sftp_fstat(LIBSSH2_SFTP_HANDLE *handle,
rc = sftp_packet_requirev(sftp, 2, fstat_responses, rc = sftp_packet_requirev(sftp, 2, fstat_responses,
sftp->fstat_request_id, &data, sftp->fstat_request_id, &data,
&data_len); &data_len);
if (rc == LIBSSH2_ERROR_EAGAIN) { if (rc == LIBSSH2_ERROR_EAGAIN)
return rc; return rc;
} else if (rc) { else if (rc) {
sftp->fstat_state = libssh2_NB_state_idle; sftp->fstat_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Timeout waiting for status message");
} }
@ -2131,8 +2131,8 @@ sftp_close_handle(LIBSSH2_SFTP_HANDLE *handle)
return rc; return rc;
} else if (rc) { } else if (rc) {
handle->close_state = libssh2_NB_state_idle; handle->close_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Error waiting for status message");
} }
handle->close_state = libssh2_NB_state_sent1; handle->close_state = libssh2_NB_state_sent1;
@ -2249,8 +2249,8 @@ static int sftp_unlink(LIBSSH2_SFTP *sftp, const char *filename,
} }
else if (rc) { else if (rc) {
sftp->unlink_state = libssh2_NB_state_idle; sftp->unlink_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Error waiting for FXP STATUS");
} }
sftp->unlink_state = libssh2_NB_state_idle; sftp->unlink_state = libssh2_NB_state_idle;
@ -2359,8 +2359,8 @@ static int sftp_rename(LIBSSH2_SFTP *sftp, const char *source_filename,
return rc; return rc;
} else if (rc) { } else if (rc) {
sftp->rename_state = libssh2_NB_state_idle; sftp->rename_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Error waiting for FXP STATUS");
} }
sftp->rename_state = libssh2_NB_state_idle; sftp->rename_state = libssh2_NB_state_idle;
@ -2482,8 +2482,8 @@ static int sftp_fstatvfs(LIBSSH2_SFTP_HANDLE *handle, LIBSSH2_SFTP_STATVFS *st)
return rc; return rc;
} else if (rc) { } else if (rc) {
sftp->fstatvfs_state = libssh2_NB_state_idle; sftp->fstatvfs_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Error waiting for FXP EXTENDED REPLY");
} else if (data_len < 93) { } else if (data_len < 93) {
LIBSSH2_FREE(session, data); LIBSSH2_FREE(session, data);
sftp->fstatvfs_state = libssh2_NB_state_idle; sftp->fstatvfs_state = libssh2_NB_state_idle;
@ -2595,8 +2595,8 @@ static int sftp_statvfs(LIBSSH2_SFTP *sftp, const char *path,
return rc; return rc;
} else if (rc) { } else if (rc) {
sftp->statvfs_state = libssh2_NB_state_idle; sftp->statvfs_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Error waiting for FXP EXTENDED REPLY");
} else if (data_len < 93) { } else if (data_len < 93) {
LIBSSH2_FREE(session, data); LIBSSH2_FREE(session, data);
sftp->fstatvfs_state = libssh2_NB_state_idle; sftp->fstatvfs_state = libssh2_NB_state_idle;
@ -2714,8 +2714,8 @@ static int sftp_mkdir(LIBSSH2_SFTP *sftp, const char *path,
return rc; return rc;
} else if (rc) { } else if (rc) {
sftp->mkdir_state = libssh2_NB_state_idle; sftp->mkdir_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Error waiting for FXP STATUS");
} }
sftp->mkdir_state = libssh2_NB_state_idle; sftp->mkdir_state = libssh2_NB_state_idle;
@ -2808,8 +2808,8 @@ static int sftp_rmdir(LIBSSH2_SFTP *sftp, const char *path,
return rc; return rc;
} else if (rc) { } else if (rc) {
sftp->rmdir_state = libssh2_NB_state_idle; sftp->rmdir_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Error waiting for FXP STATUS");
} }
sftp->rmdir_state = libssh2_NB_state_idle; sftp->rmdir_state = libssh2_NB_state_idle;
@ -2917,11 +2917,11 @@ static int sftp_stat(LIBSSH2_SFTP *sftp, const char *path,
rc = sftp_packet_requirev(sftp, 2, stat_responses, rc = sftp_packet_requirev(sftp, 2, stat_responses,
sftp->stat_request_id, &data, &data_len); sftp->stat_request_id, &data, &data_len);
if (rc == LIBSSH2_ERROR_EAGAIN) { if (rc == LIBSSH2_ERROR_EAGAIN)
return rc; return rc;
} else if (rc) { else if (rc) {
sftp->stat_state = libssh2_NB_state_idle; sftp->stat_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, rc,
"Timeout waiting for status message"); "Timeout waiting for status message");
} }
@ -3052,8 +3052,8 @@ static int sftp_symlink(LIBSSH2_SFTP *sftp, const char *path,
return retcode; return retcode;
else if (retcode) { else if (retcode) {
sftp->symlink_state = libssh2_NB_state_idle; sftp->symlink_state = libssh2_NB_state_idle;
return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_TIMEOUT, return _libssh2_error(session, retcode,
"Timeout waiting for status message"); "Error waiting for status message");
} }
sftp->symlink_state = libssh2_NB_state_idle; sftp->symlink_state = libssh2_NB_state_idle;