mirror of
https://github.com/nmap/nmap.git
synced 2025-12-30 03:19:02 +00:00
This prevents nsock from iterating over the whole list of events at each runloop, thus improving performance. It made it necessary to have pointers from the msevents to the event lists they belong to. The patch therefore also changes gh_list from autonomous containers to embedded structures. Added unit tests accordingly and cosmetic changes to make things look more consistent.
231 lines
12 KiB
XML
231 lines
12 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<ItemGroup Label="ProjectConfigurations">
|
|
<ProjectConfiguration Include="DebugNoPcap|Win32">
|
|
<Configuration>DebugNoPcap</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Debug|Win32">
|
|
<Configuration>Debug</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="ReleaseNoPcap|Win32">
|
|
<Configuration>ReleaseNoPcap</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|Win32">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Static|Win32">
|
|
<Configuration>Static</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
</ItemGroup>
|
|
<PropertyGroup Label="Globals">
|
|
<ProjectGuid>{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}</ProjectGuid>
|
|
<RootNamespace>nsock</RootNamespace>
|
|
<Keyword>Win32Proj</Keyword>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|Win32'" Label="Configuration">
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'" Label="Configuration">
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration">
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
<ImportGroup Label="ExtensionSettings">
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|Win32'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
|
|
</ImportGroup>
|
|
<PropertyGroup Label="UserMacros" />
|
|
<PropertyGroup>
|
|
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\</OutDir>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">.\</OutDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">Release\</IntDir>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'">$(Configuration)\</OutDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'">$(Configuration)\</IntDir>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|Win32'">$(Configuration)\</OutDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|Win32'">$(Configuration)\</IntDir>
|
|
</PropertyGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
<ClCompile>
|
|
<Optimization>Disabled</Optimization>
|
|
<AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<MinimalRebuild>true</MinimalRebuild>
|
|
<ExceptionHandling>
|
|
</ExceptionHandling>
|
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
</ClCompile>
|
|
<Lib>
|
|
<OutputFile>$(OutDir)nsock.lib</OutputFile>
|
|
</Lib>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
<ClCompile>
|
|
<AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
|
|
<AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<ExceptionHandling>
|
|
</ExceptionHandling>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
</ClCompile>
|
|
<Lib>
|
|
<OutputFile>$(OutDir)nsock.lib</OutputFile>
|
|
</Lib>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
|
|
<ClCompile>
|
|
<AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
|
|
<AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions);DISABLE_NSOCK_PCAP</PreprocessorDefinitions>
|
|
<ExceptionHandling>
|
|
</ExceptionHandling>
|
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
</ClCompile>
|
|
<Lib>
|
|
<OutputFile>$(OutDir)nsock.lib</OutputFile>
|
|
</Lib>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'">
|
|
<ClCompile>
|
|
<AdditionalOptions>/D "DISABLE_NSOCK_PCAP" %(AdditionalOptions)</AdditionalOptions>
|
|
<Optimization>Disabled</Optimization>
|
|
<AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<MinimalRebuild>true</MinimalRebuild>
|
|
<ExceptionHandling>
|
|
</ExceptionHandling>
|
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
</ClCompile>
|
|
<Lib>
|
|
<OutputFile>$(OutDir)nsock.lib</OutputFile>
|
|
</Lib>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|Win32'">
|
|
<ClCompile>
|
|
<AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE"
|
|
/D "DISABLE_NSOCK_PCAP" %(AdditionalOptions)</AdditionalOptions>
|
|
<AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<ExceptionHandling>
|
|
</ExceptionHandling>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
</ClCompile>
|
|
<Lib>
|
|
<OutputFile>$(OutDir)nsock.lib</OutputFile>
|
|
</Lib>
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
<ClCompile Include="src\engine_epoll.c" />
|
|
<ClCompile Include="src\engine_kqueue.c" />
|
|
<ClCompile Include="src\engine_poll.c" />
|
|
<ClCompile Include="src\engine_select.c" />
|
|
<ClCompile Include="src\error.c" />
|
|
<ClCompile Include="src\filespace.c" />
|
|
<ClCompile Include="src\gh_heap.c" />
|
|
<ClCompile Include="src\netutils.c" />
|
|
<ClCompile Include="src\nsock_connect.c" />
|
|
<ClCompile Include="src\nsock_core.c" />
|
|
<ClCompile Include="src\nsock_engines.c" />
|
|
<ClCompile Include="src\nsock_event.c" />
|
|
<ClCompile Include="src\nsock_iod.c" />
|
|
<ClCompile Include="src\nsock_log.c" />
|
|
<ClCompile Include="src\nsock_pcap.c" />
|
|
<ClCompile Include="src\nsock_pool.c" />
|
|
<ClCompile Include="src\nsock_proxy.c" />
|
|
<ClCompile Include="src\nsock_read.c" />
|
|
<ClCompile Include="src\nsock_ssl.c" />
|
|
<ClCompile Include="src\nsock_timers.c" />
|
|
<ClCompile Include="src\nsock_write.c" />
|
|
<ClCompile Include="src\proxy_http.c" />
|
|
<ClCompile Include="src\proxy_socks4.c" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ClInclude Include="src\error.h" />
|
|
<ClInclude Include="src\filespace.h" />
|
|
<ClInclude Include="src\gh_heap.h" />
|
|
<ClInclude Include="src\gh_list.h" />
|
|
<ClInclude Include="src\netutils.h" />
|
|
<ClInclude Include="include\nsock.h" />
|
|
<ClInclude Include="src\nsock_internal.h" />
|
|
<ClInclude Include="src\nsock_log.h" />
|
|
<ClInclude Include="src\nsock_pcap.h" />
|
|
<ClInclude Include="src\nsock_proxy.h" />
|
|
<ClInclude Include="src\nsock_ssl.h" />
|
|
<ClInclude Include="include\nsock_winconfig.h" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\nbase\nbase.vcxproj">
|
|
<Project>{b630c8f7-3138-43e8-89ed-78742fa2ac5f}</Project>
|
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
|
</ProjectReference>
|
|
</ItemGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
<ImportGroup Label="ExtensionTargets">
|
|
</ImportGroup>
|
|
</Project>
|