From 0d0a61b5b8fb47432dfdcc3941353ef7d139d850 Mon Sep 17 00:00:00 2001 From: fyodor Date: Mon, 30 Jan 2006 07:30:56 +0000 Subject: [PATCH] Nmap 4.00 --- CHANGELOG | 6 ++++++ Makefile.in | 2 +- docs/nmap.1 | 15 +++++---------- docs/nmap.usage.txt | 2 +- nmap-os-fingerprints | 34 +++++++++++++++++----------------- nmap_winconfig.h | 2 +- tty.cc | 9 +++++++++ 7 files changed, 40 insertions(+), 30 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 878c4097c..de545d34d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,10 @@ # Nmap Changelog ($Id$); -*-text-*- +4.00 + +o Added the '?' command to the runtime interaction system. It prints a + list of accepted commands. Thanks to Andrew Lutomirski + (luto(a)myrealbox.com) for the patch. + 3.9999 o Generated a new libpcre/configure to cope with changes in LibPCRE diff --git a/Makefile.in b/Makefile.in index 6f6be272b..7312118c1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -export NMAP_VERSION = 3.9999 +export NMAP_VERSION = 4.00 NMAP_NAME= Nmap NMAP_URL= http://www.insecure.org/nmap/ NMAP_PLATFORM=@host@ diff --git a/docs/nmap.1 b/docs/nmap.1 index 0dab44d05..eed598aed 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" "01/26/2006" "" "Nmap Reference Guide" +.TH "NMAP" "1" "01/29/2006" "" "Nmap Reference Guide" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -1246,20 +1246,12 @@ Prints the Nmap version number and exits. \fB\-h\fR; \fB\-\-help\fR (Print help summary page) Prints a short help screen with the most common command flags. Running Nmap without any arguments does the same thing. .SH "RUNTIME INTERACTION" -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -\fBNote\fR -.PP -The runtime interaction feature is not yet supported on Windows. .PP During the execution of nmap, all key presses are captured. This allows you to interact with the program without aborting and restarting it. Certain special keys will change options, while any other keys will print out a status message telling you about the scan. The convention is that \fIlowercase letters increase\fR the amount of printing, and \fIuppercase letters decrease\fR -the printing. +the printing. You may also press \(oq\fI?\fR\(cq for .TP \fBv\fR / \fBV\fR Increase / Decrease the Verbosity @@ -1270,6 +1262,9 @@ Increase / Decrease the Debugging Level \fBp\fR / \fBP\fR Turn on / off Packet Tracing .TP +\fB?\fR +Print a runtime interaction help screen +.TP Anything else Print out a status message like this: .sp diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index 0245f2a9d..b7a166df7 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 3.999 ( http://www.insecure.org/nmap/ ) +Nmap 4.00 ( 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/nmap-os-fingerprints b/nmap-os-fingerprints index 81a36fbff..308f994fb 100644 --- a/nmap-os-fingerprints +++ b/nmap-os-fingerprints @@ -1256,23 +1256,6 @@ T6(DF=N%W=0%ACK=O%Flags=R%Ops=) T7(DF=N%W=0%ACK=S%Flags=AR%Ops=) PU(DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=0%ULEN=134%DAT=E) -# Apple Mac OS X 10.4.0 (Tiger) - Darwin Kernel Version 8.0.0 -# Apple Macintosh PowerBook G4 15" Titanium, Mac OS X 10.4.0 (Tiger) build 8A428 -# Mac OS X 10.4 Darwin 8.0.0 Darwin Kernel Version 8.0.0: Sat Mar 26 14:15:22 PST 2005; -# Fingerprint Apple Mac OS X 10.4.0 Build 8a428 Darwin Kernel Version 8.0.0. Power Macintosh powerpc Hardware is PB G4 -# Darwin 8.1.0 Kernel Version 8.1.0 (Apple Mac OS 10.4.1 Tiger) -Fingerprint Apple Mac OS X 10.4.0 - 10.4.1 (Tiger) -Class Apple | Mac OS X | 10.3.X | general purpose -TSeq(Class=TR%gcd=<6%IPID=I%TS=2HZ) -T1(DF=Y%W=FFFF%ACK=S++%Flags=AS%Ops=MNWNNT) -T2(Resp=N) -T3(Resp=N) -T4(DF=N%W=0%ACK=O%Flags=R%Ops=) -T5(DF=N%W=0%ACK=S++%Flags=AR%Ops=) -T6(DF=N%W=0%ACK=O%Flags=R%Ops=) -T7(DF=N%W=0%ACK=S%Flags=AR%Ops=) -PU(DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=0%UCK=0%ULEN=134%DAT=E) - Fingerprint Apple Mac OS X 10.4.1 (Tiger) Class Apple | Mac OS X | 10.3.X | general purpose TSeq(Class=TR%gcd=<6%IPID=I%TS=2HZ) @@ -1299,6 +1282,23 @@ T6(DF=Y%W=0%ACK=O%Flags=R%Ops=) T7(DF=Y%W=0%ACK=S++%Flags=AR%Ops=) PU(DF=N%TOS=C0%IPLEN=164%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E) +# Apple Mac OS X 10.4.0 (Tiger) - Darwin Kernel Version 8.0.0 +# Apple Macintosh PowerBook G4 15" Titanium, Mac OS X 10.4.0 (Tiger) build 8A428 +# Mac OS X 10.4 Darwin 8.0.0 Darwin Kernel Version 8.0.0: Sat Mar 26 14:15:22 PST 2005; +# Fingerprint Apple Mac OS X 10.4.0 Build 8a428 Darwin Kernel Version 8.0.0. Power Macintosh powerpc Hardware is PB G4 +# Darwin 8.1.0 Kernel Version 8.1.0 (Apple Mac OS 10.4.1 Tiger) +Fingerprint Apple Mac OS X 10.4.0 - 10.4.4 (Tiger) +Class Apple | Mac OS X | 10.4.X | general purpose +TSeq(Class=TR%gcd=<6%IPID=I%TS=2HZ) +T1(DF=Y%W=FFFF%ACK=S++%Flags=AS%Ops=MNWNNT) +T2(Resp=N) +T3(Resp=N) +T4(DF=N%W=0%ACK=O%Flags=R%Ops=) +T5(DF=N%W=0%ACK=S++%Flags=AR%Ops=) +T6(DF=N%W=0%ACK=O%Flags=R%Ops=) +T7(DF=N%W=0%ACK=S%Flags=AR%Ops=) +PU(DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=0%UCK=0%ULEN=134%DAT=E) + Fingerprint Apple Mac OS 7.0-7.1 With MacTCP 1.1.1 - 2.0.6 Class Apple | Mac OS | 7.X | general purpose TSeq(Class=C|TD) diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 1986eb4eb..7cb8ae636 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -104,7 +104,7 @@ #ifndef NMAP_WINCONFIG_H #define NMAP_WINCONFIG_H -#define NMAP_VERSION "3.9999" +#define NMAP_VERSION "4.00" #define NMAP_NAME "Nmap" #define NMAP_URL "http://www.insecure.org/nmap" #define NMAP_PLATFORM "i686-pc-windows-windows" diff --git a/tty.cc b/tty.cc index 93bcd68a8..6e3f19489 100644 --- a/tty.cc +++ b/tty.cc @@ -251,6 +251,15 @@ bool keyWasPressed() } else if (c == 'P') { o.setPacketTrace(false); log_write(LOG_STDOUT, "Packet Tracing disabled\n."); + } else if (c == '?') { + log_write(LOG_STDOUT, + "Interactive keyboard commands:\n" + "? Display this information\n" + "v/V Increase/decrease verbosity\n" + "d/D Increase/decrease debugging\n" + "p/P Enable/disable packet tracing\n" + "anything else Print status\n" + "More help: http://www.insecure.org/nmap/man/man-runtime-interaction.html\n"); } else { printStatusMessage(); return true;