diff --git a/CHANGELOG b/CHANGELOG index 2619d5ce8..5d5c084a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ #Nmap Changelog ($Id$); -*-text-*- +o [GH#2126] Fix the "iocp" Nsock engine for Windows to be able to correctly + handle PCAP read events. This engine is now the default for Windows, which + should greatly improve performance over the previous default, the "poll" + engine. [Daniel Miller] + o [GH#2051] Restrict Nmap's search path for scripts and data files. NMAPDATADIR, defined on Unix and Linux as ${prefix}/share/nmap, will not be searched on Windows, where it was previously defined as C:\Nmap . diff --git a/nsock/src/nsock_engines.c b/nsock/src/nsock_engines.c index feab87e8a..2e29fb39a 100644 --- a/nsock/src/nsock_engines.c +++ b/nsock/src/nsock_engines.c @@ -100,8 +100,8 @@ extern struct io_engine engine_select; static struct io_engine *available_engines[] = { ENGINE_EPOLL ENGINE_KQUEUE - ENGINE_POLL ENGINE_IOCP + ENGINE_POLL ENGINE_SELECT NULL };