diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-30 23:44:40 +0100 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-30 23:44:40 +0100 |
| commit | 92a50f731cdb098bbbb605630f335a07d839496f (patch) | |
| tree | 48b586e16741a3cd775fa197adc700bcf7e143b3 /include/libssh | |
| parent | 76d6838223718a5432baddb4fa5b3e82440c9ff2 (diff) | |
| download | libssh-92a50f731cdb098bbbb605630f335a07d839496f.tar.gz libssh-92a50f731cdb098bbbb605630f335a07d839496f.tar.xz libssh-92a50f731cdb098bbbb605630f335a07d839496f.zip | |
Socket connect callback working...
Still need to make sure the connect syscall is correctly
called
Diffstat (limited to 'include/libssh')
| -rw-r--r-- | include/libssh/callbacks.h | 2 | ||||
| -rw-r--r-- | include/libssh/priv.h | 3 | ||||
| -rw-r--r-- | include/libssh/socket.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/libssh/callbacks.h b/include/libssh/callbacks.h index 19a4c461..c7a9e3cf 100644 --- a/include/libssh/callbacks.h +++ b/include/libssh/callbacks.h @@ -50,7 +50,7 @@ typedef void (*ssh_callback_int) (int code, void *user); */ typedef int (*ssh_callback_data) (const void *data, size_t len, void *user); -typedef void (*ssh_callback_int_int) (void *user, int code, int errno_code); +typedef void (*ssh_callback_int_int) (int code, int errno_code, void *user); typedef int (*ssh_message_callback) (ssh_session, ssh_message message, void *user); typedef int (*ssh_channel_callback_int) (ssh_channel channel, int code, void *user); diff --git a/include/libssh/priv.h b/include/libssh/priv.h index f96e87c5..137cdb25 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -150,7 +150,8 @@ void ssh_regex_finalize(void); ssh_session ssh_session_new(void); socket_t ssh_connect_host(ssh_session session, const char *host,const char *bind_addr, int port, long timeout, long usec); - +socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host, + const char *bind_addr, int port); /* in kex.c */ extern const char *ssh_kex_nums[]; int ssh_send_kex(ssh_session session, int server_kex); diff --git a/include/libssh/socket.h b/include/libssh/socket.h index 858c5d82..0c2a6c9e 100644 --- a/include/libssh/socket.h +++ b/include/libssh/socket.h @@ -58,5 +58,6 @@ void ssh_socket_set_callbacks(struct socket *s, ssh_socket_callbacks callbacks); int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, int fd, int revents, void *s); void ssh_socket_register_pollcallback(struct socket *s, struct ssh_poll_handle_struct *p); struct ssh_poll_handle_struct * ssh_socket_get_poll_handle(struct socket *s); +int ssh_socket_connect(struct socket *s, const char *host, int port, const char *bind_addr); #endif /* SOCKET_H_ */ |