mirror of
https://github.com/nmap/nmap.git
synced 2025-12-10 17:59:04 +00:00
fingermatch/fingerdiff updates from Zhao
This commit is contained in:
@@ -182,9 +182,11 @@ int readFP(FILE *filep, char *newFP, int newFPsz ) {
|
||||
|
||||
/* Now we validate that all elements are present */
|
||||
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, "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 :) */
|
||||
printf("\n"
|
||||
"********************************************************\n"
|
||||
|
||||
@@ -130,13 +130,13 @@ foreach $line (split /\n/, $printbuf) {
|
||||
|
||||
if ($oldlowlim) {
|
||||
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 {
|
||||
if ($newlowlim == -1) { $newlowlim = max(0, hex($sp)); }
|
||||
if ($newlowlim == -1) { $newlowlim = max(0, hex($sp) - 2); }
|
||||
}
|
||||
|
||||
if ($newhighlim == -1) {
|
||||
$newhighlim = max($oldhighlim, hex($sp));
|
||||
$newhighlim = max($oldhighlim, hex($sp) + 2);
|
||||
} else {
|
||||
$newhighlim = max($oldhighlim, $newhighlim);
|
||||
}
|
||||
|
||||
@@ -190,11 +190,13 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
/* Now we validate that all elements are present */
|
||||
if (!strstr(fprint, "TSeq(") || !strstr(fprint, "T1(") ||
|
||||
!strstr(fprint, "T2(") || !strstr(fprint, "T3(") ||
|
||||
!strstr(fprint, "T4(") || !strstr(fprint, "T5(") ||
|
||||
!strstr(fprint, "T6(") || !strstr(fprint, "T7(") ||
|
||||
!strstr(fprint, "PU(")) {
|
||||
if (!strstr(fprint, "SEQ(") || !strstr(fprint, "OPS(") ||
|
||||
!strstr(fprint, "WIN(") || !strstr(fprint, "ECN(") ||
|
||||
!strstr(fprint, "T1(") || !strstr(fprint, "T2(") ||
|
||||
!strstr(fprint, "T3(") || !strstr(fprint, "T4(") ||
|
||||
!strstr(fprint, "T5(") || !strstr(fprint, "T6(") ||
|
||||
!strstr(fprint, "T7(") || !strstr(fprint, "U1(") ||
|
||||
!strstr(fprint, "IE(")) {
|
||||
/* This ought to get my attention :) */
|
||||
printf("\n"
|
||||
"********************************************************\n"
|
||||
|
||||
Reference in New Issue
Block a user