a bunch of misc. changes

CHANGELOG

@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$)
 
+UNRELEASED
+
 o Added --max_retries option for capping the maximum number of
   retransmissions the port scan engine will do. The value may be as low
   as 0 (no retransmits).  A low value can increase spead, though at the
@@ -9,16 +11,63 @@ o Added --max_retries option for capping the maximum number of
   changed quite a bit.  I also updated the docs to reflect this neat
   new option.
 
+o Many of the Nmap low-level timing options take a value in
+  milliseconds.  You can now append an 's', 'm', or 'h' to the value
+  to give it in seconds, minutes, or hours instead.  So you can specify a
+  45 minute host timeout with --host_timeout 45m rather than specifying
+  --host_timeout 2700000 and hoping you did the math right and have the 
+  correct number of zeros.  This also now works for the
+  --min_rtt_timeout, --max_rtt_timeout, --initial_rtt_timeout,
+  --scan_delay, and --max_scan_delay options.
+
+o Debian GNU/kFreeBSD is now supported thanks to a patch to libdnet's
+  configure.in by Petr Salinger (Petr.Salinger(a)t-systems.cz).
+
+o Tried to update to the latest autoconf only to find that there
+  hasn't been a new version in more than two years :(.  I was able to
+  find new config.sub and config.guess files at
+  http://cvs.savannah.gnu.org/viewcvs/config/config/ , so I updated to
+  those.
+
 o Improved the NmapFE port to GTK2 so it better-conforms to the new
   API and you don't get as many annoying messages in your terminal
   window.  Thanks to Priit Laes (amd(a)store20.com) for writing these
   excellent patches.
 
+o Fixed a problem which led to the error message "Failed to determine
+  dst MAC address for target" when you try to run Nmap using a
+  dialup/PPP adapter on Windows rather than a real ethernet card.  Due
+  to Microsoft breaking raw sockets, No longer supports dialup adapters, but
+  it should now give you a clearer error message than the "dst MAC
+  address" nonsense.
+
+o Fixed a problem with the -e option when run on Windows (or UNIX with
+  --send_eth) when run on an ethernet network against an external
+  (routed) host.  You would get the message "NmapArpCache() can only
+  take IPv4 addresses.  Sorry".  Thanks to KX (kxmail(a)gmail.com) for
+  helping to track down the problem.
+
 o Made some changes to allow source port zero scans (-g0).  Nmap used
   to refused to do this, but now it just gives a warning that it may not
   work on all systems.  It seems to work fine on my Linux box.  Thanks
   to Bill Dale (bill_dale(a)bellsouth.net) for suggesting this feature.
 
+o Made a change to libdnet so that Windows interfaces are listed as
+  down if they are disconnected, unplugged, or otherwise unavailable.
+
+o Ceased including foreign translations in the Nmap tarball as they
+  take up too much space.  HTML versions can be found at
+  http://www.insecure.org/nmap/docs.html , while XML and NROFF versions
+  are available from http://www.insecure.org/nmap/data/man-xlate/ .
+
+o Changed INSTALL and README-WIN32 files to mostly just reference the
+  new Nmap Install Guide at http://www.insecure.org/nmap/install/ .
+
+o Included docs/nmap-man.xml in the tarball distribution, which is the
+  DocBook XML source for the Nmap man page.  Patches to Nmap that are
+  user-visible should include patches to the man page XML source rather
+  than the Nroff source.
+
 o Fixed Nmap so it doesn't crash when you ask it to resume a previous
   scan, but pass in a bogus file rather than actual Nmap output.  Thanks
   to Piotr Sobolewski (piotr_sobolewski(a)o2.pl) for the fix.

INSTALL

@@ -4,9 +4,7 @@ Ideally, you should be able to just type:
 make
 make install
 
-If you have questions, comments or problems feel free to email
-me (with detailed information on the platform you are running on
-and all the output from ./configure and make as well as config.log if 
-one was generated) --fyodor@insecure.org
+For far more in-depth compilation, installation, and removal notes,
+read the Nmap Install Guide at http://www.insecure.org/nmap/install/ .
 
 

Makefile.in

@@ -1,4 +1,4 @@
-export NMAP_VERSION = 3.96ALPHA1
+export NMAP_VERSION = 3.96BETA1
 NMAP_NAME= Nmap
 NMAP_URL= http://www.insecure.org/nmap/
 NMAP_PLATFORM=@host@

README-WIN32

@@ -1,112 +1,4 @@
-This file details the installation, compilation, and limitations of
-the Nmap Security Scanner for the Windows platform.  If you find bugs,
-you are strongly encouraged to report them to fyodor@insecure.org or
-nmap-dev@insecure.org .  Patches are very welcome too :).
+Details on installation, compilation, and limitation of the Nmap
+Security Scanner on the Windows platform is now available in the Nmap
+Installation Guide at http://www.insecure.org/nmap/install/ .
 
-I would like to thank the following people for doing much of the Win32
-porting work:
-
-Andy Lutomirski ( Luto@mailandnews.com )
-Ryan Permeh ( ryan@eEye.com ) from eEye Digital Security ( www.eeye.com )
-
-Nmap only exists for Win32 because of their hard work.
-
-*** Known Issues/Bugs ***
-
-o You cannot scan yourself (localhost).  This is a Windows/WinPcap
-   limitation which we haven't yet found a way to workaround.
-
-o RAS connections (eg PPP, SLIP, etc) are not supported except under
-   Windows 2000/XP.  This is a WinPcap limitation on NT and it isn't
-   supported (yet) on Win98.  Ethernet should work fine on all
-   platforms.
-
-o All interfaces (except localhost) should work under Windows 2000 as
-   administrator.  If you have trouble under Win2K, try the
-   --win_norawsock switch.
-
-o TCP connect() scan can be agonizingly slow.  You may be able to
-   improve this by applying the registry changes in the included
-   nmap_performance.reg (in nmap-VERSION/ in the Win binary
-   distribution, and nmap-VERSION/mswin32 in the source distro).
-   Apply it by double-clicking on the file, or run the command
-   "regedt32 nmap_performance.reg".  Or you can make the changes by
-   hand - add the following three registry DWORD values:
-   [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters]
-     "MaxUserPort", with a large value like 65534 (0x0000fffe).  See MS KB Q196271.
-     "TcpTimedWaitDelay" with the minimum value (0x0000001e). [See MS KB 149532]
-     "StrictTimeWaitSeqCheck" with a value of 1 (so TcpTimedWaitDelay is checked)
-
-o The NmapFE Nmap GUI frontend port is not yet stable enough to
-  include with the binary distribution.
-
-*** Using the Binary Distribution ***
-
-There are a couple binary distributions of Windows Nmap.  One is
-Winmap, which is packaged in an install-shield installation wizard and
-includes a graphical GUI as well as command-line Nmap.  The other
-distribution is the command-line zipfile, called
-nmap-VERSION-win32.zip .  The .zip version is usually much more
-up-to-date.  Here are the instructions for installing the zip
-archive:
-
-1) Make sure you have installed Winpcap Version 3.1-beta4 or later.
-   That version is critical as Nmap will crash if you have anything
-   older.  This is available at
-   http://netgroup-serv.polito.it/winpcap/ .  Winpcap is optional, but
-   recommended, under Windows 2000.
-
-2) Unzip the archive using Winzip or your favorite decompression
-   utility -- a directory call nmap-VERSION will be extracted .
-
-3) Consider applying the Nmap performance regisry changes discussed
-   above (double click on nmap_performance.reg).
-
-4) Open a command prompt (DOS) window and cd into the new nmap-VERSION
-   directory.  Type "nmap -h" for usage information.  
-
-*** Compiling the Nmap Source Distribution for Windows ***
-
-Note that the only compiler I have tested (since converting from
-MSVC++ 6) is Microsoft Visual Studio .Net 2003.  It may or may not
-work with previous (or later) compilers.  I'll accept nonintrusive
-patches that make it work with your compiler (without breaking
-mine).
-
-1) Decompress the archive ( nmap-VERSION.tgz ).  This is the same
-   tarball that is used for UNIX installations.
-
-2) Open Visual Studio and the Nmap Solution
-   (nmap-VERSION/mswin32/nmap.sln )
-
-3) Build Menu -> Configuration Manager -> set all to Release
-
-4) Build Menu -> Build Solution
-
-5) The executable can be found in
-   nmap-VERSION/mswin32/Release/nmap.exe .  Remember that you must
-   have Winpcap Version2.1-beta or later installed to run it (see
-   the Binary Distribution instructions above).
-
-*** Compiling NmapFE Front-end for Windows **
-
-[ Note -- this hasn't been tested lately and may not work.  Most
-  people have been using NmapWin instead ]
-
-1) Install the Windows versions of Glib, GDK, and GTK from
-   http://www.gimp.org/win32/ .  Copy the DLLs somewhere that they can
-   be found ( if you don't have a better place, try c:\winnt\system32
-   ).  Also copy the include and .lib files to places where your
-   compiler can find them ( add the dir to VC++ via Tools -> Options
-   -> Directories ).
-
-2) Use steps similar to the "compiling Nmap" list above to compile
-   NmapFE.  The Workspace is in nmap-VERSION/nmapfe/nmapfe.dsw .
-
-*** Final Worlds ***
-
-As mentioned earlier, patches, suggestions, and improvements are more
-than welcome!  Send them to nmap-dev@insecure.org or to me personally
-( fyodor@insecure.org ).
-
-$Id$