From 1f6fbad3dd8efced93f06091dd3f3b42b717faf8 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 26 Aug 2006 09:48:31 +0000
Subject: [PATCH] fingermatch/fingerdiff updates from Zhao

---
 scripts/fingerdiff.cc  |  6 ++++--
 scripts/fingerfix.pl   |  6 +++---
 scripts/fingermatch.cc | 12 +++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/scripts/fingerdiff.cc b/scripts/fingerdiff.cc
index 56f421303..16f017772 100644
--- a/scripts/fingerdiff.cc
+++ b/scripts/fingerdiff.cc
@@ -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"
diff --git a/scripts/fingerfix.pl b/scripts/fingerfix.pl
index 678f1dd98..eb677c00d 100755
--- a/scripts/fingerfix.pl
+++ b/scripts/fingerfix.pl
@@ -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);
 	    }
diff --git a/scripts/fingermatch.cc b/scripts/fingermatch.cc
index 2d36f79c5..bf85b1803 100644
--- a/scripts/fingermatch.cc
+++ b/scripts/fingermatch.cc
@@ -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"