Changeset 140 for trunk/src

Timestamp:

Oct 29, 2007, 1:09:10 AM (17 years ago)

Author:

rainer

Message:

Utility function for threaded modules.

Location:

trunk/src

Files:

• samhain.c (modified) (2 diffs)
• sh_error.c (modified) (9 diffs)
• sh_kern.c (modified) (2 diffs)
• sh_mem.c (modified) (3 diffs)
• sh_modules.c (modified) (9 diffs)
• sh_mounts.c (modified) (1 diff)
• sh_portcheck.c (modified) (1 diff)
• sh_processcheck.c (modified) (1 diff)
• sh_pthread.c (modified) (3 diffs)
• sh_suidchk.c (modified) (1 diff)
• sh_userfiles.c (modified) (1 diff)
• sh_utmp.c (modified) (1 diff)

trunk/src/samhain.c

@@ -1637 +1637 @@
   for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
     {
-      if (0 != (status = modList[modnum].mod_init()))
+      if ( 0 != (status = modList[modnum].mod_init(&(modList[modnum]))) )
         {
           if (status == (-1)) {
@@ -1795 +1795 @@
               for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
                 {
-                  if (0 != (status = modList[modnum].mod_init()))
+                  if (0 != (status = modList[modnum].mod_init(&(modList[modnum]))))
                     {
                       if (status == (-1)) {

trunk/src/sh_error.c

@@ -56 +56 @@
 #include "sh_forward.h"
 #include "sh_prelude.h"
+#include "sh_pthread.h"
 
 #if defined(WITH_DATABASE)
@@ -857 +858 @@
  **********************************************************/
 
+SH_MUTEX_RECURSIVE(mutex_err_handle);
+
 void sh_error_handle (int sev, char * file, long line, 
                       long status, unsigned long msg_id, ...)
@@ -868 +871 @@
 
   int    flag_inet  = S_FALSE;
+
+#ifdef SH_WITH_SERVER
   int    class_inet = clt_class;      /* initialize from global */
-
-#ifdef SH_WITH_SERVER
   char   local_inet_peer[SH_MINIBUF];
 #endif
@@ -908 +911 @@
   SL_ENTER(_("sh_error_handle"));
 
+  SH_MUTEX_RECURSIVE_INIT(mutex_err_handle);
+  SH_MUTEX_RECURSIVE_LOCK(mutex_err_handle);
+
 #ifdef SH_WITH_SERVER
   /* copy the global string into a local array
@@ -918 +924 @@
   else
     local_inet_peer[0] = '\0';
-#endif
 
   clt_class = (-1);      /* reset global */
+#endif
+
 
   if (own_block == 1)
     {
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
   /* --- Initialize to default values. ---
    */
-  own_block = 1;
   if (IsInitialized == BAD) 
     (void) sh_error_init();
-  own_block = 0;
-
-  /* --- Consistency checks. ---
-   */
-  own_block = 1;
+
+  /* Returns pointer to (constant|thread-specific) static memory
+   */
   fmt = /*@i@*/get_format (msg_id, &severity, &class);
-  own_block = 0;
-
+
+#ifdef SH_WITH_SERVER
   if (class_inet != (-1))
     class = (unsigned int) class_inet;
-
+#endif
+
+  /* --- Consistency check. ---
+   */
   ASSERT((fmt != NULL), _("fmt != NULL"))
   if (fmt == NULL)
@@ -949 +956 @@
               _("ERROR: msg=<NULL format>, file=<%s>, line=<%ld>\n"), 
               file, line);
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
@@ -995 +1002 @@
        )
     {
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
   if ((severity & SH_ERR_NOT) != 0)
     {
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
@@ -1017 +1024 @@
   lmsg->line     = line;
   lmsg->status   = status;
-  own_block = 0;
-
 
   /* Format the log message with timestamp etc.
    * Allocate lmsg->msg
    */
-  own_block = 1;
   va_start (vl, msg_id);
   (void) sh_error_string (lmsg, vl);
@@ -1311 +1315 @@
   SH_FREE( lmsg );
   own_block = 0;
+
+ exit_here:
+
+  SH_MUTEX_RECURSIVE_UNLOCK(mutex_err_handle);
 
   /*@i@*/SL_RET0(_("sh_error_handle"));

trunk/src/sh_kern.c

@@ -1754 +1754 @@
 static int AddressReconf = 0;
 
-int sh_kern_init ()
+int sh_kern_init (struct mod_type * arg)
 {
 #if defined(HOST_IS_LINUX)
@@ -1760 +1760 @@
   char         * str;
 #endif
+  (void) arg;
 
   SL_ENTER(_("sh_kern_init"));

trunk/src/sh_mem.c

@@ -256 +256 @@
           eblock = 1;
           (void) safe_logger (0, 0, NULL);
-          /*
-          sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_E_MMEM,
-                           file, line);
-          */
           eblock = 0;
         }
@@ -348 +344 @@
           eblock = 1;
           (void) safe_logger(0, 0, NULL);
-          /*
-          sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_E_MMEM,
-                           file, line);
-          */
           eblock = 0;
         }
@@ -491 +483 @@
           eblock = 1;
           (void) safe_logger(0, 0, NULL);
-          /*
-          sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_E_MMEM);
-          */
           eblock = 0;
         }

trunk/src/sh_modules.c

@@ -7 +7 @@
 
 #include "sh_modules.h"
+#include "sh_pthread.h"
 
 #include "sh_utmp.h"
@@ -29 +30 @@
     N_("[Utmp]"),
     sh_utmp_table,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 #endif
@@ -44 +46 @@
     N_("[Mounts]"),
     sh_mounts_table,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 #endif
@@ -59 +62 @@
     N_("[UserFiles]"),
     sh_userfiles_table,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 #endif
@@ -74 +78 @@
     N_("[Kernel]"),
     sh_kern_table,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 #endif
@@ -89 +94 @@
     N_("[SuidCheck]"),
     sh_suidchk_table,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 #endif
@@ -104 +110 @@
     N_("[ProcessCheck]"),
     sh_prochk_table,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 #endif
@@ -119 +126 @@
     N_("[PortCheck]"),
     sh_portchk_table,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 #endif
@@ -134 +142 @@
     NULL,
     NULL,
+    PTHREAD_MUTEX_INITIALIZER,
   },
 };

trunk/src/sh_mounts.c

@@ -165 +165 @@
  * This is called once at the start of each samhain run.
  * Non-configuration setup code should be placed here. */
-int sh_mounts_init ()
-{
+int sh_mounts_init (struct mod_type * arg)
+{
+  (void) arg;
   SL_ENTER(_("sh_mounts_init"));
 

trunk/src/sh_portcheck.c

@@ -815 +815 @@
 #endif
 
-int sh_portchk_init ()
+int sh_portchk_init (struct mod_type * arg)
 {
   struct hostent * hent;
   int              i = 0;
   char errbuf[256];
+  (void) arg;
 
   if (portchk_debug)

trunk/src/sh_processcheck.c

@@ -1150 +1150 @@
 /* Initialise. 
  */
-int sh_prochk_init(void) 
-{
+int sh_prochk_init(struct mod_type * arg) 
+{
+  (void) arg;
   SL_ENTER(_("sh_prochk_init"));
 

trunk/src/sh_pthread.c

@@ -2 +2 @@
 
 #include "sh_pthread.h"
+#include "sh_modules.h"
 
 #ifdef HAVE_PTHREAD
+
+#include <signal.h>
+#include "sh_calls.h"
+
 SH_MUTEX_INIT(mutex_skey,   PTHREAD_MUTEX_INITIALIZER);
 SH_MUTEX_INIT(mutex_resolv, PTHREAD_MUTEX_INITIALIZER);
@@ -15 +20 @@
 }
 
+int sh_pthread_init_threadspecific()
+{
+  int rc = 0;
+#ifdef SH_STEALTH
+  extern int sh_g_thread();
+
+  rc = sh_g_thread();
+  if (rc != 0)
+    return rc;
+#endif
+
+  return rc;
+}
+
+
+/* 
+ *  ----  Utilities for modules  ----
+ */
+
+/* MODULES: init()
+ *             -- starts thread_run() function if threaded
+ *             -- fallback on internal_init if threading fails
+ *             -- and returns MODULE_INACTIVE/MODULE_ACTIVE/MODULE_THREADED
+ *
+ *                int retval = MODULE_INACTIVE;
+ *                if (0 != sh_pthread_create(thread_run, NULL))
+ *                   return internal_init();
+ *                return MODULE_THREADED;
+ *
+ *          thread_run() 
+ *             -- calls internal init, 
+ *             -- polls timer, 
+ *             -- runs module check,
+ *             -- runs sh_pthread_testcancel()
+ *             -- returns (return == exit)
+ */
+
+#define SH_NUM_THREADS 16
+static pthread_t threads[SH_NUM_THREADS];
+static int       ithread[SH_NUM_THREADS];
+static pthread_mutex_t  create_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+int sh_pthread_create(void *(*start_routine)(void*), void *arg)
+{
+  int rc, nthread = 1;
+  sigset_t signal_set;
+  int retval = 0;
+
+  pthread_mutex_lock(&create_mutex);
+
+  /* block all signals 
+   */
+  sigfillset( &signal_set );
+  pthread_sigmask( SIG_BLOCK, &signal_set, NULL );
+
+  /* find a free slot in threads[]
+   */
+  while (nthread < SH_NUM_THREADS) 
+    {
+      if (ithread[nthread] == 0)
+        break;
+      ++nthread;
+      if (nthread == SH_NUM_THREADS)
+        {
+          retval = -1;
+          goto err_out;
+        }
+    } 
+
+  rc = pthread_create(&threads[nthread], NULL, start_routine, arg);
+  if (rc != 0)
+    {
+      retval = -1;
+      goto err_out;
+    }
+
+  ithread[nthread] = 1;
+
+ err_out:
+  pthread_sigmask( SIG_UNBLOCK, &signal_set, NULL );
+  pthread_mutex_unlock(&create_mutex);
+  return retval;
+}
+
+int sh_pthread_cancel_all()
+{
+  int i;
+  int ret = 0;
+
+  SH_MUTEX_LOCK(create_mutex);
+
+  for (i = 1; i < SH_NUM_THREADS; ++i)
+    {
+      if (ithread[i] != 0)
+        if (0 != pthread_cancel(threads[i]))
+          ithread[i] = 0;
+    }
+
+  for (i = 1; i < SH_NUM_THREADS; ++i)
+    {
+      if (ithread[i] != 0)
+        pthread_join(threads[i], NULL);
+      ithread[i] = 0;
+    }
+
+  SH_MUTEX_UNLOCK(create_mutex);
+  return ret;
+}
+
+/* ---- Utility functions for modules ----
+ */
+void sh_threaded_module_reconf(void *arg)
+{
+  sh_mtype * this_module = (sh_mtype *) arg;
+  this_module->mod_reconf();
+  return;
+}
+
+void sh_threaded_module_run(void *arg)
+{
+  sh_mtype * this_module = (sh_mtype *) arg;
+
+  /* First we lock the module. This ensures that it cannot be
+   * run twice.
+   */
+  pthread_cleanup_push(sh_pthread_mutex_unlock, (void*) &(this_module->mod_mutex));
+  pthread_mutex_lock(&(this_module->mod_mutex));
+
+  if (0 == sh_pthread_init_threadspecific())
+    {
+
+      if (0 == this_module->mod_init(NULL))
+        {
+          pthread_cleanup_push(sh_threaded_module_reconf, arg);
+
+          while (1)
+            {
+              if (0 != this_module->mod_timer(time(NULL)))
+                {
+                  this_module->mod_check();
+                  pthread_testcancel();
+                  retry_msleep(1,0);
+                }
+            }
+
+          pthread_cleanup_pop(1); /* notreached,but required */
+        }
+    }
+
+  pthread_cleanup_pop(1);
+
+  return;
+}
+
+
+/*
+ *  ----  Implementation of recursive mutexes from libxml2  ----
+ */
 #if !defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
 /**
@@ -21 +184 @@
  * Gary Pennington <Gary.Pennington@uk.sun.com>
  * daniel@veillard.com
- */
-
+ 
+ * Except where otherwise noted in the source code (e.g. the files hash.c,
+ * list.c and the trio files, which are covered by a similar licence but
+ * with different Copyright notices) all the files are:
+ *
+ *    Copyright (C) 1998-2003 Daniel Veillard.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is fur-
+ * nished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+ * NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+ * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Daniel Veillard shall not
+ * be used in advertising or otherwise to promote the sale, use or other deal-
+ * ings in this Software without prior written authorization from him.
+ */
+
+/* Modified NewRMutex -> InitRMutex. We use a static structure, rather than 
+ * allocating one. Also dropped code for non-POSIX OSes.
+ */
 void sh_InitRMutex(struct sh_RMutex * tok)
 {

trunk/src/sh_suidchk.c

@@ -1172 +1172 @@
  *
  *************/
-int sh_suidchk_init ()
-{
+int sh_suidchk_init (struct mod_type * arg)
+{
+  (void) arg;
   if (ShSuidchkActive == S_FALSE)
     return (-1);

trunk/src/sh_userfiles.c

@@ -246 +246 @@
 /* Build the list of users, then use this to construct the filenames to
  * be checked. */
-int sh_userfiles_init(void) {
+int sh_userfiles_init(struct mod_type * arg) {
     struct passwd *cur_user;
     struct userhomeslist *end;
     struct userhomeslist *new;
     struct userhomeslist *homes;
+    (void) arg;
 
     SL_ENTER(_("sh_userfiles_init"));

trunk/src/sh_utmp.c

@@ -461 +461 @@
  *
  *************/
-int sh_utmp_init ()
+int sh_utmp_init (struct mod_type * arg)
 {
   static int done = 0;
+  (void) arg;
 
   SL_ENTER(_("sh_utmp_init"));