Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-03-12 11:07:42 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

skip sftp_free() inappropriately

Browse Source
This commit is contained in:
Ryo Nakamura
2022-11-27 19:38:19 +09:00
parent e3ed4f89d2
commit 130e735e65
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@@ -487,12 +487,8 @@ out:
void mscp_copy_thread_cleanup(void *arg) void mscp_copy_thread_cleanup(void *arg)
{ {
struct mscp_thread *t = arg; struct mscp_thread *t = arg;
if (t->sftp) { if (t->sftp)
/* XXX: sftp_free --> ssh_poll sometimes blocked with
* no responses. So wet nonblocking. */
ssh_set_blocking(sftp_ssh(t->sftp), 1);
ssh_sftp_close(t->sftp); ssh_sftp_close(t->sftp);
}
t->finished = true; t->finished = true;
__sync_synchronize(); __sync_synchronize();
} }

5
src/ssh.c
View File

@@ -239,7 +239,10 @@ static int ssh_verify_known_hosts(ssh_session session)
void ssh_sftp_close(sftp_session sftp) void ssh_sftp_close(sftp_session sftp)
{ {
ssh_session ssh = sftp_ssh(sftp); ssh_session ssh = sftp_ssh(sftp);
sftp_free(sftp); /* XXX: sftp_free is stuck in ssh_poll_ctx_dopoll() when build type is Release.
* skip sftp_free inappropriately...
*/
//sftp_free(sftp);
ssh_disconnect(ssh); ssh_disconnect(ssh);
ssh_free(ssh); ssh_free(ssh);
} }