Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Sftp upload fix #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Sftp upload fix #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ce5028
Fix curl sftp uploading.
Feb 25, 2011
fa3eb04
Document why we need to set CURL_CSELECT_IN.
Feb 25, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions lib/ssh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,23 @@ static int sshkeycallback(CURL *easy,
#define libssh2_session_startup(x,y) libssh2_session_handshake(x,y)
#endif

/*
* Mark the connection as being available for sending.
*
* We need to set the socket as being able to send, otherwise the
* transfer will stall. It does this because once curl gets to the
* CURLM_STATE_PERFORM state, in Curl_readwrite will only attempt to
* send when the socket is marked for sending; up to this point it has
* only been polled for reading. If it doesn't start to send
* immediately, then it will return to the user code without calling
* ssh. As we don't call any ssh transfer methods, the sockets will not
* be marked for send or receive, and the transfer will stall.
*/
static void ssh_reset_connection_sending(struct connectdata *conn)
{
conn->cselect_bits = CURL_CSELECT_IN;
}

/*
* ssh_statemach_act() runs the SSH state machine as far as it can without
* blocking and without reaching the end. The data the pointer 'block' points
Expand Down Expand Up @@ -1600,6 +1617,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
sshc->orig_waitfor = data->req.keepon;

state(conn, SSH_STOP);
ssh_reset_connection_sending(conn);
}
break;
}
Expand Down Expand Up @@ -2017,10 +2035,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)

/* not set by Curl_setup_transfer to preserve keepon bits */
conn->writesockfd = conn->sockfd;

/* FIXME: here should be explained why we need it to start the
* download */
conn->cselect_bits = CURL_CSELECT_IN;
ssh_reset_connection_sending(conn);
}
if(result) {
state(conn, SSH_SFTP_CLOSE);
Expand Down Expand Up @@ -2194,10 +2209,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)

/* not set by Curl_setup_transfer to preserve keepon bits */
conn->writesockfd = conn->sockfd;

/* FIXME: here should be explained why we need it to start the
* download */
conn->cselect_bits = CURL_CSELECT_IN;
ssh_reset_connection_sending(conn);

if(result) {
state(conn, SSH_SCP_CHANNEL_FREE);
Expand Down