1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-30 01:59:02 +00:00

add osscan2.* files

This commit is contained in:
fyodor
2006-06-26 03:39:13 +00:00
parent e742c004b1
commit 91af49292a
6 changed files with 3579 additions and 19 deletions

View File

@@ -1,4 +1,7 @@
# Nmap Changelog ($Id$); -*-text-*-
Nmap 4.20ALPHA3
o Added back Win32 support thanks to a patch by kx (kxmail(a)gmail.com)
Nmap 4.20ALPHA2

View File

@@ -1,4 +1,4 @@
export NMAP_VERSION = 4.20ALPHA2
export NMAP_VERSION = 4.20ALPHA3
NMAP_NAME= Nmap
NMAP_URL= http://www.insecure.org/nmap/
NMAP_PLATFORM=@host@

View File

@@ -263,6 +263,10 @@
RelativePath="..\osscan.cc"
>
</File>
<File
RelativePath="..\osscan2.cc"
>
</File>
<File
RelativePath="..\output.cc"
>
@@ -404,6 +408,10 @@
RelativePath="..\osscan.h"
>
</File>
<File
RelativePath="..\osscan2.h"
>
</File>
<File
RelativePath="..\output.h"
>
@@ -590,7 +598,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -600,7 +608,31 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\nmap-os-db"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -614,7 +646,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -624,7 +656,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -638,7 +670,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -648,7 +680,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -662,7 +694,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -672,7 +704,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -686,7 +718,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -696,7 +728,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -710,7 +742,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -720,7 +752,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName)"
/>
</FileConfiguration>
@@ -733,9 +765,9 @@
>
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName) to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
Outputs="$(TargetDir)$(InputName)"
Description="Copying $(InputName).xsl to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName).xsl"
/>
</FileConfiguration>
<FileConfiguration
@@ -744,8 +776,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying $(InputName).xsl to output directory..."
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul&#x0D;&#x0A;"
Outputs="$(TargetDir)$(InputName)"
CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul"
Outputs="$(TargetDir)$(InputName).xsl"
/>
</FileConfiguration>
</File>

View File

@@ -106,7 +106,7 @@
/* Without this, Windows will give us all sorts of crap about using functions
like strcpy() even if they are done safely */
#define _CRT_SECURE_NO_DEPRECATE 1
#define NMAP_VERSION "4.20ALPHA2"
#define NMAP_VERSION "4.20ALPHA3"
#define NMAP_NAME "Nmap"
#define NMAP_URL "http://www.insecure.org/nmap"
#define NMAP_PLATFORM "i686-pc-windows-windows"

3500
osscan2.cc Normal file

File diff suppressed because it is too large Load Diff

25
osscan2.h Normal file
View File

@@ -0,0 +1,25 @@
#ifndef OSSCAN2_H
#define OSSCAN2_H
#include "nmap.h"
#include "tcpip.h"
#include "global_structures.h"
#include "FingerPrintResults.h"
#include "osscan.h"
/********************** PROTOTYPES ***********************************/
int os_scan_2(std::vector<Target *> &Targets);
int send_closedudp_probe_2(struct udpprobeinfo &upi, int sd,
struct eth_nfo *eth, const struct in_addr *victim,
int ttl, u16 sport, u16 dport);
int send_icmp_echo_probe(int sd, struct eth_nfo *eth, const struct in_addr *victim,
u8 tos, bool df, u8 pcode, unsigned short id, u16 seq, u16 datalen);
int get_initial_ttl_guess(u8 ttl);
int get_ipid_sequence(struct ipid_info *ipid, int islocalhost);
#endif /*OSSCAN2_H*/