Changeset 19 for trunk/src/sh_hash.c

Timestamp:

Feb 12, 2006, 10:49:56 PM (19 years ago)

Author:

rainer

Message:

Rewrite of test suite, checksum for growing logs, fix for minor bug with dead client detection.

File:

• trunk/src/sh_hash.c (modified) (2 diffs)

trunk/src/sh_hash.c

@@ -2485 +2485 @@
 
   if ( (fileHash != NULL) && (p->theFile.checksum != NULL)   && 
-       (strncmp (fileHash, p->theFile.checksum, 50) != 0) && 
+       (strncmp (fileHash, p->theFile.checksum, KEY_LEN) != 0) && 
        (theFile->check_mask & MODI_CHK) != 0)
     {
-      modi_mask |= MODI_CHK;
-      change_code[0] = 'C';
-      TPT ((0, FIL__, __LINE__, _("mod=<checksum>")));
+      if ((theFile->check_mask & MODI_SGROW) == 0)
+        {
+          modi_mask |= MODI_CHK;
+          change_code[0] = 'C';
+          TPT ((0, FIL__, __LINE__, _("mod=<checksum>")));
+        }
+      else
+        {
+          if (0 != strncmp (&fileHash[KEY_LEN + 1], 
+                            p->theFile.checksum, KEY_LEN))
+            {
+              modi_mask |= MODI_CHK;
+              change_code[0] = 'C';
+              TPT ((0, FIL__, __LINE__, _("mod=<checksum>")));
+            }
+          else
+            {
+              p->theFile.size  = theFile->size;
+              sl_strlcpy(p->theFile.checksum, fileHash, KEY_LEN+1);
+            }
+        }
     } 
 
@@ -2621 +2639 @@
        (theFile->check_mask & MODI_SIZ) != 0)
     {
-      if (class == SH_LEVEL_LOGGROW && theFile->size < (off_t) p->theFile.size)
+      if ((theFile->check_mask & MODI_SGROW) == 0 || 
+          theFile->size < (off_t) p->theFile.size)
         {
           modi_mask |= MODI_SIZ;
           change_code[9] = 'S';
           TPT ((0, FIL__, __LINE__, _("mod=<size>")));
-        } 
-      else if (class != SH_LEVEL_LOGGROW)
-        { 
-          modi_mask |= MODI_SIZ;
-          change_code[9] = 'S';
-          TPT ((0, FIL__, __LINE__, _("mod=<size>")));
-        } 
+        }
     }
   change_code[10] = '\0';