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

Remove the G_ALIVE_TTL traceroute probe state. It was mostly synonymous

Browse Source 
with G_DEAD_TTL. I couldn't figure out that the difference was supposed
to be.
This commit is contained in:
david
2009-08-19 23:07:43 +00:00
parent 86b0100dc3
commit 9cff9beb20
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
traceroute.cc
View File

@@ -625,7 +625,7 @@ Traceroute::sendProbe(TraceProbe * tp) {
tg->nextTTL();
if (tg->ttl > MAX_TTL) {
tg->setState(G_ALIVE_TTL);
tg->setState(G_DEAD_TTL);
return -1;
}
if (!tg->ttl || (tg->gotReply && tg->noDistProbe) ) {
@@ -1006,7 +1006,7 @@ Traceroute::outputTarget(Target * t) {
}
log_write(LOG_PLAIN, "%s", Tbl->printableTable(NULL));
if (G_TTL(tg->getState()))
if (tg->getState() == G_DEAD_TTL)
log_write(LOG_PLAIN, "! maximum TTL reached (50)\n");
else if (!tg->gotReply || (tp && (tp->ipreplysrc.s_addr != tg->ipdst)))
log_write(LOG_PLAIN, "! destination not reached (%s)\n", inet_ntoa(tp->ipdst));
@@ -1071,7 +1071,7 @@ Traceroute::outputXMLTrace(TraceGroup * tg) {
log_write(LOG_XML, "/>\n");
}
if (G_TTL(tg->getState()))
if (tg->getState() == G_DEAD_TTL)
log_write(LOG_XML, "<error errorstr=\"maximum TTL reached\"/>\n");
else if (!tg->gotReply || (tp && (tp->ipreplysrc.s_addr != tg->ipdst)))
log_write(LOG_XML, "<error errorstr=\"destination not reached (%s)\"/>\n", inet_ntoa(tp->ipdst));

3
traceroute.h
View File

@@ -105,11 +105,8 @@
/* Group states */
#define G_OK P_OK
#define G_DEAD_TTL 3 /* TTL has reached maximum value */
#define G_ALIVE_TTL 4 /* TTL has reached maximum value */
#define G_FINISH 5 /* tracing has complete successfully */
#define G_TTL(x) (x == G_ALIVE_TTL || x == G_DEAD_TTL)
#define MAX_TTL 50
#define HOP_COL 0