diff options
| author | Werner Koch <wk@gnupg.org> | 2012-09-20 13:17:52 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2012-09-21 09:41:47 +0200 |
| commit | 0e833d75e604876367376e5ded6c043073e9aad5 (patch) | |
| tree | 8fd6e528782888c7be298b9291a835e1cc225249 /src/client.c | |
| parent | ae83f775116b012727bc977a03ee8803627859aa (diff) | |
| download | libssh-0e833d75e604876367376e5ded6c043073e9aad5.tar.gz libssh-0e833d75e604876367376e5ded6c043073e9aad5.tar.xz libssh-0e833d75e604876367376e5ded6c043073e9aad5.zip | |
Fix regression in pre-connected socket setting.
* src/socket.c (ssh_socket_pollcallback): Factor some code out to ...
(ssh_socket_set_connecting): New.
* include/libssh/socket.h (ssh_socket_set_connecting): Add prototype.
* src/client.c (ssh_connect): Use new function for a socket set by
SSH_OPTIONS_FD.
Signed-off-by: Werner Koch <wk@gnupg.org>
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/client.c')
| -rw-r--r-- | src/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client.c b/src/client.c index b3c3d93e..cc3c57b9 100644 --- a/src/client.c +++ b/src/client.c @@ -665,7 +665,7 @@ int ssh_connect(ssh_session session) { session->socket_callbacks.exception=ssh_socket_exception_callback; session->socket_callbacks.userdata=session; if (session->fd != SSH_INVALID_SOCKET) { - ssh_socket_set_fd(session->socket, session->fd); + ssh_socket_set_connecting(session->socket, session->fd); ret=SSH_OK; #ifndef _WIN32 } else if (session->ProxyCommand != NULL){ |