diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-30 22:35:43 +0100 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-30 22:35:43 +0100 |
commit | 76d6838223718a5432baddb4fa5b3e82440c9ff2 (patch) | |
tree | 87ab207db64dc0d1772d273ffc5749cfe0820581 /libssh/poll.c | |
parent | 0bfb9d476c3dfc1ed74763665611891bcc277e9e (diff) | |
download | libssh-76d6838223718a5432baddb4fa5b3e82440c9ff2.tar.gz libssh-76d6838223718a5432baddb4fa5b3e82440c9ff2.tar.xz libssh-76d6838223718a5432baddb4fa5b3e82440c9ff2.zip |
Some brain surgery to add event-based sockets
chapter 1- SSH Socket Connections.
I would like to be able to
-Have a ssh_poll_ctx object
-Add a ssh socket over it
-launch the socket connection (using socket functions)
-ssh_poll_ctx_dopoll()
-Wait for the timeout or have the "connected" callback called
Diffstat (limited to 'libssh/poll.c')
-rw-r--r-- | libssh/poll.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/libssh/poll.c b/libssh/poll.c index 4a84cbe..7d9e3e5 100644 --- a/libssh/poll.c +++ b/libssh/poll.c @@ -33,6 +33,7 @@ #include "libssh/priv.h" #include "libssh/libssh.h" #include "libssh/poll.h" +#include "libssh/socket.h" #ifndef SSH_POLL_CTX_CHUNK #define SSH_POLL_CTX_CHUNK 5 @@ -310,6 +311,21 @@ void ssh_poll_set_events(ssh_poll_handle p, short events) { } /** + * @brief Set the file descriptor of a poll object. The FD will also be propagated + * to an associated poll context. + * + * @param p Pointer to an already allocated poll object. + * @param fd New file descriptor. + */ +void ssh_poll_set_fd(ssh_poll_handle p, socket_t fd) { + if (p->ctx != NULL) { + p->ctx->pollfds[p->x.idx].fd = fd; + } else { + p->x.fd = fd; + } +} + +/** * @brief Add extra events to a poll object. Duplicates are ignored. * The events will also be propagated to an associated poll context. * @@ -475,6 +491,22 @@ int ssh_poll_ctx_add(ssh_poll_ctx ctx, ssh_poll_handle p) { } /** + * @brief Add a socket object to a poll context. + * + * @param ctx Pointer to an already allocated poll context. + * @param s A SSH socket handle + * + * @return 0 on success, < 0 on error + */ +int ssh_poll_ctx_add_socket (ssh_poll_ctx ctx, struct socket *s) { + ssh_poll_handle p=ssh_socket_get_poll_handle(s); + if(p==NULL) + return -1; + return ssh_poll_ctx_add(ctx,p); +} + + +/** * @brief Remove a poll object from a poll context. * * @param ctx Pointer to an already allocated poll context. |