open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clamd-win32: WIP#2

Browse Source
0.96
aCaB 16 years ago
parent fdb7b9e926
commit 1c4d9a22fa
9 changed files with 346 additions and 258 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      clamd/others.c
  2. 39
      clamd/server-th.c
  3. 2
      win32/clamav-config.h
  4. 502
      win32/clamd.vcproj
  5. 55
      win32/compat/net.c
  6. 1
      win32/compat/net.h
  7. 1
      win32/libclamav.def
  8. 1
      win32/platform.h
  9. 2
      win32/update-win32.pl

1
clamd/others.c
Unescape View File

@ -59,7 +59,6 @@
#if HAVE_POLL_H #if HAVE_POLL_H
#include <poll.h> #include <poll.h>
#else /* HAVE_POLL_H */ #else /* HAVE_POLL_H */
#undef HAVE_POLL
#if HAVE_SYS_SELECT_H #if HAVE_SYS_SELECT_H
#include <sys/select.h> #include <sys/select.h>
#endif /* HAVE_SYS_SELECT_H */ #endif /* HAVE_SYS_SELECT_H */

39
clamd/server-th.c
Unescape View File

@ -298,11 +298,20 @@ struct acceptdata {
pthread_cond_t cond_nfds; pthread_cond_t cond_nfds;
int max_queue; int max_queue;
int commandtimeout; int commandtimeout;
#ifdef _WIN32
HANDLE event_wake_recv;
HANDLE event_wake_accept;
#else
int syncpipe_wake_recv[2]; int syncpipe_wake_recv[2];
int syncpipe_wake_accept[2]; int syncpipe_wake_accept[2];
#endif
}; };
#ifdef _WIN32
#define ACCEPTDATA_INIT(mutex1, mutex2) { FDS_INIT(mutex1), FDS_INIT(mutex2), PTHREAD_COND_INITIALIZER, 0, 0, NULL, NULL}
#else
#define ACCEPTDATA_INIT(mutex1, mutex2) { FDS_INIT(mutex1), FDS_INIT(mutex2), PTHREAD_COND_INITIALIZER, 0, 0, {-1, -1}, {-1, -1}} #define ACCEPTDATA_INIT(mutex1, mutex2) { FDS_INIT(mutex1), FDS_INIT(mutex2), PTHREAD_COND_INITIALIZER, 0, 0, {-1, -1}, {-1, -1}}
#endif
static void *acceptloop_th(void *arg) static void *acceptloop_th(void *arg)
{ {
@ -339,6 +348,7 @@ static void *acceptloop_th(void *arg)
struct fd_buf *buf = &fds->buf[i]; struct fd_buf *buf = &fds->buf[i];
if (!buf->got_newdata) if (!buf->got_newdata)
continue; continue;
#ifndef _WIN32 // FIXME
if (buf->fd == data->syncpipe_wake_accept[0]) { if (buf->fd == data->syncpipe_wake_accept[0]) {
/* dummy sync pipe, just to wake us */ /* dummy sync pipe, just to wake us */
if (read(buf->fd, buff, sizeof(buff)) < 0) { if (read(buf->fd, buff, sizeof(buff)) < 0) {
@ -346,6 +356,7 @@ static void *acceptloop_th(void *arg)
} }
continue; continue;
} }
#endif
if (buf->got_newdata == -1) { if (buf->got_newdata == -1) {
logg("$Acceptloop closed FD: %d\n", buf->fd); logg("$Acceptloop closed FD: %d\n", buf->fd);
shutdown(buf->fd, 2); shutdown(buf->fd, 2);
@ -406,10 +417,14 @@ static void *acceptloop_th(void *arg)
} }
/* notify recvloop */ /* notify recvloop */
#ifdef _WIN32
SetEvent(data->event_wake_recv);
#else
if (write(data->syncpipe_wake_recv[1], "", 1) == -1) { if (write(data->syncpipe_wake_recv[1], "", 1) == -1) {
logg("!write syncpipe failed\n"); logg("!write syncpipe failed\n");
continue; continue;
} }
#endif
} else if (errno != EINTR) { } else if (errno != EINTR) {
/* very bad - need to exit or restart */ /* very bad - need to exit or restart */
#ifdef HAVE_STRERROR_R #ifdef HAVE_STRERROR_R
@ -446,10 +461,13 @@ static void *acceptloop_th(void *arg)
pthread_mutex_lock(&exit_mutex); pthread_mutex_lock(&exit_mutex);
progexit = 1; progexit = 1;
pthread_mutex_unlock(&exit_mutex); pthread_mutex_unlock(&exit_mutex);
#ifdef _WIN32
SetEvent(data->event_wake_recv);
#else
if (write(data->syncpipe_wake_recv[1], "", 1) < 0) { if (write(data->syncpipe_wake_recv[1], "", 1) < 0) {
logg("$Syncpipe write failed\n"); logg("$Syncpipe write failed\n");
} }
#endif
return NULL; return NULL;
} }
@ -1046,14 +1064,16 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
cl_engine_free(engine); cl_engine_free(engine);
return 1; return 1;
} }
#ifdef _WIN32
acceptdata.event_wake_accept = CreateEvent(NULL, TRUE, FALSE, NULL);
acceptdata.event_wake_recv = CreateEvent(NULL, TRUE, FALSE, NULL);
#else
if (pipe(acceptdata.syncpipe_wake_recv) == -1 || if (pipe(acceptdata.syncpipe_wake_recv) == -1 ||
(pipe(acceptdata.syncpipe_wake_accept) == -1)) { (pipe(acceptdata.syncpipe_wake_accept) == -1)) {
logg("!pipe failed\n"); logg("!pipe failed\n");
exit(-1); exit(-1);
} }
syncpipe_wake_recv_w = acceptdata.syncpipe_wake_recv[1]; syncpipe_wake_recv_w = acceptdata.syncpipe_wake_recv[1];
if (fds_add(fds, acceptdata.syncpipe_wake_recv[0], 1, 0) == -1 || if (fds_add(fds, acceptdata.syncpipe_wake_recv[0], 1, 0) == -1 ||
@ -1061,6 +1081,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
logg("!failed to add pipe fd\n"); logg("!failed to add pipe fd\n");
exit(-1); exit(-1);
} }
#endif
if ((thr_pool = thrmgr_new(max_threads, idletimeout, max_queue, scanner_thread)) == NULL) { if ((thr_pool = thrmgr_new(max_threads, idletimeout, max_queue, scanner_thread)) == NULL) {
logg("!thrmgr_new failed\n"); logg("!thrmgr_new failed\n");
@ -1109,6 +1130,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
if (!buf->got_newdata) if (!buf->got_newdata)
continue; continue;
#ifndef _WIN32 //FIXME
if (buf->fd == acceptdata.syncpipe_wake_recv[0]) { if (buf->fd == acceptdata.syncpipe_wake_recv[0]) {
/* dummy sync pipe, just to wake us */ /* dummy sync pipe, just to wake us */
if (read(buf->fd, buff, sizeof(buff)) < 0) { if (read(buf->fd, buff, sizeof(buff)) < 0) {
@ -1116,7 +1138,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
} }
continue; continue;
} }
#endif
if (buf->got_newdata == -1) { if (buf->got_newdata == -1) {
if (buf->mode == MODE_WAITREPLY) { if (buf->mode == MODE_WAITREPLY) {
logg("$mode WAIT_REPLY -> closed\n"); logg("$mode WAIT_REPLY -> closed\n");
@ -1288,9 +1310,13 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
pthread_mutex_lock(&exit_mutex); pthread_mutex_lock(&exit_mutex);
progexit = 1; progexit = 1;
pthread_mutex_unlock(&exit_mutex); pthread_mutex_unlock(&exit_mutex);
#ifdef _WIN32
SetEvent(acceptdata.event_wake_accept);
#else
if (write(acceptdata.syncpipe_wake_accept[1], "", 1) < 0) { if (write(acceptdata.syncpipe_wake_accept[1], "", 1) < 0) {
logg("^Write to syncpipe failed\n"); logg("^Write to syncpipe failed\n");
} }
#endif
/* Destroy the thread manager. /* Destroy the thread manager.
* This waits for all current tasks to end * This waits for all current tasks to end
*/ */
@ -1310,8 +1336,13 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
pthread_join(accept_th, NULL); pthread_join(accept_th, NULL);
fds_free(fds); fds_free(fds);
#ifdef _WIN32
CloseHandle(acceptdata.event_wake_accept);
CloseHandle(acceptdata.event_wake_recv);
#else
close(acceptdata.syncpipe_wake_accept[1]); close(acceptdata.syncpipe_wake_accept[1]);
close(acceptdata.syncpipe_wake_recv[1]); close(acceptdata.syncpipe_wake_recv[1]);
#endif
if(dbstat.entries) if(dbstat.entries)
cl_statfree(&dbstat); cl_statfree(&dbstat);
logg("*Shutting down the main socket%s.\n", (nsockets > 1) ? "s" : ""); logg("*Shutting down the main socket%s.\n", (nsockets > 1) ? "s" : "");

2
win32/clamav-config.h
Unescape View File

@ -269,7 +269,7 @@
#define HAVE_OPENDIR 1 #define HAVE_OPENDIR 1
/* Define to 1 if you have the `poll' function. */ /* Define to 1 if you have the `poll' function. */
/* #undef HAVE_POLL */ #define HAVE_POLL 1
/* Define to 1 if you have the <poll.h> header file. */ /* Define to 1 if you have the <poll.h> header file. */
/* #undef HAVE_POLL_H */ /* #undef HAVE_POLL_H */

502
win32/clamd.vcproj
Unescape View File

@ -1,251 +1,251 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
Keyword="Win32Proj" ProjectType="Visual C++"
Name="clamd" Version="9,00"
ProjectGUID="{B3CA73CF-E71E-42F3-95DE-43797A86C798}" Name="clamd"
ProjectType="Visual C++" ProjectGUID="{B3CA73CF-E71E-42F3-95DE-43797A86C798}"
RootNamespace="clamd" RootNamespace="clamd"
TargetFrameworkVersion="196613" Keyword="Win32Proj"
Version="9,00" TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
Name="Win32" Name="Win32"
/> />
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
CharacterSet="2" Name="Debug|Win32"
ConfigurationType="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Debug|Win32" ConfigurationType="1"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" CharacterSet="2"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
/> />
<Tool <Tool
AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;" Name="VCCLCompilerTool"
BasicRuntimeChecks="3" Optimization="0"
CompileAs="1" AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
DebugInformationFormat="3" PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
DisableSpecificWarnings="4996;4244" MinimalRebuild="true"
MinimalRebuild="true" BasicRuntimeChecks="3"
Name="VCCLCompilerTool" RuntimeLibrary="3"
Optimization="0" UsePrecompiledHeader="0"
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1" WarningLevel="3"
RuntimeLibrary="3" DebugInformationFormat="3"
UsePrecompiledHeader="0" CompileAs="1"
WarningLevel="3" DisableSpecificWarnings="4996;4244;4090;4018"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
GenerateDebugInformation="true" Name="VCLinkerTool"
LinkIncremental="1" LinkIncremental="1"
Name="VCLinkerTool" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
CharacterSet="2" Name="Release|Win32"
ConfigurationType="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Release|Win32" ConfigurationType="1"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
/> />
<Tool <Tool
AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;" Name="VCCLCompilerTool"
CompileAs="1" Optimization="2"
DebugInformationFormat="3" EnableIntrinsicFunctions="true"
DisableSpecificWarnings="4996;4244" AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
EnableFunctionLevelLinking="true" PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
EnableIntrinsicFunctions="true" RuntimeLibrary="2"
Name="VCCLCompilerTool" EnableFunctionLevelLinking="true"
Optimization="2" UsePrecompiledHeader="0"
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1" WarningLevel="3"
RuntimeLibrary="2" DebugInformationFormat="3"
UsePrecompiledHeader="0" CompileAs="1"
WarningLevel="3" DisableSpecificWarnings="4996;4244;4090;4018"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
EnableCOMDATFolding="2" Name="VCLinkerTool"
GenerateDebugInformation="true" LinkIncremental="1"
LinkIncremental="1" GenerateDebugInformation="true"
Name="VCLinkerTool" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"
SubSystem="1" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
<Files> <Files>
<Filter <Filter
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Name="Source Files"
Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath="..\clamd\clamd.c" RelativePath="..\clamd\clamd.c"
> >
</File> </File>
<File <File
RelativePath="..\clamd\localserver.c" RelativePath="..\clamd\localserver.c"
> >
</File> </File>
<File <File
RelativePath="..\clamd\others.c" RelativePath="..\clamd\others.c"
> >
</File> </File>
<File <File
RelativePath="..\clamd\scanner.c" RelativePath="..\clamd\scanner.c"
> >
</File> </File>
<File <File
RelativePath="..\clamd\server-th.c" RelativePath="..\clamd\server-th.c"
> >
</File> </File>
<File <File
RelativePath="..\clamd\session.c" RelativePath="..\clamd\session.c"
> >
</File> </File>
<File <File
RelativePath="..\clamd\tcpserver.c" RelativePath="..\clamd\tcpserver.c"
> >
</File> </File>
<File <File
RelativePath="..\clamd\thrmgr.c" RelativePath="..\clamd\thrmgr.c"
> >
</File> </File>
<Filter <Filter
Name="shared" Name="shared"
> >
<File <File
RelativePath="..\shared\misc.c" RelativePath="..\shared\misc.c"
> >
</File> </File>
<File <File
RelativePath="..\shared\output.c" RelativePath="..\shared\output.c"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="compat" Name="compat"
> >
<File <File
RelativePath=".\compat\libgen.c" RelativePath=".\compat\libgen.c"
> >
</File> </File>
<File <File
RelativePath=".\compat\setargv.c" RelativePath=".\compat\setargv.c"
> >
</File> </File>
</Filter> </Filter>
</Filter> </Filter>
<Filter <Filter
Filter="h;hpp;hxx;hm;inl;inc;xsd" Name="Header Files"
Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
</Filter> </Filter>
<Filter <Filter
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" Name="Resource Files"
Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
</VisualStudioProject> </VisualStudioProject>

55
win32/compat/net.c
Unescape View File

@ -24,6 +24,7 @@
#ifdef W2K_DNSAAPI_COMPAT #ifdef W2K_DNSAAPI_COMPAT
#include <Wspiapi.h> #include <Wspiapi.h>
#endif #endif
#include <stdlib.h>
#include "net.h" #include "net.h"
#include "w32_errno.h" #include "w32_errno.h"
@ -348,3 +349,57 @@ int w32_shutdown(int sockfd, int how) {
} }
return 0; return 0;
} }
struct w32polldata {
HANDLE setme;
HANDLE event;
HANDLE waiter;
struct pollfd *polldata;
};
VOID CALLBACK poll_cb(PVOID param, BOOLEAN timedout) {
WSANETWORKEVENTS evt;
struct w32polldata *item = (struct w32polldata *)param;
if(!timedout) {
unsigned int i;
WSAEnumNetworkEvents(item->polldata->fd, item->event, &evt);
for(i=0; i<evt.lNetworkEvents; i++) {
if(evt.iErrorCode[i] & (FD_ACCEPT|FD_READ)) item->polldata->revents |= POLLIN;
if(evt.iErrorCode[i] & FD_CLOSE) item->polldata->revents |= POLLHUP;
}
}
}
int w32_poll(struct pollfd *fds, int nfds, int timeout) {
HANDLE setme = CreateEvent(NULL, TRUE, FALSE, NULL);
struct w32polldata *items;
unsigned int i, ret = 0;
timeout = timeout>=0 ? timeout*1000 : INFINITE;
if(!nfds) {
Sleep(timeout);
return 0;
}
items = malloc(nfds * sizeof(struct w32polldata));
for(i=0; i<nfds; i++) {
items[i].event = CreateEvent(NULL, TRUE, FALSE, NULL);
items[i].polldata = &fds[i];
items[i].setme = setme;
if(WSAEventSelect(fds[i].fd, items[i].event, FD_ACCEPT|FD_READ|FD_CLOSE)) {
/* handle error here */
}
if(RegisterWaitForSingleObject(&items[i].waiter, items[i].event, poll_cb, &items[i], timeout, WT_EXECUTEONLYONCE)) {
/* handle errors here */
}
}
WaitForSingleObject(setme, timeout); /* FIXME - add the pipe here */
for(i=0; i<nfds; i++) {
UnregisterWait(items[i].waiter);
WSAEventSelect(fds[i].fd, items[i].event, 0);
CloseHandle(items[i].event);
ret += (items[i].polldata->revents != 0);
}
free(items);
return ret;
}

1
win32/compat/net.h
Unescape View File

@ -39,6 +39,7 @@ void w32_freeaddrinfo(struct addrinfo *res);
const char *w32_inet_ntop(int af, const void *src, char *dst, socklen_t size); const char *w32_inet_ntop(int af, const void *src, char *dst, socklen_t size);
struct hostent *w32_gethostbyname(const char *name); struct hostent *w32_gethostbyname(const char *name);
int w32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); int w32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
int w32_poll(struct pollfd *fds, int nfds, int timeout);
int w32_accept(int sockfd, const struct sockaddr *addr, socklen_t *addrlen); int w32_accept(int sockfd, const struct sockaddr *addr, socklen_t *addrlen);
int w32_listen(int sockfd, int backlog); int w32_listen(int sockfd, int backlog);
int w32_shutdown(int sockfd, int how); int w32_shutdown(int sockfd, int how);

1
win32/libclamav.def
Unescape View File

@ -142,6 +142,7 @@ EXPORTS w32_freeaddrinfo
EXPORTS w32_inet_ntop EXPORTS w32_inet_ntop
EXPORTS w32_gethostbyname EXPORTS w32_gethostbyname
EXPORTS w32_select EXPORTS w32_select
EXPORTS w32_poll
EXPORTS w32_stat EXPORTS w32_stat
EXPORTS w32_strerror EXPORTS w32_strerror
EXPORTS w32_strerror_r EXPORTS w32_strerror_r

1
win32/platform.h
Unescape View File

@ -46,6 +46,7 @@ char *strptime(const char *s, const char *format, struct tm *tm);
#define inet_ntop w32_inet_ntop #define inet_ntop w32_inet_ntop
#define gethostbyname w32_gethostbyname #define gethostbyname w32_gethostbyname
#define select w32_select #define select w32_select
#define poll w32_poll
#define strerror w32_strerror #define strerror w32_strerror
#define strerror_r w32_strerror_r #define strerror_r w32_strerror_r
#define ftruncate _chsize #define ftruncate _chsize

2
win32/update-win32.pl
Unescape View File

@ -104,7 +104,7 @@ my %CONF = (
'HAVE_MMAP' => -1, 'HAVE_MMAP' => -1,
'HAVE_NDIR_H' => -1, 'HAVE_NDIR_H' => -1,
'HAVE_OPENDIR' => '1', 'HAVE_OPENDIR' => '1',
'HAVE_POLL' => -1, 'HAVE_POLL' => '1',
'HAVE_POLL_H' => -1, 'HAVE_POLL_H' => -1,
'HAVE_PRAGMA_PACK' => '1', 'HAVE_PRAGMA_PACK' => '1',
'HAVE_PRAGMA_PACK_HPPA' => -1, 'HAVE_PRAGMA_PACK_HPPA' => -1,

Write Preview
Loading…
Cancel
Save