diff --git a/CHANGELOG b/CHANGELOG index bb402578e..98714499c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -89,6 +89,15 @@ o Modified the WinPcap installer file to explicitly uninstall an than just overwriting the old version. Thanks to Doug Hoyte for making this change. +o Added some P2P application ports to the nmap-services file. Thanks + to Martin Macok for the patch. + +o The write buffer length increased in 4.03 was increased even further + when the debugging or verbosity levels are more than 2 (e.g. -d3). + Thanks to Brandon Enright (bmenrigh(a)ucsd.edu) for the patch. The + goal is to prevent you from ever seeing the fatal error: + "log_vwrite: write buffer not large enough -- need to increase" + Nmap 4.03 o Updated the LibPCRE build system to add the -fno-thread-jumps option @@ -132,7 +141,7 @@ o Fixed (I hope) a problem where aggressive --min-parallelization o Fixed a rare crash bug thanks to a report and patch from Ganga Bhavani (GBhavani(a)everdreamcorp.com) -o Increased a write buffer length to avoid Nmap from quitting with the +o Increased a write buffer length to keep Nmap from quitting with the message "log_vwrite: write buffer not large enough -- need to increase". Thanks to Dave (dmarcher(a)pobox.com) for reporting the issue. diff --git a/Makefile.in b/Makefile.in index 5edf4b0ff..9b2af8601 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -export NMAP_VERSION = 4.03 +export NMAP_VERSION = 4.04 NMAP_NAME= Nmap NMAP_URL= http://www.insecure.org/nmap/ NMAP_PLATFORM=@host@ diff --git a/docs/leet-nmap-ascii-art.txt b/docs/leet-nmap-ascii-art.txt index 96d416828..4c32021fc 100644 --- a/docs/leet-nmap-ascii-art.txt +++ b/docs/leet-nmap-ascii-art.txt @@ -12,3 +12,5 @@ / / _/ / + / \/ ' (__/ / \ NMAP IS A POWERFUL TOOL -- USE CAREFULLY AND REPONSIBLY + [ Sick of the Nmap dragon? Submit your ] + [ art and tag lines for the next release! ] diff --git a/docs/nmap.1 b/docs/nmap.1 index 21259279f..f4fe9930c 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "NMAP" "1" "05/27/2006" "" "Nmap Reference Guide" +.TH "NMAP" "1" "05/31/2006" "" "Nmap Reference Guide" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index db76d6fd5..df3305dc3 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 4.03 ( http://www.insecure.org/nmap/ ) +Nmap 4.04 ( http://www.insecure.org/nmap/ ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. diff --git a/libdnet-stripped/libdnet-stripped.vcproj b/libdnet-stripped/libdnet-stripped.vcproj index 2378c0c13..53341c162 100755 --- a/libdnet-stripped/libdnet-stripped.vcproj +++ b/libdnet-stripped/libdnet-stripped.vcproj @@ -1,95 +1,145 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + OutputFile="$(OutDir)/libdnet-stripped.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + OutputFile="$(OutDir)/libdnet-stripped.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> @@ -98,104 +148,136 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\src\addr-util.c" + > + RelativePath=".\src\addr.c" + > + RelativePath=".\src\arp-win32.c" + > + RelativePath=".\src\err.c" + > + RelativePath=".\src\eth-win32.c" + > + RelativePath=".\src\intf-win32.c" + > + RelativePath=".\src\ip-util.c" + > + RelativePath=".\src\ip-win32.c" + > + RelativePath=".\src\ip6.c" + > + RelativePath=".\src\route-win32.c" + > + RelativePath=".\src\strlcat.c" + > + RelativePath=".\src\strlcpy.c" + > + RelativePath=".\src\strsep.c" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\include\dnet\addr.h" + > + RelativePath=".\include\dnet\arp.h" + > + RelativePath=".\include\config.h" + > + RelativePath=".\include\dnet.h" + > + RelativePath=".\include\err.h" + > + RelativePath=".\include\dnet\eth.h" + > + RelativePath=".\include\dnet\icmp.h" + > + RelativePath=".\include\dnet\intf.h" + > + RelativePath=".\include\dnet\ip.h" + > + RelativePath=".\include\dnet\ip6.h" + > + RelativePath=".\include\dnet\os.h" + > + RelativePath=".\include\queue.h" + > + RelativePath=".\include\dnet\route.h" + > + RelativePath=".\include\dnet\tcp.h" + > + RelativePath=".\include\dnet\udp.h" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + RelativePath=".\ReadMe.txt" + > diff --git a/libpcre/libpcre.vcproj b/libpcre/libpcre.vcproj index c4565baab..765c7678b 100644 --- a/libpcre/libpcre.vcproj +++ b/libpcre/libpcre.vcproj @@ -1,95 +1,145 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + CompileAs="1" + /> + Name="VCManagedResourceCompilerTool" + /> + + + OutputFile="$(OutDir)/libpcre.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + CompileAs="1" + /> + Name="VCManagedResourceCompilerTool" + /> + + + OutputFile="$(OutDir)/libpcre.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> @@ -98,86 +148,112 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\pcre_chartables.c" + > + RelativePath=".\pcre_compile.c" + > + RelativePath=".\pcre_config.c" + > + RelativePath=".\pcre_dfa_exec.c" + > + RelativePath=".\pcre_exec.c" + > + RelativePath=".\pcre_fullinfo.c" + > + RelativePath=".\pcre_get.c" + > + RelativePath=".\pcre_globals.c" + > + RelativePath=".\pcre_info.c" + > + RelativePath=".\pcre_maketables.c" + > + RelativePath=".\pcre_refcount.c" + > + RelativePath=".\pcre_study.c" + > + RelativePath=".\pcre_tables.c" + > + RelativePath=".\pcre_try_flipped.c" + > + RelativePath=".\pcre_version.c" + > + RelativePath=".\pcre_xclass.c" + > + RelativePath=".\pcreposix.c" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\pcre.h" + > + RelativePath=".\pcre_internal.h" + > + RelativePath=".\pcre_win.h" + > + RelativePath=".\pcre_winconfig.h" + > + RelativePath=".\pcreposix.h" + > + RelativePath=".\ucp.h" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > diff --git a/mswin32/Makefile b/mswin32/Makefile index 50d758130..0e2c9c28b 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -1,7 +1,9 @@ MAKENSIS=/c/apps/NSIS/makensis.exe +VCEXPRESS="/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/VCExpress.exe" NMAP_VERSION:=$(shell grep "export NMAP_VERSION " ../Makefile.in | cut "-d " -f4) winbuild: + $(VCEXPRESS) nmap.sln /build release /log nmapbuild.log $(MAKENSIS) winpcap/winpcap-nmap.nsi rm -rf nmap-$(NMAP_VERSION) mkdir nmap-$(NMAP_VERSION) @@ -11,3 +13,7 @@ winbuild: cp nsis/AddToPath.nsh nsis/Nmap.nsi nmap-$(NMAP_VERSION) $(MAKENSIS) nmap-$(NMAP_VERSION)/Nmap.nsi mv nmap-$(NMAP_VERSION)/NmapInstaller.exe nmap-$(NMAP_VERSION)-setup.exe + +clean: + $(VCEXPRESS) nmap.sln /clean + rm -rf Debug Release nmapbuild.log diff --git a/mswin32/nmap.rc b/mswin32/nmap.rc index dc7633ac8..03b245427 100644 --- a/mswin32/nmap.rc +++ b/mswin32/nmap.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "mfc/winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""mfc/winres.h""\r\n" "\0" END diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln index 4ad30794d..933ebdd20 100644 --- a/mswin32/nmap.sln +++ b/mswin32/nmap.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}" ProjectSection(ProjectDependencies) = postProject {5DE86C7A-DE72-4265-8807-4CA38F94F22A} = {5DE86C7A-DE72-4265-8807-4CA38F94F22A} @@ -13,46 +14,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcp EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\libpcre\libpcre.vcproj", "{5DE86C7A-DE72-4265-8807-4CA38F94F22A}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbase", "..\nbase\nbase.vcproj", "{B630C8F7-3138-43E8-89ED-78742FA2AC5F}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnet", "..\libdnet-stripped\libdnet-stripped.vcproj", "{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug.ActiveCfg = Debug|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug.Build.0 = Debug|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release.ActiveCfg = Release|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release.Build.0 = Release|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug.ActiveCfg = Debug|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug.Build.0 = Debug|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release.ActiveCfg = Release|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release.Build.0 = Release|Win32 - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug.ActiveCfg = Debug|Win32 - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug.Build.0 = Debug|Win32 - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release.ActiveCfg = Release|Win32 - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release.Build.0 = Release|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug.ActiveCfg = Debug|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug.Build.0 = Debug|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release.ActiveCfg = Release|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release.Build.0 = Release|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug.ActiveCfg = Debug|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug.Build.0 = Debug|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release.ActiveCfg = Release|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.ActiveCfg = Debug|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.Build.0 = Debug|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.ActiveCfg = Release|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.Build.0 = Release|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.Build.0 = Debug|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.ActiveCfg = Release|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.Build.0 = Release|Win32 + {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.ActiveCfg = Debug|Win32 + {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.Build.0 = Debug|Win32 + {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.ActiveCfg = Release|Win32 + {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.Build.0 = Release|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.ActiveCfg = Debug|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.Build.0 = Debug|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.ActiveCfg = Release|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.Build.0 = Release|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.ActiveCfg = Debug|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.Build.0 = Debug|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.ActiveCfg = Release|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj index 40715105f..d148e149c 100644 --- a/mswin32/nmap.vcproj +++ b/mswin32/nmap.vcproj @@ -1,144 +1,207 @@ + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="2" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + CompileAs="2" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -146,434 +209,544 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="..\charpool.cc" + > + RelativePath="..\FingerPrintResults.cc" + > + RelativePath="..\idle_scan.cc" + > + RelativePath="..\MACLookup.cc" + > + RelativePath="..\main.cc" + > + RelativePath="..\nmap.cc" + > + RelativePath="..\nmap_dns.cc" + > + RelativePath="..\nmap_error.cc" + > + RelativePath="..\nmap_rpc.cc" + > + RelativePath="..\nmap_tty.cc" + > + RelativePath="..\NmapOps.cc" + > + RelativePath="..\NmapOutputTable.cc" + > + RelativePath="..\osscan.cc" + > + RelativePath="..\output.cc" + > + RelativePath="..\portlist.cc" + > + RelativePath="..\protocols.cc" + > + RelativePath="..\scan_engine.cc" + > + RelativePath="..\service_scan.cc" + > + RelativePath="..\services.cc" + > + RelativePath="..\Target.cc" + > + RelativePath="..\TargetGroup.cc" + > + RelativePath="..\targets.cc" + > + RelativePath="..\tcpip.cc" + > + RelativePath="..\timing.cc" + > + RelativePath="..\utils.cc" + > + > + RelativePath="nmap.rc" + > + RelativePath="winfix.cc" + > + Name="Debug|Win32" + > + ExceptionHandling="1" + /> + Name="Release|Win32" + > + ExceptionHandling="1" + /> + Filter="h;hpp;hxx;hm;inl" + > + RelativePath="..\charpool.h" + > + RelativePath="..\FingerPrintResults.h" + > + RelativePath="..\global_structures.h" + > + RelativePath="..\idle_scan.h" + > + RelativePath="NETINET\IP.H" + > + RelativePath="..\MACLookup.h" + > + RelativePath="..\nmap.h" + > + RelativePath="..\nmap_dns.h" + > + RelativePath="..\nmap_error.h" + > + RelativePath="..\nmap_rpc.h" + > + RelativePath="..\nmap_tty.h" + > + RelativePath="..\nmap_winconfig.h" + > + RelativePath="..\NmapOps.h" + > + RelativePath="..\NmapOutputTable.h" + > + RelativePath="..\osscan.h" + > + RelativePath="..\output.h" + > + RelativePath="..\portlist.h" + > + RelativePath="..\protocols.h" + > + RelativePath="..\scan_engine.h" + > + RelativePath="..\service_scan.h" + > + RelativePath="..\services.h" + > + RelativePath="strings.h" + > + RelativePath="..\targets.h" + > + RelativePath="NETINET\TCP.H" + > + RelativePath="..\tcpip.h" + > + RelativePath="..\timing.h" + > + RelativePath="..\utils.h" + > + > + RelativePath="NET\Bpf.h" + > + RelativePath="winip\iphlpapi.h" + > + RelativePath=".\winclude.h" + > + RelativePath=".\winfix.h" + > + > + RelativePath=".\pcap-include\bittypes.h" + > + RelativePath=".\pcap-include\bucket_lookup.h" + > + RelativePath=".\pcap-include\count_packets.h" + > + RelativePath=".\pcap-include\Devioctl.h" + > + RelativePath=".\pcap-include\Gnuc.h" + > + RelativePath=".\pcap-include\ip6_misc.h" + > + RelativePath=".\pcap-include\memory_t.h" + > + RelativePath=".\pcap-include\normal_lookup.h" + > + RelativePath=".\pcap-include\Ntddndis.h" + > + RelativePath=".\pcap-include\Ntddpack.h" + > + RelativePath=".\pcap-include\Packet32.h" + > + RelativePath=".\pcap-include\pcap-bpf.h" + > + RelativePath=".\pcap-include\pcap-int.h" + > + RelativePath=".\pcap-include\pcap-stdinc.h" + > + RelativePath=".\pcap-include\pcap.h" + > + RelativePath=".\pcap-include\pthread.h" + > + RelativePath=".\pcap-include\remote-ext.h" + > + RelativePath=".\pcap-include\sched.h" + > + RelativePath=".\pcap-include\semaphore.h" + > + RelativePath=".\pcap-include\tcp_session.h" + > + RelativePath=".\pcap-include\time_calls.h" + > + RelativePath=".\pcap-include\tme.h" + > + RelativePath=".\pcap-include\Win32-Extensions.h" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + RelativePath="icon1.ico" + > + > + RelativePath="..\nmap-mac-prefixes" + > + Name="Debug|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + Name="Release|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + RelativePath="..\nmap-os-fingerprints" + > + Name="Debug|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + Name="Release|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + RelativePath="..\nmap-protocols" + > + Name="Debug|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + Name="Release|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + RelativePath="..\nmap-rpc" + > + Name="Debug|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + Name="Release|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + RelativePath="..\nmap-service-probes" + > + Name="Debug|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + Name="Release|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + RelativePath="..\nmap-services" + > + Name="Debug|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + Name="Release|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + RelativePath="..\docs\nmap.xsl" + > + Name="Debug|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName)" > nul " + Outputs="$(TargetDir)$(InputName)" + /> + Name="Release|Win32" + > + CommandLine="copy /y "$(InputPath)" "$(TargetDir)$(InputName).xsl" > nul " + Outputs="$(TargetDir)$(InputName)" + /> diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi index fbecb1d33..af8e0d614 100644 --- a/mswin32/nsis/Nmap.nsi +++ b/mswin32/nsis/Nmap.nsi @@ -79,9 +79,9 @@ SectionEnd Section "WinPcap 3.1" SecWinPcap - File winpcap-nmap-3.1.A.exe - Exec '"$INSTDIR\winpcap-nmap-3.1.A.exe"' - Delete "$INSTDIR\winpcap-nmap-3.1.A.exe" + File winpcap-nmap-3.1.B.exe + Exec '"$INSTDIR\winpcap-nmap-3.1.B.exe"' + Delete "$INSTDIR\winpcap-nmap-3.1.B.exe" SectionEnd diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi index bd4db3f6e..7dfadee41 100644 --- a/mswin32/winpcap/winpcap-nmap.nsi +++ b/mswin32/winpcap/winpcap-nmap.nsi @@ -7,7 +7,7 @@ Name "winpcap-nmap-3.1" ; The file to write -OutFile "winpcap-nmap-3.1.A.exe" +OutFile "winpcap-nmap-3.1.B.exe" ; The default installation directory InstallDir $PROGRAMFILES\WinPcap diff --git a/nmap-os-fingerprints b/nmap-os-fingerprints index df431a7b8..82784f9c0 100644 --- a/nmap-os-fingerprints +++ b/nmap-os-fingerprints @@ -18119,7 +18119,7 @@ PU(DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=F%RIPCK=F%UCK=E%ULEN=134%DAT=E) # OpenBSD 3.6-stable on SPARC # OpenBSD 3.6 GENERIC#304 sparc64 # OpenBSD 3.7 GENERIC#50 i386 -Fingerprint OpenBSD 3.5 - 3.7 +Fingerprint OpenBSD 3.5 - 3.9 Class OpenBSD | OpenBSD | 3.X | general purpose TSeq(Class=TR%gcd=<6%IPID=RD%TS=2HZ) T1(DF=Y%W=4000%ACK=S++%Flags=AS%Ops=MNWNNT) diff --git a/nmap-services b/nmap-services index 454d15380..8381a3b22 100644 --- a/nmap-services +++ b/nmap-services @@ -1852,6 +1852,7 @@ squid-http 3128/tcp # squid-ipc 3130/udp # vmodem 3141/tcp # vmodem 3141/udp # +kademlia 3246/udp # Kademlia P2P (mlnet) ccmail 3264/tcp # cc:mail/lotus ccmail 3264/udp # cc:mail/lotus globalcatLDAP 3268/tcp # Global Catalog LDAP @@ -1890,6 +1891,7 @@ remoteanything 3998/udp # neoworx remote-anything reserved remoteanything 3999/tcp # neoworx remote-anything slave file browser remoteanything 4000/tcp # neoworx remote-anything slave remote control icq 4000/udp # AOL ICQ instant messaging clent-server communication +mlchat-proxy 4002/tcp # mlnet - MLChat P2P chat proxy netcheque 4008/tcp # NetCheque accounting netcheque 4008/udp # NetCheque accounting lockd 4045/tcp # @@ -1914,6 +1916,8 @@ sae-urn 4500/udp # fax 4557/tcp # FlexFax FAX transmission service hylafax 4559/tcp # HylaFAX client-server protocol mosmig 4660/tcp # OpenMOSix MIGrates local processes +edonkey 4662/tcp # eDonkey file sharing (Donkey) +edonkey 4666/udp # eDonkey file sharing (Donkey) rfa 4672/tcp # remote file access server rfa 4672/udp # remote file access server squid-htcp 4827/udp # Squid proxy HTCP port @@ -2048,6 +2052,9 @@ montage-lm 6147/udp # Montage License Manager ricardo-lm 6148/tcp # Ricardo North America License Manager ricardo-lm 6148/udp # Ricardo North America License Manager gnutella 6346/tcp # Gnutella file sharing protocol +gnutella 6346/udp # Gnutella file sharing protocol +gnutella2 6347/tcp # Gnutella2 file sharing protocol +gnutella2 6347/udp # Gnutella2 file sharing protocol crystalreports 6400/tcp # Seagate Crystal Reports crystalenterprise 6401/tcp # Seagate Crystal Enterprise mythtv 6543/tcp @@ -2063,6 +2070,7 @@ analogx 6588/tcp # AnalogX HTTP proxy port irc-serv 6666/tcp # internet relay chat server irc 6667/tcp # Internet Relay Chat irc 6668/tcp # Internet Relay Chat +bittorent-tracker 6881/tcp # BitTorrent tracker acmsoda 6969/tcp # acmsoda 6969/udp # napster 6699/tcp # Napster File (MP3) sharing software @@ -2156,6 +2164,8 @@ VeritasNetbackup 13722/tcp # bpjava-msvc client VeritasNetbackup 13782/tcp # bpcd client VeritasNetbackup 13783/tcp # vopied client swgps 15126/tcp # Nortel Java S/WGPS Global Payment Solutions for US credit card authorizations +overnet 16444/tcp # Overnet file sharing +overnet 16444/udp # Overnet file sharing subseven 16959/tcp # Subseven trojan isode-dua 17007/tcp # isode-dua 17007/udp # diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 316a79e45..26bd9f1f6 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -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.03" +#define NMAP_VERSION "4.04" #define NMAP_NAME "Nmap" #define NMAP_URL "http://www.insecure.org/nmap" #define NMAP_PLATFORM "i686-pc-windows-windows" diff --git a/output.cc b/output.cc index 2e598d93b..73fc55c54 100644 --- a/output.cc +++ b/output.cc @@ -674,7 +674,7 @@ char* xml_convert (const char* str) { In addition, YOU MUST SANDWHICH EACH EXECUTION IF THIS CALL BETWEEN va_start() AND va_end() calls. */ void log_vwrite(int logt, const char *fmt, va_list ap) { - static char *writebuf = NULL;; + static char *writebuf = NULL; int writebuflen = 65536; bool skid_noxlate = false; int rc = 0; @@ -682,6 +682,10 @@ void log_vwrite(int logt, const char *fmt, va_list ap) { int fileidx = 0; int l; + /* Account for extended output under high debugging/verbosity */ + if (o.debugging > 2 || o.verbose > 2) + writebuflen *= 8; + if (!writebuf) writebuf = (char *) safe_malloc(writebuflen);