1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 06:01:28 +00:00
Commit Graph

402 Commits

Author SHA1 Message Date
kris
9f979c6da8 use __func__, and fix space in output 2010-03-19 05:11:58 +00:00
kris
599bb361a4 Update ip_is_reserved(): I decided to go through the existing address checks
to verify their correctness and to check more than just the table in
ipv4-address-space.  Beyond comment changes and some code movement:

* 198.51.100.0/24 and 203.0.113.0/24 are reserved by RFC5737 (Jan 2010)
* Fix 198.18.0.0/15, which was implemented wrongly.  This goes back a while
and was handled somewhat like 198.18.0.0/18.
2010-03-13 01:31:11 +00:00
david
7d0fbfb4c2 Don't print output for hosts that don't have any open ports when --open
is used. See discussion at http://seclists.org/nmap-dev/2010/q1/837.

In this patch, all output formats are treated the same. So if a host
isn't shown in normal output, it's not shown in XML output either.
2010-03-12 22:15:22 +00:00
david
5318dd3c58 Only write host elements for down hosts to XML in verbose mode. This
makes it consistent with other output formats.
2010-03-12 21:20:05 +00:00
david
48654df805 Switch to -sn and -Pn as the new preferred synonyms for -sP and -P0.
This establishes a more regular syntax for some options that disable
phases of a scan:
	-n  no reverse DNS
	-Pn no host discovery
	-sn no port scan
Also, the -sP was possibly misleading because the 'P' suggests "ping
scan," when you can now do more than just pinging when you disable port
scanning. For example, -sC -sn and -sn -Pn --traceroute make sense.
2010-03-11 01:16:06 +00:00
david
34bca6a73b Fix the printing of the warning
Warning: --min-parallelism and --max-parallelism are ignored with --scan-delay.
It was checking o.min_parallelism against -1, when its default value is
0.
2010-03-06 17:48:56 +00:00
david
39a80f1987 Make --resume work with the new "Nmap scan report " strings. It also
works when there was no reverse DNS resolution, which didn't work with
the old format. This patch is from vladz.
http://seclists.org/nmap-dev/2010/q1/770
2010-03-05 23:46:42 +00:00
david
82ead9256e Make some output changes suggested by greengreat. Mention the S: SCTP
port specifier. Mention -PY in the ping probe error output. Use the word
"protocol" instead of "port" in the error output for -PO.
2010-03-05 19:54:45 +00:00
david
49e36a57f3 Add a function free_services that tells Nmap to reload the nmap-services
file again when it needs it. This is called from nmap_free_mem, because
cp_free (also called by nmap_free_mem) invalidates members of the
services data structures.

In normal use this doesn't matter. It only matters when reinvoking the
engine several times with --interactive.
2010-02-26 22:29:03 +00:00
david
9632670762 o The -v and -d options are now handled in the same way. The three
forms are equivalent:
    -v -v -v    -vvv    -v3
    -d -d -d    -ddd    -d3
  Formerly, the -ddd and -v3 forms didn't work. Mak Kolybabi submitted
  a patch.
2010-02-17 19:12:15 +00:00
kris
fd7f981bc5 update ip_is_reserved() again: 050/8 and 107/8 allocated 2010-02-12 18:05:29 +00:00
kris
c9e68798c9 Updating ip_is_reserved(): 001/8 and 027/8 allocated 2010-01-25 01:52:37 +00:00
fyodor
1636f41ba9 Fix the description of --min/max parallelism in the help screen 2010-01-18 08:19:11 +00:00
fyodor
7d5ba70591 Provide Christmas greetings and a reminder of Xmas scan (-sX) when run on December 25 in verbose mode. 2009-12-24 21:32:06 +00:00
david
a06b900f00 Merge from /nmap-exp/david/nmap-mem. This reduces the memory usage of OS
scan by about 95%. (66832396 bytes to 2815061 bytes according to
Massif.)
2009-11-23 21:22:07 +00:00
david
300e038aa6 Print host timing information ("Final times for host" and the times
element in XML) even when doing only a ping scan. Don't print the
information if it was never set; i.e., we never measured an RTT to the
target.
2009-11-16 08:36:58 +00:00
david
ecb9aa0565 Print output for down hosts, even when doing scanning past a ping scan.
This always goes to XML and grepable output. It goes to normal in
interactive output in verbose mode. The format for printing a down host
is changed slightly:
Nmap scan report for 1.1.1.1 [host down]
2009-11-16 07:37:01 +00:00
david
0b715fd28c Fix some indentation. 2009-10-29 00:46:55 +00:00
david
030411ffd8 Don't repeat the host name and IP address in "Host is up/down" messages.
Don't print the "Nmap scan report" header if there's nothing to put
under it.
2009-10-27 05:26:40 +00:00
david
01f70c5432 Write an "Nmap scan report" heading before scan results. It includes the
reverse DNS if it differs from the forward hostname.
2009-10-26 19:09:56 +00:00
david
89019cb221 Split the load_exclude function into load_exclude_file and
load_exclude_string. Use read_host_from_file in load_exclude_file to
support comments like in -iL files.
2009-09-29 02:06:56 +00:00
david
0e2d5af0f9 Factor out the function that reads a host specification from an input
file.
2009-09-29 01:15:17 +00:00
david
a3df140563 Allow # comments in input files from -iL. The patch is from Tom Sellers. 2009-09-29 00:33:41 +00:00
david
adcbd54e19 Close the -iL input file after reading. 2009-09-28 23:15:55 +00:00
david
084ba69efe Remove special-case code for doing a traceroute without a port scan, and
just handle it in the normal program flow. A problem with having two
pieces of code doing the same thing was that they varied a bit; if you
ran -sP --traceroute you wouldn't get the "Final times for host" output
because that was left out of one of the output loops. Another problem
was that the special-case logic assumed that traceroute was the only
thing that could happen after a port scan, which is not true because
script scanning can happen too. Running -sP --traceroute --script=all
would not run any scripts. Now it run asn-query and whois as expected.
2009-09-28 20:34:23 +00:00
kris
0ab7d34c88 updating ip_is_reserved(): 02/8 and 46/8 allocated yesterday 2009-09-18 19:03:33 +00:00
david
577a1be0e7 Merge from svn://svn.insecure.org/nmap-exp/david/nmap-traceroute. This
brings in a new, faster, parallel version of traceroute.
2009-09-17 00:03:46 +00:00
david
ef52f26769 Don't delete each target after doing a ping-scan traceroute; a future
implementation will have records for one target refer to others. Delete
them all at once at the end instead as is done with other scan types.
2009-09-07 22:00:42 +00:00
bmenrigh
3bce03ad8d This commit adds a new routine to nbase_rnd.c that generates 32bit
numbers in a collision-free way for a full 2^32 cycle.  This allows
Nmap to generate random IPs with -iR that don't have duplicates.

See:
http://seclists.org/nmap-dev/2009/q3/0695.html

How this is done is documented in the code.
2009-09-02 02:03:22 +00:00
david
d6ea9ea18a Fix an array bound passed to GetModuleFileName. It should be the size of
our static buffer, not 1024.
2009-08-24 20:57:32 +00:00
david
41d053a1ed Fix a stupid bug I introduced: Use MAX and not MIN to give a minimum
size to the allocation of space for the --data-length.
2009-08-24 20:47:28 +00:00
david
fec2cc40d0 Allow doing --data-length 0. That's the documented way to turn off UDP
payloads.
2009-08-19 17:52:23 +00:00
david
ab09f1974f Adjust indentation and expand tabs in option parsing code. 2009-08-19 17:47:49 +00:00
fyodor
0df6272cf9 Signal handling fixes: fixed nbase configure to actually set HAVE_SIGNAL
properly so our signal handing code actually activates.  But our signal
handling code was a bit questionable in many respects, so I removed most
of it under the theory that it hasn't been working for years and nobody
seemed to notice/care, so we presumably don't really need it.  And if we
do decide to add it again, we basically will need to do it over because
we now want to do it safely from a reentrancy perspective.  In particular,
I removed sigdie() and reaper().  We still have a few signal() calls.  In
particular, we ignore SIGPIPE and we set SIGINT, SIGTERM, SIGHUP, and
SIGSEGV to the defaults (SIG_DFL) explicitly.  Thanks to Ithilgore, Luis,
and Solar Designer in particular for fidning or commenting on the issue.
2009-08-13 21:54:55 +00:00
josh
df71e36084 Updated uses of the ctype function to support explict casting of the arguments
to (int)(unsigned char).
2009-08-06 15:10:00 +00:00
kris
8b13026ef9 update ip_is_reserved(): 175/8 and 182/8 allocated this month 2009-08-03 19:35:16 +00:00
david
d6c9e19a2c Add -Pn and -sn synonyms for -PN and -sP respectively. 2009-07-19 05:13:07 +00:00
batrick
59b2c83234 If neither --script nor -sV is present, then do not load NSE. Before, NSE
would load despite script scanning not being activated. See [1] for
preliminary patch from Solar Designer and motivation.

[1] http://seclists.org/nmap-dev/2009/q3/0207.html
2009-07-18 14:56:07 +00:00
david
5c33e639ae Using --scan-delay always implies a parallelism of 1. Change the fatal
error

You can't use --max-parallelism with --scan-delay.
QUITTING!

to a warning

Warning: --min-parallelism and --max-parallelism are ignored with --scan-delay.
2009-07-17 20:06:05 +00:00
david
d8925b3c11 Rename the o.pingscan variable to o.noportscan to reflect its true
purpose. Make o.listscan imply o.noportscan to simplify some conditions.
2009-07-17 01:02:57 +00:00
david
e9d8897cde Use strtol, not strtoll, for Windows compatibility. 2009-07-08 21:46:11 +00:00
luis
98aedb8d1c Fixed a bug in --data-length parsing. User input was not being checked and in some cases that resulted in useless buffer allocations and unpredictable payload lengths. Check http://seclists.org/nmap-dev/2009/q2/0763.html for a complete description of the problem. 2009-07-04 21:15:13 +00:00
fyodor
2a5750baef Apply 1-line fix from Jah which now properly counts traceroute ping scan IPs (previously it would say things like 'WARNING: No targets were specified, so 0 hosts scanned.' and 'Nmap done: 0 IP addresses (1 host up) scanned' 2009-06-10 01:56:46 +00:00
josh
0b078f4af6 Rewrote the port list merge code in validate_scan_lists to be moremaintainable. 2009-06-06 04:33:35 +00:00
josh
8e9c6a0e1f Fixed a bug with in validate_scan_lists where realloc was not called with
sufficient size.
2009-06-06 02:18:18 +00:00
josh
07011cbb99 Made a change to validate_scan_lists to combine port lists when -PA and -PS are
called together when nmap is running as nonroot or using IPv6.
2009-06-06 00:04:31 +00:00
daniel
50830f7488 o Added initial SCTP port scanning support to Nmap. SCTP is
a layer 4 protocol used mostly for telephony related applications.
  This brings the following new features:
  o SCTP INIT chunk port scan (-sY): open ports return an INIT-ACK
    chunk, closed ones an ABORT chunk.  This is the SCTP equivalent
    of a TCP SYN stealth scan.
  o SCTP COOKIE-ECHO chunk port scan (-sZ): open ports are silent,
    closed ports return an ABORT chunk.
  o SCTP INIT chunk ping probes (-PY): host discovery using SCTP
    INIT chunk packets.
  o SCTP-specific IP protocol scan (-sO -p sctp).
  o SCTP-specific traceroute support (--traceroute).
  o The ability to use the deprecated Adler32 algorithm as specified
    in RFC 2960 instead of CRC32C from RFC 4960 (--adler32).
  o 42 well-known SCTP ports were added to the nmap-services file.
  Part of the work on SCTP support was kindly sponsored by
  Compass Security AG, Switzerland.  [Daniel Roethlisberger]
2009-06-03 23:15:45 +00:00
jah
99c4008c03 Disable traceroute when -6 is requested. Before this, it was possible to reach
traceroute() with IPv6 targets if a ping scan was requested.
2009-06-03 21:39:53 +00:00
david
1538e21724 There is a new default ping probe set: -PE -PS443 -PA80 -PP. In
exhaustive testing of 90 different probes, this one emerged as the
best four-probe combination, finding 14% more Internet hosts than
the previous default, -PE -PA80. The default for nonroot users is
-PS80,443, replacing the previous default of -PS80. In addition,
ping probes are now sent in order of effectiveness (-PE first) so
that less likely probes may not have to be sent.
2009-05-27 18:21:28 +00:00
david
d4eafba473 Fix a compiler warning. 2009-05-04 23:25:46 +00:00