kris
f68df9d91c
Okay, I'm sorry for committing for just a whitespace issue, but this confused the hell out of me because I completely missed that assignment :)
2007-08-29 22:28:22 +00:00
kris
46dc926888
adding --script_args (underscore cousin of --script-args)
2007-08-29 22:19:24 +00:00
kris
69e1ad6a70
Adding back my '-D rnd' from soc07 which I guess was lost in the move back here to /nmap
2007-08-28 01:04:41 +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
fyodor
8d0b39dadb
capitalize Lua
2007-08-27 03:18:56 +00:00
stoiko
4767dd8c70
script arguments now get checked before nmap starts scanning
2007-08-20 21:56:36 +00:00
fyodor
ed5de36e7f
make sure Nmap help output does not contain the XML CDATA termination string (] then ] then >)
2007-08-17 22:34:50 +00:00
stoiko
e765af4103
added --script-args to the usage-text (nmap.cc)
...
fixed to typos in error messages (nse_nsock.cc)
added a short description of --script-args to refguide.xml
2007-08-16 10:51:27 +00:00
kris
0b50c16b38
Adding Snprintf() and Vsnprintf() to nbase/nbase_str.c. This is because of Windows' stupid implementation where it doesn't write a NULL byte at the end of the buffer if the result is truncated. I would've just #defined snprintf and vsnprintf to some wrapper function for Windows, but this doesn't work as libdnet and libpcap (and libpcap includes under mswin32) define snprintf to _snprintf and vsnprintf to _vsnprintf like we do, and through the many defines they end up being available in the Nmap sources. Vsnprintf() uses vsnprintf() (and writes a NULL byte at the end if truncated), and Snprintf uses Vsnprintf().
2007-08-14 06:46:54 +00:00
fyodor
62d7e3ed87
merge soc07 r5317:5322 - NSE buffered receives and script arguments
2007-08-11 06:09:50 +00:00
fyodor
0dc44d08b0
merge soc07 r5283:5298 - updating ip_is_reserved(); add sys/types.h include so it compiles on OpenBSD
2007-08-11 06:05:07 +00:00
fyodor
03b4dc0ec5
merge soc07 r5233 - Changed perror()s with hardcoded function names to Nmap's gh_perror() and __func__, changed perror()s followed by exit()s to Nmap's pfatal(), and removed newlines from perror()s because it breaks the line after that and before the colon and error string, which doesn't make sense
2007-08-11 05:57:54 +00:00
fyodor
980dc9b1bb
merge soc07 r5226 - added a section describing briefly the NSE to the refguide.
2007-08-11 05:56:52 +00:00
fyodor
7b5f9f5dd5
merge soc07 r5100:5105 - Added traceroute to -A & updated docs
2007-08-11 05:20:08 +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
90a0087bb4
merge soc07 r5081 - changed close to 100 occurrences of LOG_NORMAL|LOG_SKID|LOG_STDOUT (and combinations) to LOG_PLAIN, and moved LOG_PLAIN definition to output.h from traceroute.h
2007-08-11 05:11:47 +00:00
fyodor
aac82901d3
merge soc07 r5005:5016 - Adding <times> element for the host's final times (srtt, rttvar, to)
2007-08-11 04:47:38 +00:00
fyodor
424981b064
merge soc07 r4982 - Fixing a small bug relating to 2nd gen osdetection output for tcp timestamp sequences. 'ERROR, WTF?' was being printed in XML because TS_SEQ_OTHER_NUM was omitted from tsseqclass2ascii(). Now it just prints 'other'
2007-08-11 04:32:07 +00:00
fyodor
65bc340828
merge soc07 r4863 - Add some logic to printdatafilepaths to control what gets displayed
2007-08-11 04:00:36 +00:00
fyodor
5e3bb361f2
merge soc07 r4860 - Add verbose data file path reporting. Some more changes might be coming, for example to change the conditions under which this information is displayed.
2007-08-11 03:59:18 +00:00
fyodor
c0e32d45df
merge soc07 r4823:4827 - rename --services to --servicedb, add --versiondb
2007-08-11 03:43:52 +00:00
fyodor
58522c59f6
merge soc07 r4822 - Reduce the number of build dependencies.
2007-08-11 03:35:46 +00:00
fyodor
c6f2ab6e83
merge soc07 r4804 - misc. NSE improvements
2007-08-11 03:32:26 +00:00
fyodor
b642be63c5
merge soc07 r4803 - Implement the --services option using a filename translation map and some additional logic in nmap_fetchfile.
2007-08-11 03:31:22 +00:00
fyodor
b2d25c8b4d
merge soc07 r4792 - Fixing --port_ratio and --top_ports option names (using optcmp instead of strcmp and adding underscore versions to long_options[])
2007-08-11 03:28:01 +00:00
fyodor
90e464602a
merge soc07 r4768 - Don't print an error message when no ports are specified with list or ping scan.
2007-08-11 03:19:43 +00:00
fyodor
58f46706e5
merge soc07 r4751 - UDP traceroute hop distance and port state reason feature
2007-08-11 03:15:24 +00:00
fyodor
e51abafe02
merge soc07 r4727 - Added --top-ports/--port-ratio and wildcard/[] -p switch extensions.
2007-08-11 02:58:03 +00:00
fyodor
21e986b0fd
merge r4943 from soc07 - fixed a cosmetic bug related to low --host-timout arguments. Bug reported by Chris Drake
2007-06-19 21:39:05 +00:00
kris
ea49d9c4e2
merging r4789:4790 from nmap-exp/soc07 -- fixing "--release_memory" option name
2007-05-29 02:27:39 +00:00
kris
92e08b2f09
Updating IANA IP list (ip_is_reserved()). 046/8 is back with IANA, and 092/8 and 093/8 were given to RIPE. With CHANGELOG entry.
2007-04-12 16:53:06 +00:00
kris
528bec100a
One liner. Change 'LOG_STDOUT|LOG_SKID|LOG_PLAIN' in a log_write() (traceroute) in nmap.cc to just 'LOG_PLAIN' because it's defined to 'LOG_NORMAL|LOG_SKID|LOG_STDOUT'
2007-03-15 20:19:37 +00:00
fyodor
e4b863328f
properly lowercase traceroute.h
2007-03-15 18:14:23 +00:00
fyodor
e882edf484
added Eddie Bell's traceroute patch, with only minor changes
2007-03-13 08:02:19 +00:00
kris
cd806922c0
Fix typo in error message when given bad argument for TCP ACK Ping. "-PB" -> "-PA"
2007-02-11 20:42:38 +00:00
kris
abbaffe21c
Updating with Jan '07 IANA IPv4 assignment changes. And the previous IANA patch from Mike Phipps was, in fact, wrong. Apparently he was undoing my previous IANA patch (which Fyodor committed in r4251)
2007-02-09 01:28:58 +00:00
fyodor
5fbc63cc22
revert last patch -- Kris tells me the new assignment numbers may be wrong
2007-02-09 00:17:38 +00:00
fyodor
7c9805b954
IANA patch from Mike Phipps
2007-02-07 21:06:29 +00:00
kris
cc14c538ad
Removing extraneous newlines (sometimes up to 9 of them) from ends of a few files
2007-02-04 02:53:29 +00:00
kris
e326bc0266
Fix --max-os-tries and --max-rtt-timeout options. There was a typo which caused two optcmp()s to be checking for max-rtt-timeout instead of one for that and one for max-os-tries. Since the first one was supposed to check for max-os-tries, --max-rtt-timeout has been setting max-os-tries. This meant there was no way to set max-rtt-timeout, and --max-os-tries always failed with an error message.
2007-01-28 13:18:32 +00:00
kris
ba8defb238
Prevent empty 'Fetchfile found' message (with -d2) from nmap_fetchfile() when it wasn't actually found.
2007-01-20 23:48:18 +00:00
kris
6da0b2a534
Merging my --scanflags change. This allows 'ECE', 'CWR', 'ALL' and 'NONE' to be used. They've all been possible to set using a number, but I like names more :)
2007-01-19 20:14:36 +00:00
kris
2ce87a0250
Merging my -sO -p-XX, rangestart=0 patch. Also (new change) if it's like -sO -pXX-, we cut off rangeend at 255 instead of 65535 so we don't have to do the extra looping later in a while(). IP Proto scanning cant be used along with TCP or UDP scans so cutting it off here works better.
2007-01-16 17:42:07 +00:00
kris
4e4924b408
A few changes to fileexistsandisreadable() (I can't leave this thing alone, can I? :)). First, 'status' is initialized to 0 instead of -1 because if stat() succeeds, but 'pathname_buf' isn't readable at all, this function was returning that -1 (which it shouldn't because the comment says 0, and nmap_fetchfile() checks for a non-zero return value and assumes it found something, but it wasn't breaking anything). Also, access() is now only called once and then the directory-check is done. And finally the comment now explicitly states that 1 is returned if it's readable and not a directory instead of just non-zero. This also just uses S_ISDIR() for testing for a directory, so it might actually be a portability enhancement because WIN32 apparently doesn't have S_ISDIR() and in nbase.h it's defined to something different just than ANDing with S_IFDIR.
2007-01-15 18:24:47 +00:00
kris
889a40a1e1
Just fixed a couple of typos. 'msx-scan-delay' -> 'max-scan-delay' under the Timing Report (-d), and 'Mapps' -> 'Maps' in a comment.
2007-01-11 20:18:42 +00:00
kris
06e35a0c43
2007-01-11 16:07:04 +00:00
fyodor
84340f5737
Fixed a bug which prevented the --without-liblua compilation option from working. Thanks to Kris Katterjohn for the patch.
2007-01-03 20:46:14 +00:00
fyodor
9879720d45
fix for -p used with bad ranges in ip proto scan -- from Kris Katterjohn
2007-01-01 00:00:05 +00:00
diman
3543208670
Fixed file and directory retrieval problems under windows
2006-12-29 00:44:49 +00:00
