aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2010-10-12 17:57:15 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2010-10-12 17:57:15 +0200
commit4f8907a524c7a2acbce87d4d7cbea5d779a059ca (patch)
treee5c811df6804c2612b345f898bdb43d933c6fd48 /src
parent7b1359042c09e3f90f6d521e636c2d9123179912 (diff)
downloadlibssh-4f8907a524c7a2acbce87d4d7cbea5d779a059ca.tar.gz
libssh-4f8907a524c7a2acbce87d4d7cbea5d779a059ca.tar.xz
libssh-4f8907a524c7a2acbce87d4d7cbea5d779a059ca.zip
Removed the global poll ctx in fav. of /session ctx
Diffstat (limited to 'src')
-rw-r--r--src/init.c1
-rw-r--r--src/poll.c43
-rw-r--r--src/session.c5
3 files changed, 18 insertions, 31 deletions
diff --git a/src/init.c b/src/init.c
index 5952e272..385cb7a4 100644
--- a/src/init.c
+++ b/src/init.c
@@ -74,7 +74,6 @@ int ssh_init(void) {
*/
int ssh_finalize(void) {
ssh_threads_finalize();
- ssh_free_global_poll_ctx();
ssh_regex_finalize();
ssh_crypto_finalize();
ssh_socket_cleanup();
diff --git a/src/poll.c b/src/poll.c
index 7942ea0b..20e3a4fc 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -33,6 +33,7 @@
#include "libssh/libssh.h"
#include "libssh/poll.h"
#include "libssh/socket.h"
+#include "libssh/session.h"
#ifndef SSH_POLL_CTX_CHUNK
#define SSH_POLL_CTX_CHUNK 5
@@ -44,7 +45,7 @@
*
* Add a generic way to handle sockets asynchronously.
*
- * It's based on poll objects, each of which store a socket, it's events and a
+ * It's based on poll objects, each of which store a socket, its events and a
* callback, which gets called whenever an event is set. The poll objects are
* attached to a poll context, which should be allocated on per thread basis.
*
@@ -55,9 +56,6 @@
* @{
*/
-/** global poll context used for blocking operations */
-static ssh_poll_ctx global_poll_ctx;
-
struct ssh_poll_handle_struct {
ssh_poll_ctx ctx;
union {
@@ -659,32 +657,19 @@ int ssh_poll_ctx_dopoll(ssh_poll_ctx ctx, int timeout) {
return rc;
}
-/** @internal
- * @brief returns a pointer to the global poll context.
- * Allocates it if it does not exist.
- * @param session an optional session handler, used to store the error
- * message if needed.
- * @returns pointer to the global poll context.
- */
-ssh_poll_ctx ssh_get_global_poll_ctx(ssh_session session){
- if(global_poll_ctx != NULL)
- return global_poll_ctx;
- global_poll_ctx=ssh_poll_ctx_new(5);
- if(global_poll_ctx == NULL && session != NULL){
- ssh_set_error_oom(session);
- return NULL;
- }
- return global_poll_ctx;
-}
-
-/** @internal
- * @brief Deallocate the global poll context
+/**
+ * @internal
+ * @brief gets the default poll structure for the current session,
+ * when used in blocking mode.
+ * @param session SSH session
+ * @returns the default ssh_poll_ctx
*/
-void ssh_free_global_poll_ctx(){
- if(global_poll_ctx != NULL){
- ssh_poll_ctx_free(global_poll_ctx);
- global_poll_ctx=NULL;
- }
+ssh_poll_ctx ssh_poll_get_default_ctx(ssh_session session){
+ if(session->default_poll_ctx != NULL)
+ return session->default_poll_ctx;
+ /* 2 is enough for the default one */
+ session->default_poll_ctx = ssh_poll_ctx_new(2);
+ return session->default_poll_ctx;
}
/** @} */
diff --git a/src/session.c b/src/session.c
index dbcb2809..cda01db8 100644
--- a/src/session.c
+++ b/src/session.c
@@ -178,6 +178,9 @@ void ssh_free(ssh_session session) {
crypto_free(session->current_crypto);
crypto_free(session->next_crypto);
ssh_socket_free(session->socket);
+ if(session->default_poll_ctx){
+ ssh_poll_ctx_free(session->default_poll_ctx);
+ }
/* delete all channels */
while (session->channels) {
ssh_channel_free(session->channels);
@@ -365,7 +368,7 @@ int ssh_handle_packets(ssh_session session, int timeout) {
ssh_poll_add_events(spoll_in, POLLIN | POLLERR);
ctx=ssh_poll_get_ctx(spoll_in);
if(ctx==NULL){
- ctx=ssh_get_global_poll_ctx(session);
+ ctx=ssh_poll_get_default_ctx(session);
ssh_poll_ctx_add(ctx,spoll_in);
if(spoll_in != spoll_out)
ssh_poll_ctx_add(ctx,spoll_out);