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

320 Commits

Author SHA1 Message Date
david
9941656055 Require separate host groups for targets with different source addresses. 2011-12-30 18:19:07 +00:00
david
08b5d81db5 Fix nmap_fetchfile_userdir for non-Windows. 2011-12-20 21:21:44 +00:00
david
5d362169f2 o On Windows, the directory <HOME>\AppData\Roaming\nmap is now
searched for data files. This is the equivalent of $HOME/.nmap on
  POSIX.
2011-12-20 21:11:21 +00:00
david
149ff73451 Check the NMAP_UPDATE_CHANNEL subdirectory first. 2011-12-16 02:55:27 +00:00
david
233fd6c0f9 Comment improvement. 2011-12-16 02:55:26 +00:00
david
212c2a82cb Split out a subroutine in nmap_fetchfile. 2011-12-15 21:13:42 +00:00
david
ee024fde3a Make the comment about fetchfile search order better. 2011-12-15 21:13:41 +00:00
david
6cbd5a9a58 Allow --exclude and --excludefile together. 2011-12-08 23:16:57 +00:00
david
74ace98617 Whitespace. 2011-10-11 20:32:41 +00:00
david
5fc3242535 Don't call win_init until after apply_delayed_options.
jah noticed strange behavior that depends on the order of options; for
example the position of --unprivileged would make a difference. This was
because win_init makes decisions based on certain options and the
options had not been fully processed.
2011-10-11 20:32:41 +00:00
david
9bf2ec3884 Merge from /nmap-exp/luis/nmap-os6.
svn merge --ignore-ancestry svn://svn.insecure.org/nmap@26621 svn://svn.insecure.org/nmap-exp/luis/nmap-os6

This is the IPv6 OS detection branch. "nmap -6 -O" works now, though at
this point it only prints fingerprints and not OS guesses, because we
need to collect more submissions.
2011-09-19 18:31:46 +00:00
djalal
ae90b1b6f8 Declare the 'new_targets' inside the NOLUA conditional directives. 2011-09-11 22:53:57 +00:00
shinnok
c2822fc17a Merging branch /nmap-exp/shinnok/nmap-options-parsing into trunk.
Nmap delays parsing for options that require knowledge of other options that
the user might have supplied in order to make informed decisions. This is
achieved by using a temporary storage place in which options that can't be
correctly parsed and interpreted without having full knowledge of all other
user supplied command line arguments like -S and -6.
2011-07-29 23:50:28 +00:00
djalal
bd6d08232d Added the '--script-help' option to the Nmap usage. 2011-07-22 10:59:07 +00:00
weilin
1dcf652410 Added ND ping for local IPv6 nets, merging from /nmap-exp/weilin/nmap-nd. 2011-07-19 02:31:54 +00:00
david
f3e5a3f113 Add an enclosing host element in XML output for timed-out hosts.
The lack of this was noticed by Rémi Mollon.
2011-07-08 17:08:53 +00:00
shinnok
4a12617401 Initialize exclude_group with addrset_init() before use, otherwise you just
end up freeing an invalid pointer if no exclude lists are added by then.
2011-06-21 11:37:46 +00:00
colin
c1464a4213 Updated nmap to set nbase logging. 2011-06-20 21:39:51 +00:00
colin
6cd1cee328 Merging from nmap-exp/colin/nmap-addrset, nmap-exp/colin/nbase-addrset, and /nmap-exp/colin/ncat-addrset
Ported addrset from ncat to nbase. Made --exclude and --exclude-file options use addrset. As a side effect IPv6 Excludes work.
2011-06-20 20:46:41 +00:00
david
ea99942f25 Revert r24116 and r24117; the addrset functions need to go in a C
library instead.
2011-06-18 23:52:25 +00:00
colin
221d8db694 Merging from nmap-exp/colin/nmap-addrset and /nmap-exp/colin/ncat-addrset
Ported addrset from ncat to libnetutil. Made --exclude and --exclude-file options use addrset. As a side effect IPv6 Excludes work.
2011-06-17 19:58:03 +00:00
david
e4498838b7 Allow splitting up hostgroups on different interfaces for IPv6. 2011-06-17 05:47:31 +00:00
david
b0a49d2ad1 Move get/set_program_name from main.cc to nmap.cc.
This is for technical reasons; nmap-private-dev programs need to link
against objects files but they can't link against main.o because that
results in a duplicate definition of main.
2011-06-15 18:12:33 +00:00
david
87d9c4ba69 Remove some unused function parameters. 2011-06-14 02:29:39 +00:00
david
4aa4a154f9 Merge from /nmap-exp/david/nmap-ipv6.
This is raw IPv6 packet support for most port and ping scans, Neighbor
Discovery, and traceroute.
2011-06-08 01:24:48 +00:00
david
aed108fc8f Add a same_file function and use it before warning about data files in
the current directory, to avoid warnings like

Warning: File ./nmap-services exists, but Nmap is using /home/david/nmap/nmap-services for security and consistency reasons.

when . and /home/david/nmap are the same directory.
2011-03-26 06:48:31 +00:00
david
c8f79b8afe Remove the current directory from nmap_fetchfile. 2011-03-26 06:48:27 +00:00
david
85762f952f On non-Windows, search the binary path + "../share/nmap" too. 2011-03-26 06:48:25 +00:00
david
dc9c81fe16 Search the binary directory on every platform in nmap_fetchfile, not
just on Windows.
2011-03-26 06:48:23 +00:00
david
f3aca36534 Fix comment typo. 2011-03-26 06:48:21 +00:00
david
45814927a9 Add set_program_name and get_program_name functions to cache argv[0]. 2011-03-26 06:48:19 +00:00
david
dc9d0bc0e7 Print a warning when -sR is used. 2011-03-12 18:53:59 +00:00
david
523c4f7104 Remove -sR o.rpcscan handling; make -sR an alias for -sV. 2011-03-12 18:20:09 +00:00
david
c4cda67b99 Show which libraries are the ones included with Nmap and which are from
the system by prefixing "nmap-" to the former in -V output. Patch by
Ambarisha B.

Hard-code the included/non-included libraries in nmap_winconfig.h:
2011-02-24 21:06:59 +00:00
david
7cf032563d o The -V and --version options now show the platform Nmap was compiled
on, which features are compiled in, and the version numbers of
  libraries it is linked against. [Ambarisha B., David]
2011-02-08 19:50:13 +00:00
djalal
25292e93a7 Add a directive for the --scripthelp code to check if Lua is compiled. 2011-01-29 11:30:23 +00:00
david
8553cb3157 Merge r22026 through r22063 from /nmap-exp/david/nmap-script-help (new
--script-help option).
2011-01-27 21:44:54 +00:00
fyodor
86e59a8c4e Update copyright statements from 2010 to 2011 2011-01-21 00:04:16 +00:00
david
cec33e3aad o The command line in XML output (/nmaprun/@args attribute) now does
quoting of whitespace using double quotes and backslashes. This
  allows recovering the original command line array even when
  arguments contain whitespace. [David]
2010-11-14 02:09:58 +00:00
david
5b010f927a o XML output now excludes output for down hosts when doing host
discovery only, except in verbose mode. This is how it already
  worked for normal scans, but the ping-only case was overlooked.
  [David]
2010-11-11 23:24:59 +00:00
david
908c222b82 Kill unused code left over from --interactive mode. 2010-11-11 04:46:38 +00:00
david
7653cf7d4a Move COPYING.OpenSSL to OpenSSL.txt, update copyright notices to match. 2010-10-30 03:01:50 +00:00
fyodor
a0285813fc Remove --adler32 option from Nmap quick ref screen. It is still documented in man page, but is too obscure for the quick ref screen IMHO 2010-10-05 00:47:07 +00:00
david
6335f423b0 Only show the warning about the changed default units for timespecs if the
timespec doesn't contain a unit. This check was supposed to be done everywhere
but it was missing for --scan-delay and --max-scan-delay. Even if you entered a
time like "10h", which is supposed to disable the warning, it would complain
and tell you to use "10hms".
2010-09-03 23:49:31 +00:00
djalal
c7c502b227 Merge r19520:r20039 from nmap-exp/djalal/nmap-add-targets. This will let NSE scripts to add new discovered targets to future Nmap scans. 2010-09-01 01:50:34 +00:00
david
c78dcce4d3 Move init_socket from nmap.cc to scan_engine.cc, because it is only used
in the latter file.
2010-08-11 14:34:54 +00:00
djalal
f0c5e154c3 Merge r18689:r19511 from /nmap-exp/djalal/nse-rules.
o Add two new Script scan phases:
  Script Pre-scanning phase: before any Nmap scan operation, activated by the new "prerule".
  Script Post-scanning phase: after all Nmap scan operations, activated by the new "postrule".
o New environment variables:
  SCRIPT_PATH
  SCRIPT_NAME
  SCRIPT_TYPE: the type of the rule that activated the script.
2010-08-06 16:40:03 +00:00
david
45468ba2a0 Fix compiler warnings seen on OpenBSD. 2010-08-02 20:30:29 +00:00
djalal
010bcf1b78 Whitespace and formatting fix. 2010-08-02 10:33:58 +00:00
fyodor
8ce7e7e901 Update the help screen to reflect the new default time value (seconds) as suggested by Luis M. 2010-07-18 01:28:12 +00:00