poll: Fix poll input events.

bug#38

3 files changed, 4 insertions, 3 deletions

diff --git a/src/poll.c b/src/poll.c
index ab2fcc47..87988608 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -298,8 +298,9 @@ int ssh_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
  *
  * @param  fd           Socket that will be polled.
  * @param  events       Poll events that will be monitored for the socket. i.e.
- *                      POLLIN, POLLPRI, POLLOUT, POLLERR, POLLHUP, POLLNVAL
+ *                      POLLIN, POLLPRI, POLLOUT
  * @param  cb           Function to be called if any of the events are set.
+ *
  * @param  userdata     Userdata to be passed to the callback function. NULL if
  *                      not needed.
  *
diff --git a/src/session.c b/src/session.c
index 4623b4b5..18688c60 100644
--- a/src/session.c
+++ b/src/session.c
@@ -421,7 +421,7 @@ int ssh_handle_packets(ssh_session session, int timeout) {
   spoll_in=ssh_socket_get_poll_handle_in(session->socket);
   spoll_out=ssh_socket_get_poll_handle_out(session->socket);
   if(session->server)
-    ssh_poll_add_events(spoll_in, POLLIN | POLLERR);
+    ssh_poll_add_events(spoll_in, POLLIN);
   ctx=ssh_poll_get_ctx(spoll_in);
   if(ctx==NULL){
   	ctx=ssh_poll_get_default_ctx(session);
diff --git a/src/socket.c b/src/socket.c
index fa7ed526..5097be9e 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -270,7 +270,7 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int r
 		if(s->state == SSH_SOCKET_CONNECTING){
 			ssh_log(s->session,SSH_LOG_PACKET,"Received POLLOUT in connecting state");
 			s->state = SSH_SOCKET_CONNECTED;
-			ssh_poll_set_events(p,POLLOUT | POLLIN | POLLERR);
+			ssh_poll_set_events(p,POLLOUT | POLLIN);
 			ssh_sock_set_blocking(ssh_socket_get_fd_in(s));
 			if(s->callbacks && s->callbacks->connected)
 				s->callbacks->connected(SSH_SOCKET_CONNECTED_OK,0,s->callbacks->userdata);