aboutsummaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/libssh/poll.h4
-rw-r--r--include/libssh/session.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/include/libssh/poll.h b/include/libssh/poll.h
index 5ac267e8..88a16a1e 100644
--- a/include/libssh/poll.h
+++ b/include/libssh/poll.h
@@ -153,8 +153,6 @@ int ssh_poll_ctx_add(ssh_poll_ctx ctx, ssh_poll_handle p);
int ssh_poll_ctx_add_socket (ssh_poll_ctx ctx, struct ssh_socket_struct *s);
void ssh_poll_ctx_remove(ssh_poll_ctx ctx, ssh_poll_handle p);
int ssh_poll_ctx_dopoll(ssh_poll_ctx ctx, int timeout);
-ssh_poll_ctx ssh_get_global_poll_ctx(ssh_session session);
-void ssh_free_global_poll_ctx(void);
-
+ssh_poll_ctx ssh_poll_get_default_ctx(ssh_session session);
#endif /* POLL_H_ */
diff --git a/include/libssh/session.h b/include/libssh/session.h
index 86188fa8..33ef8795 100644
--- a/include/libssh/session.h
+++ b/include/libssh/session.h
@@ -26,7 +26,7 @@
#include "libssh/pcap.h"
#include "libssh/auth.h"
#include "libssh/channels.h"
-
+#include "libssh/poll.h"
typedef struct ssh_kbdint_struct* ssh_kbdint;
/* These are the different states a SSH session can be into its life */
@@ -125,6 +125,7 @@ struct ssh_session_struct {
struct ssh_packet_callbacks_struct default_packet_callbacks;
struct ssh_list *packet_callbacks;
struct ssh_socket_callbacks_struct socket_callbacks;
+ ssh_poll_ctx default_poll_ctx;
/* options */
#ifdef WITH_PCAP
ssh_pcap_context pcap_ctx; /* pcap debugging context */