aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Stöneberg <oliverst@online.de>2011-05-16 06:50:55 -0700
committerAndreas Schneider <asn@cryptomilk.org>2011-05-17 14:21:17 +0200
commitf4f4ce37f058748489b195e976b577465864e914 (patch)
tree83cb849e3a097a3a2a8be8066a246a20f7aac666
parent671a9827394714cfc90d75c8a8fb2ccd86f80abf (diff)
downloadlibssh-f4f4ce37f058748489b195e976b577465864e914.tar.gz
libssh-f4f4ce37f058748489b195e976b577465864e914.tar.xz
libssh-f4f4ce37f058748489b195e976b577465864e914.zip
poll: Removed WSAPoll() support.
It was causing too many issues and the poll emulation is quite stable.
-rw-r--r--src/poll.c43
1 files changed, 0 insertions, 43 deletions
diff --git a/src/poll.c b/src/poll.c
index 007dc019..55e23a81 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -110,29 +110,6 @@ static poll_fn ssh_poll_emu;
#include <time.h>
#include <windows.h>
#include <winsock2.h>
-
-#if (_WIN32_WINNT < 0x0600)
-typedef struct ssh_pollfd_struct WSAPOLLFD;
-#endif
-
-typedef int (WSAAPI* WSAPoll_FunctionType)(WSAPOLLFD fdarray[],
- ULONG nfds,
- INT timeout
-);
-
-static WSAPoll_FunctionType wsa_poll;
-
-int win_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
- if (wsa_poll) {
- return (wsa_poll)((WSAPOLLFD *) fds, nfds, timeout);
- }
-
- return SOCKET_ERROR;
-}
-
-#define WS2_LIBRARY "ws2_32.dll"
-static HINSTANCE hlib;
-
#else /* _WIN32 */
#include <sys/select.h>
#include <sys/socket.h>
@@ -266,30 +243,10 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
void ssh_poll_init(void) {
ssh_poll_emu = bsd_poll;
-
-#ifdef _WIN32
- hlib = LoadLibrary(WS2_LIBRARY);
- if (hlib != NULL) {
- wsa_poll = (WSAPoll_FunctionType) (void *) GetProcAddress(hlib, "WSAPoll");
- }
-#endif /* _WIN32 */
-
- if (wsa_poll == NULL) {
- ssh_poll_emu = bsd_poll;
- } else {
- ssh_poll_emu = win_poll;
- }
}
void ssh_poll_cleanup(void) {
ssh_poll_emu = bsd_poll;
-#ifdef _WIN32
- wsa_poll = NULL;
-
- FreeLibrary(hlib);
-
- hlib = NULL;
-#endif /* _WIN32 */
}
int ssh_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {