Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

Added support for Windows XP.

Browse source
This commit is contained in:
David Galeano 2011-10-04 19:55:18 +08:00 • committed by Andy Green
parent 08d60f1876
commit 7b11fec7ca
5 changed files with 182 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libwebsockets.c
View file

@ -2501,6 +2501,7 @@ libwebsocket_create_context(int port, const char *interf,
WORD wVersionRequested;
WSADATA wsaData;
int err;
HMODULE wsdll;
/* Use the MAKEWORD(lowbyte, highbyte) macro from Windef.h */
wVersionRequested = MAKEWORD(2, 2);
@ -2513,6 +2514,17 @@ libwebsocket_create_context(int port, const char *interf,
err);
return NULL;
}
wsdll = GetModuleHandle("Ws2_32.dll");
if (wsdll)
{
poll = (PFNWSAPOLL)GetProcAddress(wsdll, "WSAPoll");
}
if (!poll)
{
poll = emulated_poll;
}
}
#endif

3
win32port/libwebsocketswin32/libwebsocketswin32.vcxproj
View file

@ -243,6 +243,7 @@
<AdditionalDependencies>Ws2_32.lib;..\..\output\ZLib_vc100-mt-s.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<ProjectReference />
</ItemDefinitionGroup>
@ -257,6 +258,7 @@
<ClCompile Include="..\..\lib\parsers.c" />
<ClCompile Include="..\..\lib\sha-1.c" />
<ClCompile Include="..\win32helpers\gettimeofday.c" />
<ClCompile Include="..\win32helpers\websock-w32.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\lib\extension-deflate-stream.h" />
@ -264,6 +266,7 @@
<ClInclude Include="..\..\lib\libwebsockets.h" />
<ClInclude Include="..\..\lib\private-libwebsockets.h" />
<ClInclude Include="..\win32helpers\gettimeofday.h" />
<ClInclude Include="..\win32helpers\websock-w32.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters
View file

@ -45,6 +45,9 @@
<ClCompile Include="..\win32helpers\gettimeofday.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\win32helpers\websock-w32.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\lib\libwebsockets.h">
@ -62,5 +65,8 @@
<ClInclude Include="..\win32helpers\gettimeofday.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\win32helpers\websock-w32.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

156
win32port/win32helpers/websock-w32.c Normal file
View file

@ -0,0 +1,156 @@
#define FD_SETSIZE 256
#include <WinSock2.h>
#include <stdlib.h>
#include <errno.h>
#include "websock-w32.h"
PFNWSAPOLL poll = NULL;
INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout)
{
fd_set readfds, writefds;
struct timeval tv, *ptv;
SOCKET max_socket;
ULONG n;
int num_bits, num_sockets_ready;
if (NULL == fdarray)
{
errno = EFAULT;
return -1;
}
FD_ZERO(&readfds);
FD_ZERO(&writefds);
max_socket = 0;
n = 0;
while (n < nfds)
{
WSAPOLLFD * const poll_fd = (fdarray + n);
SOCKET sock = poll_fd->fd;
poll_fd->revents = 0;
if (0 <= sock)
{
const SHORT events = poll_fd->events;
if (events)
{
if (max_socket < sock)
{
max_socket = sock;
}
if (events & POLLIN)
{
FD_SET(sock, &readfds);
}
if (events & POLLOUT)
{
FD_SET(sock, &writefds);
}
}
}
n++;
}
if (0 > timeout)
{
ptv = NULL;
}
else
{
ptv = &tv;
if (0 == timeout)
{
tv.tv_sec = 0;
tv.tv_usec = 0;
}
else if (1000 <= timeout)
{
tv.tv_sec = (timeout / 1000);
tv.tv_usec = ((timeout % 1000) * 1000);
}
else
{
tv.tv_sec = 0;
tv.tv_usec = (timeout * 1000);
}
}
num_bits = select((int)max_socket + 1, &readfds, &writefds, NULL, ptv);
if (0 >= num_bits)
{
return num_bits;
}
num_sockets_ready = 0;
n = 0;
do
{
WSAPOLLFD * const poll_fd = (fdarray + n);
SOCKET sock = poll_fd->fd;
if (0 <= sock)
{
const SHORT events = poll_fd->events;
if (events)
{
if (FD_ISSET(sock, &readfds))
{
const int saved_error = WSAGetLastError();
char test_data[4] = {0};
int ret;
/* support for POLLHUP */
ret = recv(poll_fd->fd, test_data, sizeof(test_data), MSG_PEEK);
if (SOCKET_ERROR == ret)
{
const int err = WSAGetLastError();
if (err == WSAESHUTDOWN || err == WSAECONNRESET ||
err == WSAECONNABORTED || err == WSAENETRESET)
{
poll_fd->revents |= POLLHUP;
}
}
else
{
if (events & POLLIN)
{
poll_fd->revents |= POLLIN;
}
}
WSASetLastError(saved_error);
--num_bits;
}
if (FD_ISSET(sock, &writefds))
{
if (events & POLLOUT)
{
poll_fd->revents |= POLLOUT;
}
--num_bits;
}
if (poll_fd->revents)
{
num_sockets_ready++;
}
}
}
else
{
poll_fd->revents = POLLNVAL;
}
n++;
}
while (0 < num_bits && n < nfds);
return num_sockets_ready;
}

6
win32port/win32helpers/websock-w32.h
View file

@ -18,7 +18,11 @@
#define random rand
#define usleep _sleep
#define poll WSAPoll
typedef INT (WSAAPI *PFNWSAPOLL)(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
extern PFNWSAPOLL poll;
extern INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
/* override configure because we are not using Makefiles */