1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-08 05:31:31 +00:00
Commit Graph

118 Commits

Author SHA1 Message Date
david
7b9cc11e1e Undo r7283 (doAnyOutstandingRestransmits performance improvements) pending
further testing on Windows.
2008-05-03 05:42:16 +00:00
david
85c8ece184 Document some limitations of decoys in the source and in the reference
guide. They don't honor scan delay and may violate congestion control.

Both this things should be fixed. I was going to do it by having
get_next_target_probe just return the same probe multiple times, and
then either extend struct probespec to include a source address or have
sendIPScanProbe keep track of the decoy index and fill in source
addresses. But I was stopped by timing pings. Those should certainly be
decoyed, but in the code they are just sent as they are needed, and
don't have a dispatching function to modify. What would be good is a
global queue of probes waiting to be sent you could just insert all your
spoofed probes into, and then let the rest of the code take care of
scheduling them.
2008-05-02 20:38:27 +00:00
david
9c96ad1340 Merge from /nmap-exp/david/nmap-fixed-rate.
This change keeps a list of probes awaiting retransmit so that
doAnyOutstandingRetransmits doesn't have to search for them. At high
scan rates this function could take 100 ms or more. Now I have measured
it to take 2 ms or less.

The variable num_probes_waiting_retransmit has been renamed
num_probes_timed_out to better explain its purpose. This list of probes
that can be retransmitted immediately is called
probes_waiting_retransmits, but not all timed-out probes can be
retransmitted immediately. I've done my best to explain the distinction
in comments.

I thought long and hard about how to address this issue, and this is
what I decided on. But of course, every little optimization brings some
complexity and the chance of making a mistake. I'd appreciate someone
taking a look at this change.
2008-05-02 05:42:55 +00:00
david
7f2e704795 Reduce the maximum number of sockets from max_sd() - 4 to max_sd() - 5. I've
foudn that five files can be open on Mac OS X: stdin, stdout, stderr, /dev/tty,
and /private/var/run/utmpx. This could cause a non-root scan at a high scan
rateto fail with the message "Too many open files". I was able to cause this
with "nmap --min-rate 5000 localhost -p-".

That command still fails with the same error message, but for an entirely
different reason. After a while, one of the connect calls fails with an errno of
22 = EINVAL, Invalid argument. Whatever this means, the socket doesn't get
closed, Nmap just reports a "Strange error from connect". The socket is still
open but Nmap doesn't include it in its count of open sockets, so it's off by
one (or more, conceivably). This allows it to try to open one too many sockets
and bomb with an error message.

Note that running as non-root is important both because it uses a connect scan
and because non-root users have a lower limit on open files.

I've tried just closing the socket when EINVAL is returned, and that fixes the
problem. But that's likely to differ on different systems. Plus I don't know why
EINVAL is returned; maybe it's an OS bug. This only affects localhost scans and
only at high scan rates, so I'm leaving it alone.
2008-04-10 01:51:05 +00:00
david
9c60ac5741 Move the check for a host being timed out or completed to before the check for a minimum rate in HostScanStats::sendOK. We don't want to tell a host that has nothing to send to send something. 2008-04-09 23:09:21 +00:00
fyodor
5551c5a311 o Fixed a bunch of code to avoid compilation warning messages (at
least on some Linux machines) [Andrew J. Bennieston]
2008-04-09 02:11:20 +00:00
fyodor
f2ebfdecba o Fixed a bug on Win32 problem which caused an infinite loop when Nmap
encountered certain broadcast addresses. [Dudi Itzhakov]
2008-04-09 00:07:20 +00:00
david
22dbdd4a3b Make a new method HostScanStats::probes_outstanding_empty to avoid a couple of possible traversals of probes_outstanding. 2008-03-31 15:14:34 +00:00
david
6aa96dd816 Change a call to probes_outstanding.size to one to num_probes_outstanding for consistency. 2008-03-31 14:39:34 +00:00
david
5cba09a883 Make the display of sending rates dependent on -d. 2008-03-26 02:47:42 +00:00
david
feab94ebd3 Merge the minimum-rate scanning feature (--min-rate) from
/nmap-exp/david/nmap-fixed-rate.
2008-03-26 02:41:32 +00:00
kris
dd220398b1 Remove struct connectsockinfo{} from global_structures.h as it's unneeded now. It was initialized in pos_scan, but connect scanning is now handled by ultra_scan. 2008-03-26 02:15:53 +00:00
fyodor
1accc12fb2 fix typo in legal header found by Leigh Zhao (missing word: of) 2008-02-28 18:52:06 +00:00
fyodor
29c912f394 URL change from http://insecure.org/nmap/* to http://nmap.org/* 2008-01-17 07:22:03 +00:00
kris
1a5657511f adding IPv6 support to RPC scan 2008-01-15 00:50:26 +00:00
fyodor
8220c8a42f update copyright line at the top of files from 1996-2006 to 1996-2008 2007-12-22 06:32:03 +00:00
fyodor
09512ff092 o Fix a bunch of warning/error messages which contained an extra
newline.  Thanks to Brandon Enright for the patch.
2007-12-21 03:38:04 +00:00
kris
eb93c53b8b Fixing a bug in host reason reporting: "unknown-reason" was given when a host was found to be down due to no response. Now it's correctly reported as "no-response" 2007-12-08 03:57:28 +00:00
kris
3bb4599edd Fixing another possible negative array index, this time during Bounce Scan. Found with Coverity, CID 12. 2007-11-16 02:03:13 +00:00
kris
03cbee6850 Fixing an assertion failure caused when running an ARP Ping scan. A Global Ping was attempted, but ARP wasn't checked for in sendPingProbe() 2007-11-04 19:33:58 +00:00
kris
7ac1b98cb4 Of course, after I commit the big patch I find a possible bug :) In case we can't findHost() on a packet received doing the IPProto Ping 2007-10-28 00:30:19 +00:00
kris
1b1fcc753b Adding a new ping type: IPProto Ping. It's used with '-PO'. I've changed references to -P0 (zero) to -PN throughout the source code and refguide.xml 2007-10-28 00:05:03 +00:00
kris
51c7cdb4c9 Fixing reason code based on ICMP response (during host discovery) 2007-10-24 18:31:51 +00:00
kris
dfc9eba4db enable --ttl support for connect() scans 2007-10-14 14:37:56 +00:00
david
515d45ab9d Reduce the congestion control increment cap back to 50. 50 seems to be good
enough for host discovery, and 100 doesn't give much benefit because the probe
timeouts increase to slow the scan down. While it's faster in some cases, it
also increases the variance in scan times. For more analysis see
http://www.bamsoftware.com/wiki/Nmap/PerformanceGraphs#timeouts.
2007-10-02 19:35:34 +00:00
david
6306350106 Try doubling perf->cc_scale_max to 100. 2007-10-02 07:30:25 +00:00
david
0f396a5b3a Merge from /nmap-exp/david/nmap-massping-migration. This is the change that
scales per-host congestion control increments in the same way those for the
group already are. This speeds scanning in some cases (particularly with few
hosts, when the group congestion control is not the limiting factor). I'm going
to experiment with raising the increment cap to allow this to have more of an
effect.

Scale host congestion control variables similarly to the way group congestion
control is scaled. For the rationale see
http://www.bamsoftware.com/wiki/Nmap/PerformanceGraphs#host-scaled.

Host cc_scale should use (numprobes_sent + numpings_sent), not (numprobes_sent + numprobes_sent).
2007-10-02 06:58:12 +00:00
kris
48dec59470 just fixing some typos in some comments and an error string 2007-09-19 19:43:23 +00:00
david
e75780b503 Increase some debugging thresholds to make them more like they used to be. This means that -d3 is needed for making graphs now. 2007-09-18 06:43:22 +00:00
david
2d91914394 Remove the packet_ratio debugging output. 2007-09-18 06:35:38 +00:00
david
eddc2b0839 Merge r5733:5850 from /nmap-exp/david/nmap-massping-migration.
Remove special-purpose log functions for graphing congestion control and other t
hings. There's enough information provided by -d3.

Update the congestion control graph program and add a program for graphing probe
s and drops.

Increase the initial ccthresh from 50 to 75.

Change how much the congestion threshold drops on packet drops.

Print group timing stats with -d2 and individual host timing stats with -d3.

Bump up the cc-graph.sh y axis limit to 80.

Put graphs in the same directory as their log file.

Go ahead and adjust timing for ICMP destination unreachables. I'm going to commi
t and experimental change to the congestion control that doesn't rely on this an
y more.

Scale group congestion control increments by the inverse of the packet
receipt ratio. This gives great performance without ignoring ICMP
destintation unreachable drops. This may be the breakthrough we've been
looking for.
I'll probably send a message about this later today. For information and        
graphs right now, see
http://www.bamsoftware.com/wiki/Nmap/ResponseRateScaledCongestionControl.
Sorry it's only in my nmap-massping-migration branch for now, but please
give it a try.

Only -d2 is now needed for cc-graph.sh.

Put a cap of 50 on the cwnd scaling factor.

Fix up the order of things in the packet_ratio debugging output.

Move the packet_ratio debugging output to printAnyStats and rearrange the order 
in which things are printed.

Put a header with the scan args at the top of the probes-graph.sh data files.

Add a function pcap_print_stats that shows the number of received and dropped pa
ckets for a descriptor.

Call pcap_print_stats after a run of ultra_scan.

Increase the congestion window less aggressively than before with -T4 and -T5 (s
till more aggressivly than with lesser timing values).
2007-09-18 06:34:33 +00:00
david
f5337b670c Re-commit r5835 without the whitespace changes. 2007-09-17 20:49:09 +00:00
david
144ed4dfb4 Back out r5835, the fix for TCP connect scans on Windows. I didn't realize
until now that Visual C++ made a bunch of whitespace changes in an otherwise
small diff. I'll re-commit the changes in a moment without the whitespace
changes.
2007-09-17 20:47:51 +00:00
david
3f8f42d9d1 Fix TCP connect scans on Windows. Previously, one iterator was used to traverse both the incomplete and completed hosts lists, and Visual C++ didn't like that. Now there are separate iterators for each list. 2007-09-14 19:28:41 +00:00
david
1b41c049fc Merge r5771:5778 from /nmap-exp/david/nmap-massping-migration.
Print group timing stats with -d2 and individual host timing stats with -d3.

Change how much the congestion threshold drops on packet drops.

Increase the initial ccthresh from 50 to 75.
2007-09-05 04:57:36 +00:00
david
9c3ca90f1b Merge r5775 from /nmap-exp/david/nmap-massping-migration.
Print group timing stats with -d2 and individual host timing stats with -d3.
2007-09-04 21:38:44 +00:00
david
0e56b11fc8 Add a timestamp to the timing stats that are printed with -d3 to facilitate making graphs. 2007-09-04 21:10:48 +00:00
fyodor
4dc8618965 capitalization changes 2007-09-03 02:55:01 +00:00
david
cde0b41cc0 Merge r5744 from /nmap-exp/david/nmap-massping-migration.
Add a handler for EACCES on initial connect.
2007-08-31 05:02:25 +00:00
david
695b1a3a2d Merge r5728:5733 from /nmap-exp/david/nmap-massping-migration.
Increase PING_GROUP_SZ to 4096.                                                 

Remove a broken test for wierd_responses (subnet broadcast addresses) and write a note that a working test is needed.
2007-08-30 06:30:29 +00:00
david
c0c4ab055f Remove the real-time "appears to be up" message. I realized I shouldn't have
made such a big UI change with no discussion. Anyway, the message should have
gone within the ((hss->target->flags & HOST_UP) == 0) block so that the message
is printed only once per target.
2007-08-30 03:36:56 +00:00
david
b005b9dea7 Make the "Moving to completed hosts list" message require o.debugging > 1. This was somehow missed in the merge. 2007-08-30 03:24:52 +00:00
david
1c9700464b Merge r5711:5724 from /nmap-exp/david/nmap-massping-migration.
Show up hosts in real time in verbose mode, like what's done with open ports.   
                                                                                
Make some debugging messages less visible.
2007-08-30 02:42:25 +00:00
kris
3b0b8af098 Changing some snprintf()s from the massping migration to Snprintf()s 2007-08-29 20:33:33 +00:00
david
a4dcf90911 Merge r5693:5712 from /nmap-exp/david/nmap-massping-migration.
Always update srtt, rttvar, and timeout for every response, even if we don't adjust congestion control or send delay variables.

Be more careful about checking gstats->sendOK when sending retransmits.
Previously, it was only checked once per traversal of the incomplete
hosts list, which meant that enough probes could be sent in a round to
exceed the congestion window. Explanatory pictures are at
http://www.bamsoftware.com/wiki/Nmap/PerformanceGraphs#retransmit-sendOK.

This needs some more testing to see what effect it has on scan times. My
instinct says it will slow them down, because retransmits will be sent
no faster than before, and retransmits will be more likely to be
responded to, leading to more drops. On the other hand, correctly
detecting a drop and marking a host up is better than blasting
retransmits faster than they can be responded to.
2007-08-29 05:54:29 +00:00
kris
a2cbf0cef4 Fixing a syntax problem (from the massping migration). 'and' was used instead of '&&' in scan_engine.cc, and failed on Windows. 2007-08-28 21:37:52 +00:00
david
433917fc46 Tidy up the message that we're moving a host to the completed list a bit. This is good for release now. 2007-08-28 00:28:24 +00:00
david
bf7f48ebf7 Remove debugging from the default DBGFLAGS and remove some debugging messages. 2007-08-28 00:16:38 +00:00
david
302547375b Look out, world, here comes the Nmap massping migration!
This is the merging of the code that was previously in
/nmap-exp/david/nmap-massping-migration. These are all the big changes
that get rid of massping in favor of doing host discovery using
ultra_scan.

For now, there is a toggle that turns these new changes off. Undefine
NEW_MASSPING in targets.cc to go back to the old code. All of that will
be deleted eventually.

There are likely a few more changes that will be made to this system in
the near future. Those will be made in
/nmap-exp/david/nmap-massping-migration and merged back.

Don't release this just yet, because I'm going to make a few more
commits real quick to remove some debugging stuff.

(Note to self: this merge back was from r5693 in
/nmap-exp/david/nmap-massping-migration.)
2007-08-27 23:58:23 +00:00
kris
d073a19105 Change reason.cc/h to portreasons.cc/h. This is because of a reason.h on Windows which causes compilation problems. A workaround was employed, but this is incase it pops up again. I also changed the recent CHANGELOG entry mentioning reason.h so there's no confusion 2007-08-15 19:26:26 +00:00