1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-11 02:09:03 +00:00

fingermatch/fingerdiff updates from Zhao

This commit is contained in:
fyodor
2006-08-26 09:48:31 +00:00
parent c124f4ff9b
commit 1f6fbad3dd
3 changed files with 14 additions and 10 deletions

View File

@@ -182,9 +182,11 @@ int readFP(FILE *filep, char *newFP, int newFPsz ) {
/* Now we validate that all elements are present */ /* Now we validate that all elements are present */
p = newFP; p = newFP;
if (!strstr(p, "TSeq(") || !strstr(p, "T1(") || !strstr(p, "T2(") || if (!strstr(p, "SEQ(") || !strstr(p, "OPS(") || !strstr(p, "WIN(") ||
!strstr(p, "ECN(") || !strstr(p, "T1(") || !strstr(p, "T2(") ||
!strstr(p, "T3(") || !strstr(p, "T4(") || !strstr(p, "T5(") || !strstr(p, "T3(") || !strstr(p, "T4(") || !strstr(p, "T5(") ||
!strstr(p, "T6(") || !strstr(p, "T7(") || !strstr(p, "PU(")) { !strstr(p, "T6(") || !strstr(p, "T7(") || !strstr(p, "U1(") ||
!strstr(p, "IE(")) {
/* This ought to get my attention :) */ /* This ought to get my attention :) */
printf("\n" printf("\n"
"********************************************************\n" "********************************************************\n"

View File

@@ -130,13 +130,13 @@ foreach $line (split /\n/, $printbuf) {
if ($oldlowlim) { if ($oldlowlim) {
if ($newlowlim != -1) { $newlowlim = max(0, min($oldlowlim, $newlowlim)); } if ($newlowlim != -1) { $newlowlim = max(0, min($oldlowlim, $newlowlim)); }
else { $newlowlim = max(0, min($oldlowlim, hex($sp))); } else { $newlowlim = max(0, min($oldlowlim, hex($sp) - 2)); }
} else { } else {
if ($newlowlim == -1) { $newlowlim = max(0, hex($sp)); } if ($newlowlim == -1) { $newlowlim = max(0, hex($sp) - 2); }
} }
if ($newhighlim == -1) { if ($newhighlim == -1) {
$newhighlim = max($oldhighlim, hex($sp)); $newhighlim = max($oldhighlim, hex($sp) + 2);
} else { } else {
$newhighlim = max($oldhighlim, $newhighlim); $newhighlim = max($oldhighlim, $newhighlim);
} }

View File

@@ -190,11 +190,13 @@ int main(int argc, char *argv[]) {
} }
/* Now we validate that all elements are present */ /* Now we validate that all elements are present */
if (!strstr(fprint, "TSeq(") || !strstr(fprint, "T1(") || if (!strstr(fprint, "SEQ(") || !strstr(fprint, "OPS(") ||
!strstr(fprint, "T2(") || !strstr(fprint, "T3(") || !strstr(fprint, "WIN(") || !strstr(fprint, "ECN(") ||
!strstr(fprint, "T4(") || !strstr(fprint, "T5(") || !strstr(fprint, "T1(") || !strstr(fprint, "T2(") ||
!strstr(fprint, "T6(") || !strstr(fprint, "T7(") || !strstr(fprint, "T3(") || !strstr(fprint, "T4(") ||
!strstr(fprint, "PU(")) { !strstr(fprint, "T5(") || !strstr(fprint, "T6(") ||
!strstr(fprint, "T7(") || !strstr(fprint, "U1(") ||
!strstr(fprint, "IE(")) {
/* This ought to get my attention :) */ /* This ought to get my attention :) */
printf("\n" printf("\n"
"********************************************************\n" "********************************************************\n"