Changeset 19 for trunk/include

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.

Location:

trunk/include

Files:

• samhain.h (modified) (1 diff)
• sh_tiger.h (modified) (3 diffs)
• sh_unix.h (modified) (4 diffs)

trunk/include/samhain.h

@@ -292 +292 @@
       if ((skey != NULL) && skey->mlock_failed == SL_FALSE){ \
         (void) sl_set_suid(); \
-        if (sh_unix_mlock( a, b) < 0) skey->mlock_failed = SL_TRUE; \
+        if (sh_unix_mlock(FIL__, __LINE__, a, b) < 0) skey->mlock_failed = SL_TRUE; \
         (void) sl_unset_suid(); } 
 #else

trunk/include/sh_tiger.h

@@ -18 +18 @@
  */
 /*@owned@*/ char * sh_tiger_hash (char * filename, TigerType what, 
-                                  unsigned long Length);
+                                  UINT64 Length);
 
 /* NEW Thu Oct 18 19:59:08 CEST 2001
@@ -24 +24 @@
 int sh_tiger_hashtype (char * c);
 char * sh_tiger_generic_hash (char * filename, TigerType what, 
-                              unsigned long Length, int timeout);
+                              UINT64 Length, int timeout);
 
 UINT32 * sh_tiger_hash_uint32 (char * filename, 
                                TigerType what, 
-                               unsigned long Length);
+                               UINT64 Length);
 
 /* get the type of hash function used
@@ -38 +38 @@
  */
 /*@owned@*/ char * sh_tiger_hash_gpg (char * filename, TigerType what, 
-                          unsigned long Length);
+                                      UINT64 Length);
 #endif

trunk/include/sh_unix.h

@@ -79 +79 @@
 /* device num   */
 #define MODI_RDEV (1 << 11)
+/* size may grow   */
+#define MODI_SGROW (1 << 12)
+/* use prelink     */
+#define MODI_PREL (1 << 13)
 
 #define MASK_ALLIGNORE_  0
@@ -86 +90 @@
 #define MASK_LOGFILES_   (MASK_ATTRIBUTES_|MODI_HLN|MODI_LNK|MODI_INO)
 extern  unsigned long mask_LOGFILES;
-#define MASK_LOGGROW_    (MASK_LOGFILES_|MODI_SIZ) 
+#define MASK_LOGGROW_    (MASK_LOGFILES_|MODI_SIZ|MODI_SGROW|MODI_CHK) 
 extern  unsigned long mask_LOGGROW;
 #define MASK_READONLY_   (MASK_LOGFILES_|MODI_CHK|MODI_SIZ|MODI_MTM|MODI_CTM)
@@ -95 +99 @@
 extern  unsigned long mask_USER0;
 extern  unsigned long mask_USER1;
-/* like READONLY, but without MTM,CTM,SIZ,INO)
- */
-#define MASK_PRELINK_   (MASK_ATTRIBUTES_|MODI_HLN|MODI_LNK|MODI_CHK)
+/* like READONLY, but without MTM,CTM,SIZ,INO, abd with PREL)
+ */
+#define MASK_PRELINK_   (MASK_ATTRIBUTES_|MODI_HLN|MODI_LNK|MODI_CHK|MODI_PREL)
 extern  unsigned long mask_PRELINK;
 
@@ -134 +138 @@
 /* mlock utilities
  */
-int sh_unix_mlock(void * addr, size_t len);
+int sh_unix_mlock(char * file, int line, void * addr, size_t len);
 int sh_unix_munlock(void * addr, size_t len);
 int sh_unix_count_mlock();