PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-08 13:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Minor style fixes

Browse Source
This commit is contained in:
luis
2011-07-26 12:04:08 +00:00
parent 6defb790d2
commit bbda5dfd90
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
osscan2.cc
View File

@@ -413,33 +413,34 @@ static void doSeqTests(OsScanInfo *OSI, HostOsScan *HOS) {
list<HostOsScanInfo *>::iterator hostI; list<HostOsScanInfo *>::iterator hostI;
HostOsScanInfo *hsi = NULL; HostOsScanInfo *hsi = NULL;
HostOsScanStats *hss = NULL; HostOsScanStats *hss = NULL;
unsigned int unableToSend; /* # of times in a row that hosts were unable to send probe */ unsigned int unableToSend = 0; /* # of times in a row that hosts were unable to send probe */
unsigned int expectReplies; unsigned int expectReplies = 0;
long to_usec; long to_usec = 0;
int timeToSleep = 0; int timeToSleep = 0;
struct ip *ip = NULL; struct ip *ip = NULL;
struct link_header linkhdr; struct link_header linkhdr;
struct sockaddr_storage ss; struct sockaddr_storage ss;
unsigned int bytes; unsigned int bytes = 0;
struct timeval rcvdtime; struct timeval rcvdtime;
struct timeval stime;
struct timeval stime, tmptv; struct timeval tmptv;
bool timedout = false; bool timedout = false;
bool thisHostGood; bool thisHostGood = false;
bool foundgood; bool foundgood = false;
bool goodResponse; bool goodResponse = false;
int numProbesLeft = 0; int numProbesLeft = 0;
memset(&stime, 0, sizeof(stime)); memset(&stime, 0, sizeof(stime));
memset(&tmptv, 0, sizeof(tmptv)); memset(&tmptv, 0, sizeof(tmptv));
/* For each host, build a list of sequence probes to send */
for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) { for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) {
hsi = *hostI; hsi = *hostI;
hss = hsi->hss; hss = hsi->hss;
HOS->buildSeqProbeList(hss); HOS->buildSeqProbeList(hss);
} }
/* Iterate until we have sent all the probes */
do { do {
if(timeToSleep > 0) { if(timeToSleep > 0) {
if(o.debugging > 1) { if(o.debugging > 1) {
@@ -453,7 +454,7 @@ static void doSeqTests(OsScanInfo *OSI, HostOsScan *HOS) {
unableToSend = 0; unableToSend = 0;
if(o.debugging > 2) { if(o.debugging > 2) {
for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) { for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) {
hss = (*hostI)->hss; hss = (*hostI)->hss;
log_write(LOG_PLAIN, "Host %s. ProbesToSend %d: \tProbesActive %d\n", log_write(LOG_PLAIN, "Host %s. ProbesToSend %d: \tProbesActive %d\n",
hss->target->targetipstr(), hss->numProbesToSend(), hss->target->targetipstr(), hss->numProbesToSend(),
@@ -483,7 +484,7 @@ static void doSeqTests(OsScanInfo *OSI, HostOsScan *HOS) {
if(!HOS->stats->sendOK()) { if(!HOS->stats->sendOK()) {
TIMEVAL_MSEC_ADD(stime, now, 1000); TIMEVAL_MSEC_ADD(stime, now, 1000);
for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) { for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) {
if (HOS->nextTimeout((*hostI)->hss, &tmptv)) { if (HOS->nextTimeout((*hostI)->hss, &tmptv)) {
if (TIMEVAL_SUBTRACT(tmptv, stime) < 0) if (TIMEVAL_SUBTRACT(tmptv, stime) < 0)
stime = tmptv; stime = tmptv;
@@ -491,7 +492,7 @@ static void doSeqTests(OsScanInfo *OSI, HostOsScan *HOS) {
} }
} }
else { else {
foundgood = false; foundgood = false;
for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) { for(hostI = OSI->incompleteHosts.begin(); hostI != OSI->incompleteHosts.end(); hostI++) {
thisHostGood = HOS->hostSeqSendOK((*hostI)->hss, &tmptv); thisHostGood = HOS->hostSeqSendOK((*hostI)->hss, &tmptv);
if (thisHostGood) { if (thisHostGood) {
@@ -565,8 +566,8 @@ static void doSeqTests(OsScanInfo *OSI, HostOsScan *HOS) {
if(expectReplies == 0) { if(expectReplies == 0) {
timeToSleep = TIMEVAL_SUBTRACT(stime, now); timeToSleep = TIMEVAL_SUBTRACT(stime, now);
} else { } else {
timeToSleep = 0; timeToSleep = 0;
} }
} while(numProbesLeft > 0); } while(numProbesLeft > 0);