aboutsummaryrefslogtreecommitdiff
path: root/lib/ssh.c
diff options
context:
space:
mode:
authorHoward Chu <hyc@highlandsun.com>2010-05-11 22:48:38 +0200
committerDaniel Stenberg <daniel@haxx.se>2010-05-11 22:48:38 +0200
commitbc8fc9803fbd0fa9daf0dba796d42d03faf49120 (patch)
treeedd313accc3ad85ef2b4826f5ffa9e335da86ebd /lib/ssh.c
parent016ce4b1daa0f8d44a0da7105e1e1c97531e8b87 (diff)
sendrecv: make them two pairs of send/recv to properly deal with FTPS
FTP(S) use two connections that can be set to different recv and send functions independently, so by introducing recv+send pairs in the same manner we already have sockets/connections we can work with FTPS fine. This commit fixes the FTPS regression introduced in change d64bd82.
Diffstat (limited to 'lib/ssh.c')
-rw-r--r--lib/ssh.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh.c b/lib/ssh.c
index 4a9309998..c3a94fe32 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2493,11 +2493,11 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done)
return result;
if(conn->protocol & PROT_SCP) {
- conn->recv = scp_recv;
- conn->send = scp_send;
+ conn->recv[FIRSTSOCKET] = scp_recv;
+ conn->send[FIRSTSOCKET] = scp_send;
} else {
- conn->recv = sftp_recv;
- conn->send = sftp_send;
+ conn->recv[FIRSTSOCKET] = sftp_recv;
+ conn->send[FIRSTSOCKET] = sftp_send;
}
ssh = &conn->proto.sshc;