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 /include/libssh/socket.h | |
| 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 'include/libssh/socket.h')
| -rw-r--r-- | include/libssh/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/libssh/socket.h b/include/libssh/socket.h index 527f52ed..c95a2c61 100644 --- a/include/libssh/socket.h +++ b/include/libssh/socket.h @@ -62,6 +62,7 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int r struct ssh_poll_handle_struct * ssh_socket_get_poll_handle_in(ssh_socket s); struct ssh_poll_handle_struct * ssh_socket_get_poll_handle_out(ssh_socket s); +void ssh_socket_set_connecting(ssh_socket s, socket_t fd); int ssh_socket_connect(ssh_socket s, const char *host, int port, const char *bind_addr); #endif /* SOCKET_H_ */ |