PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-10 09:49:05 +00:00
Code Issues Projects Releases Wiki Activity

Remove vestiges of WinIP library.

Browse Source 
This was an old library removed in r2811 and r2812, of which a few
traces remained.

I don't know the purpose of this in nbase_misc.c:
  if(sd != 501) // Hack related to WinIP Raw Socket support
    ioctlsocket (sd, FIONBIO, &one);
This commit is contained in:
david
2012-10-01 19:54:17 +00:00
parent d7479cfa94
commit a8c51eeda0
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mswin32/nmap.vcxproj
View File

@@ -52,7 +52,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\liblua;..\nbase;..\libpcre;winip;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
@@ -98,7 +98,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.;..;..\liblua;..\nbase;..\libpcre;winip;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

2
mswin32/winfix.cc
View File

@@ -251,7 +251,7 @@ void win_init()
ULONG len = sizeof(pcaplist);
o.have_pcap = true;
if(o.debugging > 2) printf("***WinIP*** trying to initialize WinPcap\n");
if(o.debugging > 2) printf("Trying to initialize WinPcap\n");
PacketGetAdapterNames(pcaplist, &len);
#ifdef _MSC_VER

4
nping/nping.vcxproj
View File

@@ -54,7 +54,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\mswin32;../nbase;winip;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
@@ -100,7 +100,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.;..;..\mswin32;../nbase;winip;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

2
nping/winfix.cc
View File

@@ -250,7 +250,7 @@ void win_init()
{
ULONG len = sizeof(pcaplist);
if(o.getDebugging() >= DBG_2) printf("***WinIP*** trying to initialize WinPcap\n");
if(o.getDebugging() >= DBG_2) printf("Trying to initialize WinPcap\n");
PacketGetAdapterNames(pcaplist, &len);
#ifdef _MSC_VER

2
tcpip.h
View File

@@ -536,9 +536,7 @@ void broadcast_socket(int sd);
int recvtime(int sd, char *buf, int len, int seconds, int *timedout);
/* Sets a pcap filter function -- makes SOCK_RAW reads easier */
#ifndef WINIP_H
void set_pcap_filter(const char *device, pcap_t *pd, const char *bpf, ...);
#endif
#endif /*TCPIP_H*/