From 2e5795b1093a79515269c8ba8cbe27ec9d194055 Mon Sep 17 00:00:00 2001 From: fyodor Date: Mon, 19 Jan 2009 20:22:59 +0000 Subject: [PATCH] o Nmap now reports a proper error message when you combine an IPv6 scan (-6) with random IPv4 address selection (-iR). [Henri Doreau] --- CHANGELOG | 3 +++ NmapOps.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 007b208d9..714a7453f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ # Nmap Changelog ($Id$); -*-text-*- +o Nmap now reports a proper error message when you combine an IPv6 + scan (-6) with random IPv4 address selection (-iR). [Henri Doreau] + o The --excludefile option correctly handles files with no terminating newline instead of claiming "Exclude file line 0 was too long to read." [Henri Doreau] diff --git a/NmapOps.cc b/NmapOps.cc index abd72f376..54c3e068e 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -485,8 +485,8 @@ void NmapOps::ValidateOptions() { fatal("--min-rate=%g must be less than or equal to --max-rate=%g", min_packet_send_rate, max_packet_send_rate); } - if (af() == AF_INET6 && (numdecoys|osscan|bouncescan|fragscan|ackscan|finscan|idlescan|ipprotscan|maimonscan|nullscan|synscan|udpscan|windowscan|xmasscan)) { - fatal("Sorry -- IPv6 support is currently only available for connect() scan (-sT), ping scan (-sP), and list scan (-sL). OS detection and decoys are also not supported with IPv6. Further support is under consideration."); + if (af() == AF_INET6 && (generate_random_ips|numdecoys|osscan|bouncescan|fragscan|ackscan|finscan|idlescan|ipprotscan|maimonscan|nullscan|synscan|udpscan|windowscan|xmasscan)) { + fatal("Sorry -- IPv6 support is currently only available for connect() scan (-sT), ping scan (-sP), and list scan (-sL). OS detection, random targets and decoys are also not supported with IPv6. Further support is under consideration."); } /* Prevent performance values from getting out of whack */