1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-21 15:09:02 +00:00

new goodz

This commit is contained in:
fyodor
2005-07-22 05:33:51 +00:00
parent 9e7384fd63
commit 153df8bb21
4 changed files with 21 additions and 16 deletions

View File

@@ -2,6 +2,11 @@
UNRELEASED
o Changed the --no-stylesheet option to --no_stylesheet to be
consistant with all of the other Nmap options. Though I'm starting to
like hyphens a bit better than underscores and may change all of the
options to use hyphens instad at some point.
o Applied a massive OS fingerprint update from Zhao Lei
(zhaolei(a)gmail.com). About 350 fingerprints were added, and many
more were updated. Notable additions include Mac OS X 10.4 (Tiger),
@@ -18,18 +23,18 @@ o Added the ability for Nmap to send and properly route raw ethernet
packets via raw sockets. This is particularly useful for Windows,
since Microsoft has disabled raw socket support in XP for no good
reason. Nmap tries to choose the best method at runtime based on
platform, though you can override it with the new --send-eth and
--send-ip options.
platform, though you can override it with the new --send_eth and
--send_ip options.
o Added ARP ping (-PR). Nmap can now send raw ethernet ARP requests to
determine whether hosts on a LAN are up, rather than relying on
higher-level IP packets (which can only be sent after a successful ARP
request and reply anyway). This is much faster and more reliable
(not subject to IP-level firewalling) than IP-based probes. The
downside is that it only works when the target machine is on the same
LAN as the scanning machine. It is recommended whenever those
conditions are met, and may sometime become the default when Nmap
detects that the conditions are met. Example usage: nmap -sP -PR
higher-level IP packets (which can only be sent after a successful
ARP request and reply anyway). This is much faster and more
reliable (not subject to IP-level firewalling) than IP-based probes.
The downside is that it only works when the target machine is on the
same LAN as the scanning machine. It is now used automatically for
any hosts that are detected to be on a local ethernet network,
unless --send_ip was specified. Example usage: nmap -sP -PR
192.168.0.0/16 . This is not yet supported on Windows.
o Added "Exclude" directive to nmap-service-probes grammar which

View File

@@ -491,7 +491,7 @@ record) or as a literal IP address such as
and TCP connect() Ping scan are supported. If you need UDP or other
scan types, have a look at http://nmap6.sourceforge.net/ .
.TP
.B \--send-eth
.B \--send_eth
Asks Nmap to send packets at the raw ethernet (data link) layer rather
than the higher IP (network) layer. By default, Nmap chooses the one
which is generally best for the platform it is running on. Raw
@@ -500,7 +500,7 @@ while ethernet frames work best on the many Windows versions where
Microsoft has disabled raw sockets support. Nmap still uses raw IP
packets when there is no other choice (such as non-ethernet
connections).
.B --send-ip
.B --send_ip
Asks Nmap to send packets via raw IP sockets rather than sending lower
level ethernet frames. It is the complement to the --send-eth
option.discussed previously.
@@ -580,7 +580,7 @@ makes it easier to view results on a machine that doesn't have Nmap
the local filesystem locaton of nmap.xsl is used by default for
privacy reasons.
.TP
.B \--no-stylesheet
.B \--no_stylesheet
Specify this option to prevent Nmap from associating any XSL
stylesheet with its XML output. The xml-stylesheet directive is
omitted.

View File

@@ -278,7 +278,7 @@ int nmap_main(int argc, char *argv[]) {
{"send_eth", no_argument, 0, 0},
{"send_ip", no_argument, 0, 0},
{"stylesheet", required_argument, 0, 0},
{"no-stylesheet", no_argument, 0, 0},
{"no_stylesheet", no_argument, 0, 0},
{"rH", no_argument, 0, 0},
{"vv", no_argument, 0, 0},
{"ff", no_argument, 0, 0},
@@ -452,7 +452,7 @@ int nmap_main(int argc, char *argv[]) {
o.sendpref = PACKET_SEND_IP_STRONG;
} else if (strcmp(long_options[option_index].name, "stylesheet") == 0) {
o.setXSLStyleSheet(optarg);
} else if (strcmp(long_options[option_index].name, "no-stylesheet") == 0) {
} else if (strcmp(long_options[option_index].name, "no_stylesheet") == 0) {
o.setXSLStyleSheet(NULL);
} else if (strcmp(long_options[option_index].name, "oN") == 0) {
normalfilename = optarg;

View File

@@ -372,8 +372,8 @@ do {
hs->hostbatch[hidx]->deviceName() &&
(hs->hostbatch[hidx]->v4source().s_addr != hs->hostbatch[0]->v4source().s_addr ||
strcmp(hs->hostbatch[0]->deviceName(),
hs->hostbatch[hidx]->deviceName()) != 0)
|| hs->hostbatch[hidx]->directlyConnected() != hs->hostbatch[0]->directlyConnected()) {
hs->hostbatch[hidx]->deviceName()) != 0
|| hs->hostbatch[hidx]->directlyConnected() != hs->hostbatch[0]->directlyConnected())) {
/* Cancel everything! This guy must go in the next group and we are
outtof here */
hs->current_expression.return_last_host();