PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-06 14:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Break apart host groups when a new host has the same address as one already in

Browse Source 
the current host group. This was already done in nexthost but only affected
ping scanning. Here in nmap.cc it takes effect for port scanning.
This commit is contained in:
david
2010-06-09 03:12:38 +00:00
parent d638f68826
commit 2a8d0f2301
2 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
nmap.cc
View File

@@ -126,6 +126,9 @@ extern char *optarg;
extern int optind;
extern NmapOps o; /* option structure */
static bool target_needs_new_hostgroup(std::vector<Target *> &targets,
const Target *target);
/* parse the --scanflags argument. It can be a number >=0 or a string consisting of TCP flag names like "URGPSHFIN". Returns -1 if the argument is invalid. */
static int parse_scanflags(char *arg) {
int flagval = 0;
@@ -1816,13 +1819,10 @@ int nmap_main(int argc, char *argv[]) {
if (!currenths->deviceName())
fatal("Do not have appropriate device name for target");
/* Groups should generally use the same device as properties
change quite a bit between devices. Plus dealing with a
multi-device group can be a pain programmatically. So if
this Target has a different device the rest, we give it
back. */
if (Targets.size() > 0 &&
strcmp(Targets[Targets.size() - 1]->deviceName(), currenths->deviceName())) {
/* Hosts in a group need to be somewhat homogeneous. Put this host in
the next group if necessary. See target_needs_new_hostgroup for the
details of when we need to split. */
if (target_needs_new_hostgroup(Targets, currenths)) {
returnhost(hstate);
o.numhosts_up--;
break;
@@ -2010,6 +2010,42 @@ int nmap_main(int argc, char *argv[]) {
}
return 0;
}
/* Returns true iff this target is incompatible with the other hosts in the host
group. This happens when:
1. it uses a different interface, or
2. it has the same IP address as another target already in the group.
These restrictions only apply for raw scans. This function is similar to one
of the same name in targets.cc. That one is for ping scanning, this one is
for port scanning. */
static bool target_needs_new_hostgroup(std::vector<Target *> &targets,
const Target *target) {
std::vector<Target *>::iterator it;
/* We've just started a new hostgroup, so any target is acceptable. */
if (targets.empty())
return false;
/* Different interface name? */
if (targets[0]->deviceName() != NULL &&
target->deviceName() != NULL &&
strcmp(targets[0]->deviceName(), target->deviceName()) != 0) {
return true;
}
/* Is there already a target with this same IP address? ultra_scan doesn't
cope with that, because it uses IP addresses to look up targets from
replies. What happens is one target gets the replies for all probes
referring to the same IP address. */
if (o.af() == AF_INET) {
for (it = targets.begin(); it != targets.end(); it++) {
if ((*it)->v4host().s_addr == target->v4host().s_addr)
return true;
}
}
return false;
}
// Free some global memory allocations.
// This is used for detecting memory leaks.

4
targets.cc
View File

@@ -411,7 +411,9 @@ static void massping(Target *hostbatch[], int num_hosts, struct scan_lists *port
2. it uses a different source address, or
3. it is directly connected when the other hosts are not, or vice versa, or
4. it has the same IP address as another target already in the group.
These restrictions only apply for raw scans. */
These restrictions only apply for raw scans. This function is similar to one
of the same name in nmap.cc. That one is for port scanning, this one is for
ping scanning. */
static bool target_needs_new_hostgroup(const HostGroupState *hs, const Target *target) {
int i;