PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-04 21:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Revert r24116 and r24117; the addrset functions need to go in a C

Browse Source 
library instead.
This commit is contained in:
david
2011-06-18 23:52:25 +00:00
parent 5168e20bca
commit ea99942f25
8 changed files with 168 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nmap.cc
View File

@@ -475,7 +475,7 @@ int nmap_main(int argc, char *argv[]) {
/* Only NSE scripts can add targets */
NewTargets *new_targets = NULL;
#endif
addrset exclude_group;
TargetGroup *exclude_group = NULL;
char myname[MAXHOSTNAMELEN + 1];
#if (defined(IN_ADDR_DEEPSTRUCT) || defined( SOLARIS))
/* Note that struct in_addr in solaris is 3 levels deep just to store an
@@ -1645,17 +1645,20 @@ int nmap_main(int argc, char *argv[]) {
/* lets load our exclude list */
if (excludefd != NULL) {
load_exclude_file(&exclude_group, excludefd);
exclude_group = load_exclude_file(excludefd);
fclose(excludefd);
}
if (exclude_spec != NULL) {
/* Simultaneous --excludefile and --exclude are not supported. */
load_exclude_string(&exclude_group ,exclude_spec);
assert(exclude_group == NULL);
exclude_group = load_exclude_string(exclude_spec);
free(exclude_spec);
}
if (o.debugging > 3)
dumpExclude(&exclude_group);
if (exclude_group != NULL) {
if (o.debugging > 3)
dumpExclude(exclude_group);
}
#ifndef NOLUA
if (o.scriptupdatedb) {
@@ -1689,7 +1692,7 @@ int nmap_main(int argc, char *argv[]) {
ideal_scan_group_sz = determineScanGroupSize(o.numhosts_scanned, &ports);
while(Targets.size() < ideal_scan_group_sz) {
o.current_scantype = HOST_DISCOVERY;
currenths = nexthost(hstate, &exclude_group, &ports, o.pingtype);
currenths = nexthost(hstate, exclude_group, &ports, o.pingtype);
if (!currenths) {
/* Try to refill with any remaining expressions */
/* First free the old ones */
@@ -1727,7 +1730,7 @@ int nmap_main(int argc, char *argv[]) {
num_host_exp_groups);
/* Try one last time -- with new expressions */
currenths = nexthost(hstate, &exclude_group, &ports, o.pingtype);
currenths = nexthost(hstate, exclude_group, &ports, o.pingtype);
if (!currenths)
break;
}
@@ -1968,8 +1971,9 @@ int nmap_main(int argc, char *argv[]) {
#endif
delete hstate;
addrset_free(&exclude_group);
if (exclude_group)
delete[] exclude_group;
hstate = NULL;
/* Free host expressions */