1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 14:11:29 +00:00
Commit Graph

287 Commits

Author SHA1 Message Date
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
david
5c222c6965 Also increment o.numhosts_scanned during ping and list scan. 2009-05-04 23:23:50 +00:00
david
fac82a011b Only increment o.numhosts_scanned when we have truly finished scanning a
host, which means that it is either found down or else all
port/script/traceroute/etc. scanning is finished. In r12798 I made it be
updated as soon as DNS resolution happened, to make the status display
"X undergoing Ping Scan" accurate. However the main loop also uses this
variable to count how many addresses have been generated so it knows
when to stop scanning random addresses. If -iR was used, only the first
hostgroup out of all the random addresses would be fully scanned and
then the scan would end. This change fixes that and also makes the
output more like it was pre-r12798; for example, if you had done name
resolution on 1024 hosts with --max-hostgroup 8, and had found the 8th
up host at the 280th one pinged, the output was
Stats: 0:00:29 elapsed; 1016 hosts completed (8 up), 8 undergoing Connect Scan
and is now
Stats: 0:00:29 elapsed; 272 hosts completed (8 up), 8 undergoing Connect Scan
2009-05-04 22:59:35 +00:00
david
7a84920e63 Put some conditions like o.idlescan and o.bouncescan outside of the
loops that iterate over targets, not inside them. That prevents having
to iterate over every target doing nothing in the common case when those
scan types aren't used.
2009-05-01 20:51:52 +00:00
kris
318688acd5 updating ip_is_reserved(): 180/8 and 183/8 allocated 2009-04-29 19:20:42 +00:00
david
edde5c5686 Add a missing newline to the "Fetchfile" message. 2009-04-18 16:36:59 +00:00
fyodor
d0e21e1d03 Suggest that people send patches to nmap-dev rather than to me directly 2009-04-15 00:37:03 +00:00
bmenrigh
b38b5f6270 Changed a few error() calls to log_write(). Removed the (redundant)
"\n" from a few error() calls.  Changed a few f?printf() calls to
error() or log_write().

Most notably, I didn't change any of the --interactive printf()s or
the usage printf() call.

I think we should draw up some internal notes on when to use
LOG_STDOUT versus LOG_PLAIN versus all the other LOG_* options.
2009-04-07 23:10:51 +00:00
batrick
37bbb40520 Merge of nse-lua (nse-lua-merge) minus most enchancements that were
not directly related to the change from C++ to Lua for the NSE main
procedures.

The changes are discussed in the nse-lua thread here:
http://seclists.org/nmap-dev/2009/q1/0047.html
2009-04-05 06:01:27 +00:00
david
7872aafa5d Update the global o.numhosts_scanning variable within ultra_scan, so
that it is set properly for ping scan. Previously status reports during
ping scan always looked like

Stats: 25:34:33 elapsed; 991232 hosts completed (72530 up), 0 undergoing Ping Scan

Note the "0 undergoing". Now that number will be set to 4096 or whatever
the current ping scan group size happens to be.
2009-03-31 18:29:52 +00:00
fyodor
eccc235d5a Increase copyright year to 2009, simplify/reword some derivative works text, and remove a confusing clause about selling proprietary front-ends to Nmap 2009-03-31 04:16:12 +00:00
fyodor
7fca42a74c Add link to the man page to the usage text. Windows users generally don't have the man command and often don't even know what a man page is. 2009-03-27 19:18:46 +00:00
kris
56d83f74a2 Don't call the meaningless gettoppts if we're doing a ping or list scan. This
keeps the following debugging line from being printed in these modes:

	PORTS: Using top 1000 ports found open (TCP:0, UDP:0)

This also speeds these up because it doesn't necessarily have to read and parse
nmap-services.  Going from 0.25s to 0.04s for listing a /24 sounds good to me :)
2009-03-05 22:13:11 +00:00
david
486ff13e3a Add the --stats-every option. See http://seclists.org/nmap-dev/2009/q1/0404.html. 2009-02-24 00:23:54 +00:00
david
fb0f1cdd93 Remove an unnecessary call to keyWasPressed right before service_scan;
service_scan does that itself.
2009-02-14 16:25:46 +00:00
kris
3348faca3a update ip_is_reserved(): 109/8 and 178/8 allocated 2009-02-02 18:02:41 +00:00