1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-29 02:49:01 +00:00

Merge r27177-180 from nmap-npingchanges: Minor typo and style fixes in -h output

This commit is contained in:
luis
2013-03-29 13:14:18 +00:00
parent 686322d1bd
commit ac64c953ab

View File

@@ -1201,8 +1201,7 @@ void ArgParser::printUsage(void){
"\n"
"TARGET SPECIFICATION:\n"
" Targets may be specified as hostnames, IP addresses, networks, etc.\n"
" Ex: scanme.nmap.org, microsoft.com/24, 192.168.0.1; 10.0.0-255.1-254\n"
//" -iL <inputfilename>: Read targets from list of hosts or networks\n"
" Ex: scanme.nmap.org, microsoft.com/24, 192.168.0.1; 10.0.*.1-24\n"
"PROBE MODES:\n"
" --tcp-connect : Unprivileged TCP connect probe mode.\n"
" --tcp : TCP probe mode.\n"
@@ -1222,10 +1221,6 @@ void ArgParser::printUsage(void){
" --ack <acknumber> : Set ACK number.\n"
" --win <size> : Set window size.\n"
" --badsum : Use a random invalid checksum. \n"
//" --mss <size> : Set maximum segment size.\n"
//" --ws <n> : Set window scale.\n"
//" --sack [To be defined] : Selective ACK.\n"
//" --ts <echo,reply> : Set timestamp (echo and reply fields).\n"
"UDP PROBE MODE:\n"
" -g, --source-port <portnumber> : Set source port.\n"
" -p, --dest-port <port spec> : Set destination port(s).\n"
@@ -1242,7 +1237,6 @@ void ArgParser::printUsage(void){
" --icmp-orig-time <timestamp> : Set originate timestamp.\n"
" --icmp-recv-time <timestamp> : Set receive timestamp.\n"
" --icmp-trans-time <timestamp> : Set transmit timestamp.\n"
//" TODO: Add options for all fields required by those ICMP msg types.\n"
"ARP/RARP PROBE MODE:\n"
" --arp-type <type> : Type: ARP, ARP-reply, RARP, RARP-reply.\n"
" --arp-sender-mac <mac> : Set sender MAC address.\n"
@@ -1251,7 +1245,6 @@ void ArgParser::printUsage(void){
" --arp-target-ip <addr> : Set target IP address.\n"
"IPv4 OPTIONS:\n"
" -S, --source-ip : Set source IP address.\n"
// Supported but undocumented:"" --spoof-ip: Set source IP address. (consistent with --spoof-mac format)\n"
" --dest-ip <addr> : Set destination IP address (used as an \n"
" alternative to {target specification} ). \n"
" --tos <tos> : Set type of service field (8bits).\n"
@@ -1264,7 +1257,6 @@ void ArgParser::printUsage(void){
" --ip-options <hex string> : Set IP options\n"
" --mtu <size> : Set MTU. Packets get fragmented if MTU is\n"
" small enough.\n"
//" -f : Fragment packets.\n"
"IPv6 OPTIONS:\n"
" -6, --IPv6 : Use IP version 6.\n"
" --dest-ip : Set destination IP address (used as an\n"
@@ -1276,12 +1268,10 @@ void ArgParser::printUsage(void){
" --dest-mac <mac> : Set destination mac address. (Disables\n"
" ARP resolution)\n"
" --source-mac <mac> : Set source MAC address.\n"
// Supported but undocumented:" --spoof-mac : Set source MAC address (provides same flag as nmap).\n"
" --ether-type <type> : Set EtherType value.\n"
"PAYLOAD OPTIONS:\n"
" --data <hex string> : Include a custom payload.\n"
" --data-string <text> : Include a custom ASCII text.\n"
//" --data-file <filename> : Include payload from specified file.\n"
" --data-length <len> : Include len random bytes as payload.\n"
"ECHO CLIENT/SERVER:\n"
" --echo-client <passphrase> : Run Nping in client mode.\n"
@@ -1295,7 +1285,6 @@ void ArgParser::printUsage(void){
" 's' (seconds), 'm' (minutes), or 'h' (hours) to the value (e.g. 30m, 0.25h).\n"
" --delay <time> : Adjust delay between probes.\n"
" --rate <rate> : Send num packets per second.\n"
//" --host-timeout <time> : Give up on target after this long.\n"
"MISC:\n"
" -h, --help : Display help information.\n"
" -V, --version : Display current version number. \n"
@@ -1305,7 +1294,7 @@ void ArgParser::printUsage(void){
" -N, --no-capture : Do not try to capture replies.\n"
" --privileged : Assume user is fully privileged.\n"
" --unprivileged : Assume user lacks raw socket privileges.\n"
" --send-eth : Send packets at the raw ethernet layer.\n"
" --send-eth : Send packets at the raw Ethernet layer.\n"
" --send-ip : Send packets using raw IP sockets.\n"
" --bpf-filter <filter spec> : Specify custom BPF filter.\n"
"OUTPUT:\n"