diff options
Diffstat (limited to 'lib/ssh.c')
| -rw-r--r-- | lib/ssh.c | 30 |
1 files changed, 25 insertions, 5 deletions
@@ -1500,6 +1500,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) result = Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL); + /* not set by Curl_setup_transfer to preserve keepon bits */ + conn->sockfd = conn->writesockfd; + if(result) { state(conn, SSH_SFTP_CLOSE); sshc->actualcode = result; @@ -1911,6 +1914,12 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) else { result = Curl_setup_transfer(conn, FIRSTSOCKET, data->req.size, FALSE, NULL, -1, NULL); + + /* 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; } if(result) { state(conn, SSH_SFTP_CLOSE); @@ -2031,6 +2040,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) result = Curl_setup_transfer(conn, -1, data->req.size, FALSE, NULL, FIRSTSOCKET, NULL); + /* not set by Curl_setup_transfer to preserve keepon bits */ + conn->sockfd = conn->writesockfd; + if(result) { state(conn, SSH_SCP_CHANNEL_FREE); sshc->actualcode = result; @@ -2080,6 +2092,12 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) result = Curl_setup_transfer(conn, FIRSTSOCKET, bytecount, FALSE, NULL, -1, NULL); + /* 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; + if(result) { state(conn, SSH_SCP_CHANNEL_FREE); sshc->actualcode = result; @@ -2232,10 +2250,10 @@ static int ssh_perform_getsock(const struct connectdata *conn, sock[0] = conn->sock[FIRSTSOCKET]; - if(conn->proto.sshc.waitfor & KEEP_RECV) + if(conn->waitfor & KEEP_RECV) bitmap |= GETSOCK_READSOCK(FIRSTSOCKET); - if(conn->proto.sshc.waitfor & KEEP_SEND) + if(conn->waitfor & KEEP_SEND) bitmap |= GETSOCK_WRITESOCK(FIRSTSOCKET); return bitmap; @@ -2279,15 +2297,17 @@ static void ssh_block2waitfor(struct connectdata *conn, bool block) { struct ssh_conn *sshc = &conn->proto.sshc; int dir; - if(block && (dir = libssh2_session_block_directions(sshc->ssh_session))) { + if(!block) + conn->waitfor = 0; + else if((dir = libssh2_session_block_directions(sshc->ssh_session))) { /* translate the libssh2 define bits into our own bit defines */ - sshc->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) | + conn->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) | ((dir&LIBSSH2_SESSION_BLOCK_OUTBOUND)?KEEP_SEND:0); } else /* It didn't block or libssh2 didn't reveal in which direction, put back the original set */ - sshc->waitfor = sshc->orig_waitfor; + conn->waitfor = sshc->orig_waitfor; } #else /* no libssh2 directional support so we simply don't know */ |