Changeset 149 for trunk/src/samhain.c

Timestamp:

Jan 7, 2008, 8:52:13 PM (17 years ago)

Author:

katerina

Message:

Make sh_hash.c thread-safe, remove plenty of tiny allocations, improve sh_mem_dump, modify port check to run as thread, and fix unsetting of sh_thread_pause_flag (was too early).

File:

• trunk/src/samhain.c (modified) (7 diffs)

trunk/src/samhain.c

@@ -818 +818 @@
   if (0 != stat(SH_INSTALL_PATH, &buf))
     {
-      dummy = pidlist;
+      dummy = (pid_t *)pidlist;
       free(dummy);
       return NULL;
@@ -827 +827 @@
   if (NULL == (dp = opendir("/proc")))
     {
-      dummy = pidlist;
+      dummy = (pid_t *)pidlist;
       free(dummy);
       return NULL;
@@ -858 +858 @@
 
   closedir(dp);
-  return pidlist;
+  return (pid_t *)pidlist;
 }
 #else
@@ -1755 +1755 @@
               for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
                 {
-                  if (modList[modnum].initval >= SH_MOD_ACTIVE)
-                    (void) modList[modnum].mod_reconf();
+                  /* sh_thread_pause_flag is true, and we block in lock
+                   * until check has returned, so we are sure check will
+                   * not run until sh_thread_pause_flag is set to false
+                   */
+                  /* if (modList[modnum].initval >= SH_MOD_ACTIVE) */
+                  (void) modList[modnum].mod_reconf();
                 }
 #endif
@@ -1801 +1805 @@
                 }
 
-              sh_thread_pause_flag = S_FALSE;
 
               /* --- Initialize modules. ---
@@ -1832 +1835 @@
                     }
                 }
+
+              /* module is properly set up now
+               */
+              sh_thread_pause_flag = S_FALSE;
               
               --sig_raised;
@@ -2069 +2076 @@
         sh_hash_writeout ();
 
+      /* no-op unless MEM_LOG is defined in sh_mem.c
+       */
+#ifdef MEM_DEBUG
+      sh_mem_dump ();
+#endif
+
       /* no loop if not daemon
        */