1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-07 06:59:03 +00:00

Remove mentions of the TCP sequence class in XML output.

This commit is contained in:
david
2008-04-11 18:57:32 +00:00
parent c7017806cc
commit c0490af2fd
6 changed files with 1 additions and 36 deletions

View File

@@ -263,7 +263,6 @@
<!ELEMENT tcpsequence EMPTY >
<!ATTLIST tcpsequence
index %attr_numeric; #REQUIRED
class CDATA #REQUIRED
difficulty CDATA #REQUIRED
values CDATA #REQUIRED
>

View File

@@ -726,7 +726,6 @@
<h3>tcpsequence</h3>
<ul>
<li>index: <xsl:value-of select="@index" /></li>
<li>class: <xsl:value-of select="@class" /></li>
<li>difficulty: <xsl:value-of select="@difficulty" /></li>
<li>values: <xsl:value-of select="@values" /></li>
</ul>

View File

@@ -202,8 +202,6 @@ struct timeout_info {
struct seq_info {
int responses;
int seqclass; /* SEQ_* defines in nmap.h. This should be removed when
we remove osscan gen1 cruft. */
int ts_seqclass; /* TS_SEQ_* defines in nmap.h */
time_t uptime; /* time of latest system boot (or 0 if unknown ) */
int ipid_seqclass; /* IPID_SEQ_* defines in nmap.h */

22
nmap.cc
View File

@@ -2371,28 +2371,6 @@ const char *seqidx2difficultystr(unsigned long idx) {
return (idx < 3)? "Trivial joke" : (idx < 6)? "Easy" : (idx < 11)? "Medium" : (idx < 12)? "Formidable" : (idx < 16)? "Worthy challenge" : "Good luck!";
}
const char *seqclass2ascii(int seqclass) {
switch(seqclass) {
case SEQ_CONSTANT:
return "constant sequence number (!)";
case SEQ_64K:
return "64K rule";
case SEQ_TD:
return "trivial time dependency";
case SEQ_i800:
return "increments by 800";
case SEQ_RI:
return "random positive increments";
case SEQ_TR:
return "truly random";
case SEQ_UNKNOWN:
return "unknown class";
default:
return "ERROR, WTF?";
}
}
const char *ipidclass2ascii(int seqclass) {
switch(seqclass) {
case IPID_SEQ_CONSTANT:

9
nmap.h
View File

@@ -358,15 +358,6 @@ void *realloc();
wrapped. */
#define FP_RESULT_WRAP_LINE_LEN 74
/* TCP/IP ISN sequence prediction classes */
#define SEQ_UNKNOWN 0
#define SEQ_64K 1
#define SEQ_TD 2
#define SEQ_RI 4
#define SEQ_TR 8
#define SEQ_i800 16
#define SEQ_CONSTANT 32
/* TCP Timestamp Sequence */
#define TS_SEQ_UNKNOWN 0
#define TS_SEQ_ZERO 1 /* At least one of the timestamps we received back was 0 */

View File

@@ -1649,7 +1649,7 @@ void printosscanoutput(Target *currenths) {
while(*p) p++;
}
log_write(LOG_XML, "<tcpsequence index=\"%li\" class=\"%s\" difficulty=\"%s\" values=\"%s\" />\n", (long) currenths->seq.index, seqclass2ascii(currenths->seq.seqclass), seqidx2difficultystr(currenths->seq.index), numlst);
log_write(LOG_XML, "<tcpsequence index=\"%li\" difficulty=\"%s\" values=\"%s\" />\n", (long) currenths->seq.index, seqidx2difficultystr(currenths->seq.index), numlst);
if (o.verbose)
log_write(LOG_PLAIN,"%s", seqreport(&(currenths->seq)));