1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

90 Commits

Author SHA1 Message Date
david
898c2a41a0 Clean up some ScanProgressMeter code to reduce code duplication and avoid
overflows by doing math with doubles. Based on a patch by Henri Doreau.
2009-02-11 17:50:19 +00:00
david
c2bedcf99a Fix a test against a struct timeval in ScanProgressMeter::printStatsIfNecessary.
The test was (last_print.tv_sec < 0), which is never true. I changed it to
last_print.tv_sec == 0, which checks if the last_print structure has been given
a value yet. This little bug appears not to have mattered much, because in the
else branch of the if, other calculations with an uninitialized last_est struct
seem to have resulted in a true value anyway.
2009-02-11 17:36:11 +00:00
david
6ad92e7983 Fix a small harmless typo in timing.cc. 2009-02-11 16:27:26 +00:00
david
fda214ed63 Make sure now has a value before assigning it to last_print in
ScanProgressMeter::printStats. I messed this up in r11985. Brandon reported the
problem.
2009-02-06 04:49:45 +00:00
david
02869fd83a Reintroduce the time_t local in ScanProgressMeter::printStats; it's needed for
Windows compilation.
2009-02-05 01:32:26 +00:00
david
29460cd95d Simplify and shorten the ScanProgressMeter::printStats code. 2009-02-05 00:25:25 +00:00
david
b369fd3c5b Add a patch from Henri Doreau that fixes an integer overflow in
ScanProgressMeter.
2009-02-04 23:24:49 +00:00
david
90ba6b97d0 Merge from /nmap-exp/david/nmap-perf. A summary of changes:
Don't make a host the global ping host until it moves to the completed
hosts list, and only change the global ping probe if the new probe is no
worse than the old (according to pingprobe_is_better).

Restore the ping magnifier for host congestion window updates.

Ignore the timing of certain ICMP errors that are likely to be rate
limited and don't change the port or host state. Avoid making timing
pings out of probes that elicit such errors. This used to be done only
for port scans and only at -T4 and above (and didn't prohibit the
creation of timing pings). Now it is done for host discovery too, and at
all timing levels.

Gracefully handle updates from the recent past in RateMeter. Doesn't
affect performance, but avoids a rare assertion failure.
2009-01-08 22:54:07 +00:00
david
9fe196bb0b o Fixed a division by zero error in the packet rate measuring code
that could cause a display of infinity packets per seconds near the
  start of a scan. [Jah]
2008-12-17 02:48:14 +00:00
david
c561222685 Fix spelling in some identifiers. wierd_responses -> weird_responses,
printStatsIfNeccessary -> printStatsIfNecessary.
2008-12-04 17:04:48 +00:00
david
4df1143f2b Fix a diagnostic format string. It was printing a signed long as if it were
unsigned. I got
adjust_timeouts2: packet supposedly had rtt of 18446744073707362535 microseconds.  Ignoring time.
on a 64-bit machine. (18446744073707362535 is 2 ** 64 - 2189081.)
2008-11-07 01:47:33 +00:00
fyodor
d16e94534f Removed a comment which simply declared /* WANKER ALERT! */ for no good reason. 2008-09-26 06:41:05 +00:00
david
debfc5f683 Change RateMeter to be more general, measuring just one quantity. Add a
PacketRateMeter specialized for measuring packet and byte rates, and use that
in scan_engine.cc.
2008-08-16 01:05:11 +00:00
fyodor
338a19ba4f updated to allow RateMeter::update to accept time decreases up to 5ms rather than a 1ms limit, as I just had a crash where now=1217210189.144224; last_update_tv=1217210189.148486. I still think this may be a bug in my SMP Linux kernel. But if it affects me, probably affects others. 2008-07-28 03:34:19 +00:00
david
625d88293e Avoid showing the sending rate in bytes per second if no sent bytes have been
recorded. This applies during a TCP connect scan, where we have a count of
packets sent but not of bytes (which we cannot measure, and will vary from
platform to platform).
2008-07-23 22:21:37 +00:00
fyodor
a1c363b84a RateMeter::update() used to abort if the new time was earlier than the old time. But on my SMP Linux 2.6.20 system, I've been doing large-scale scanning and I'm getting very occasional values like "now=1214173867.8027; last_update_tv=1214173867.8065". Unless I'm missing something, I think my gettimeofday may have decreased by 38 microseconds. Perhaps due to SMP and the old kernel. Anyway, I changed it so that decreases of up to 1 millisecond just give a warning (one-time) rather than abort Nmap. 2008-06-23 00:56:49 +00:00
fyodor
726febac7c add extra debugging information to an error case -- trying to track down a host discovery crash (abort) 2008-06-22 21:20:10 +00:00
fyodor
779b96a197 trivial copyright text tweak: filename nmap-os-fingerprints has changed to nmap-os-db 2008-05-22 20:45:32 +00:00
fyodor
10b54b773b minor license template updates from Kris--fix gnu.org link to GPLv2 (moved) and openssl license filename (COPYING.OpenSSL) 2008-05-05 04:10:00 +00:00
david
6982bacef5 Change a variable name and space out RateMeter::update to make it easier to understand. 2008-04-24 20:32:47 +00:00
david
5a8e417c0c Rewrite some RateMeter code to avoid an integer overflow reported by Kris. 2008-04-24 18:44:02 +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
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
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
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
6c06f51bd7 merge soc07 r5100 - Changing fprintf(stderr, )'s to error()'s (or fatal() if followed by and exit()). Besides providing consistency, this also allows more errors to actually be logged with --log-errors. 2007-08-11 05:16:56 +00:00
fyodor
8dc9673928 merge soc07 r5085 - Changing bare printf()s to log_write(LOG_PLAIN,)s because these were always printed even when things like XML and greppable output were sent to stdout (e.g. -oX -). This also adds o.scriptTrace() to make --script-trace behave more like --packet-trace and --version-trace. Nsock tracing was done unconditionally in NSE, and that has been changed to only be done when o.scriptTrace() is true. 2007-08-11 05:13:16 +00:00
fyodor
f0e99644a7 merge soc07 r5077:5080 - Adding 'extrainfo' in the taskbegin/taskend XML elements for the SPM additional info 2007-08-11 05:11:08 +00:00
fyodor
8d74bbcd8a merge soc07 r4871:4884 and r4888 - renaming __FUNCTION__ to __func__ and changing hardcoded func names to __func__ 2007-08-11 04:06:09 +00:00
fyodor
58522c59f6 merge soc07 r4822 - Reduce the number of build dependencies. 2007-08-11 03:35:46 +00:00
fyodor
b28d51167c Minor source code header improvements 2006-08-25 01:47:49 +00:00
fyodor
a403864351 Replace file headers, mostly to update copyright to 2006 2006-08-24 04:43:50 +00:00
fyodor
9c0af0a95b memory releasing patch from Marek 2006-07-04 23:04:56 +00:00
fyodor
30190d664a fixed a completion time estimate bug 2006-07-04 07:36:29 +00:00
fyodor
0f9cd6f73d Getting very darn close to Nmap 3.97Shmoo 2006-01-12 04:47:03 +00:00
fyodor
ccce12128f Just added Paul's status patch 2005-12-31 00:32:42 +00:00
fyodor
d187c68017 blah 2005-10-01 23:50:27 +00:00
fyodor
0595d89f96 misc changes, but crashing. ... about to figure out why 2005-07-09 07:52:18 +00:00
fyodor
26ce3d66f4 get rid of silly top-level trunk dir 2005-04-11 22:34:19 +00:00