From cfdd4296a8cec84ee31f4af996126b4a47cb8bc9 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Mon, 25 Jan 2010 19:48:38 +0100 Subject: Fix poll not waking up on connect on win32 Under windows, poll does not detect connected socket using POLLOUT but POLLWRNORM. "Pending connect requests are indicated in the returned revents member of WSAPOLLFD structure by POLLWRNORM." http://msdn.microsoft.com/en-us/library/ms741669%28VS.85%29.aspx However, I did not test that fix. (no windows at hands). I also don't know if the poll emulation layer works with that too. --- libssh/socket.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libssh/socket.c') diff --git a/libssh/socket.c b/libssh/socket.c index 96f29cb..ea8979c 100644 --- a/libssh/socket.c +++ b/libssh/socket.c @@ -188,7 +188,11 @@ int ssh_socket_pollcallback(ssh_poll_handle p, int fd, int revents, void *v_s){ } } } +#ifdef _WIN32 + if(revents & POLLOUT || revents & POLLWRNORM){ +#else if(revents & POLLOUT){ +#endif /* First, POLLOUT is a sign we may be connected */ if(s->state == SSH_SOCKET_CONNECTING){ ssh_log(s->session,SSH_LOG_PACKET,"Received POLLOUT in connecting state"); @@ -797,6 +801,9 @@ int ssh_socket_connect(ssh_socket s, const char *host, int port, const char *bin s->state=SSH_SOCKET_CONNECTING; /* POLLOUT is the event to wait for in a nonblocking connect */ ssh_poll_set_events(ssh_socket_get_poll_handle(s),POLLOUT); +#ifdef _WIN32 + ssh_poll_add_events(ssh_socket_get_poll_handle(s),POLLWRNORM); +#endif leave_function(); return SSH_OK; } -- cgit