Changeset 142

Timestamp:

Oct 30, 2007, 12:17:00 AM (17 years ago)

Author:

rainer

Message:

Login watch runs in thread.

Location:

trunk/src

Files:

• samhain.c (modified) (9 diffs)
• sh_error.c (modified) (1 diff)
• sh_modules.c (modified) (8 diffs)
• sh_pthread.c (modified) (5 diffs)
• sh_utmp.c (modified) (6 diffs)

trunk/src/samhain.c

@@ -704 +704 @@
   for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
     {
-      if (modList[modnum].initval == GOOD)
+      if (modList[modnum].initval == SH_MOD_ACTIVE)
         (void) modList[modnum].mod_cleanup();
     }
+#ifdef HAVE_PTHREAD
+  sh_pthread_cancel_all();
+#endif
 #endif
 
@@ -1637 +1640 @@
   for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
     {
-      if ( 0 != (status = modList[modnum].mod_init(&(modList[modnum]))) )
+      status = modList[modnum].mod_init(&(modList[modnum]));
+      if ( status < 0 )
         {
           if (status == (-1)) {
@@ -1649 +1653 @@
                              status);
           }
-          modList[modnum].initval = S_FALSE;
+          modList[modnum].initval = SH_MOD_FAILED;
         }
       else
@@ -1655 +1659 @@
           sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MOD_OK,
                            _(modList[modnum].name));
-          modList[modnum].initval = S_TRUE;
+          modList[modnum].initval = status;
         }
     }
@@ -1744 +1748 @@
               for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
                 {
-                  if (modList[modnum].initval == GOOD)
+                  if (modList[modnum].initval >= SH_MOD_ACTIVE)
                     (void) modList[modnum].mod_reconf();
                 }
@@ -1795 +1799 @@
               for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
                 {
-                  if (0 != (status = modList[modnum].mod_init(&(modList[modnum]))))
+                  status = modList[modnum].mod_init(&(modList[modnum]));
+
+                  if (status < 0)
                     {
                       if (status == (-1)) {
@@ -1808 +1814 @@
                                          status);
                       }
-                      modList[modnum].initval = S_FALSE;
+                      modList[modnum].initval = SH_MOD_FAILED;
                     }
                   else
@@ -1814 +1820 @@
                       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MOD_OK,
                                        _(modList[modnum].name));
-                      modList[modnum].initval = S_TRUE;
+                      modList[modnum].initval = status;
                     }
                 }
@@ -2025 +2031 @@
       for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
         {
-          if (modList[modnum].initval == GOOD &&
+          if (modList[modnum].initval == SH_MOD_ACTIVE &&
               0 != modList[modnum].mod_timer(tcurrent))
             if (0 != (status = modList[modnum].mod_check()))

trunk/src/sh_error.c

@@ -20 +20 @@
 #include "config_xor.h"
 
-/* required on linux to get the correct strerror_r function
+/* Required on linux to get the correct strerror_r function. Also
+ * for recursive mutexes (_XOPEN_SOURCE >= 500).
  */
 #define _XOPEN_SOURCE 600

trunk/src/sh_modules.c

@@ -21 +21 @@
   {
     N_("UTMP"),
-    0,
+    -1,
     sh_utmp_init,
     sh_utmp_timer,
@@ -37 +37 @@
   {
     N_("MOUNTS"),
-    0,
+    -1,
     sh_mounts_init,
     sh_mounts_timer,
@@ -53 +53 @@
   {
     N_("USERFILES"),
-    0,
+    -1,
     sh_userfiles_init,
     sh_userfiles_timer,
@@ -69 +69 @@
   {
     N_("KERNEL"),
-    0,
+    -1,
     sh_kern_init,
     sh_kern_timer,
@@ -85 +85 @@
   {
     N_("SUIDCHECK"),
-    0,
+    -1,
     sh_suidchk_init,
     sh_suidchk_timer,
@@ -101 +101 @@
   {
     N_("PROCESSCHECK"),
-    0,
+    -1,
     sh_prochk_init,
     sh_prochk_timer,
@@ -117 +117 @@
   {
     N_("PORTCHECK"),
-    0,
+    -1,
     sh_portchk_init,
     sh_portchk_timer,
@@ -132 +132 @@
   {
     NULL,
-    0,
+    -1,
 
     NULL,

trunk/src/sh_pthread.c

@@ -40 +40 @@
 
 /* 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() 
+ *
+ * #ifdef HAVE_PTHREAD
+ *  if (arg != NULL)
+ *    {
+ *      if (0 == sh_pthread_create(sh_threaded_module_run, (void *)arg))
+ *        return SH_MOD_THREAD;
+ *      else
+ *        return SH_MOD_FAILED;
+ *    }
+ * #else
+ *  return sh_utmp_init_internal();
+ * #endif
+ *
+ *
+ *          sh_threaded_module_run(module_struct) 
  *             -- calls internal init, 
  *             -- polls timer, 
@@ -131 +136 @@
 /* ---- Utility functions for modules ----
  */
-void sh_threaded_module_reconf(void *arg)
+void sh_threaded_module_cleanup(void *arg)
 {
   sh_mtype * this_module = (sh_mtype *) arg;
-  this_module->mod_reconf();
+  this_module->mod_cleanup();
   return;
 }
 
-void sh_threaded_module_run(void *arg)
+void * sh_threaded_module_run(void *arg)
 {
   sh_mtype * this_module = (sh_mtype *) arg;
@@ -153 +158 @@
       if (0 == this_module->mod_init(NULL))
         {
-          pthread_cleanup_push(sh_threaded_module_reconf, arg);
+          pthread_cleanup_push(sh_threaded_module_cleanup, arg);
 
           while (1)
@@ -159 +164 @@
               if (0 != this_module->mod_timer(time(NULL)))
                 {
-                  this_module->mod_check();
+                  /* If module has been de-activated on reconfigure,
+                   * mod_check() must return non-zero.
+                   * The mod_cleanup() routine must then enable the 
+                   * module to be re-activated eventually.
+                   */
+                  if (0 != this_module->mod_check())
+                    break;
                   pthread_testcancel();
                   retry_msleep(1,0);
@@ -171 +182 @@
   pthread_cleanup_pop(1);
 
-  return;
+  return NULL;
 }
 

trunk/src/sh_utmp.c

@@ -455 +455 @@
 static struct log_user   * userlist   = NULL;
 static time_t  lastcheck;
+static int     init_done = 0;
 
 /*************
@@ -461 +462 @@
  *
  *************/
-int sh_utmp_init (struct mod_type * arg)
-{
-  static int done = 0;
-  (void) arg;
+
+static int sh_utmp_init_internal ()
+{
 
   SL_ENTER(_("sh_utmp_init"));
@@ -472 +472 @@
   /* do not re-initialize after a re-configuration
    */
-  if (done == 1) {
+  if (init_done == 1) {
     SL_RETURN( (0), _("sh_utmp_init"));
   }
@@ -480 +480 @@
   sh_utmp_check_internal (2); /* current logins */
   sh_utmp_check_internal (0);
-  done = 1;
+  init_done = 1;
   SL_RETURN( (0), _("sh_utmp_init"));
+}
+
+int sh_utmp_init (struct mod_type * arg)
+{
+  if (ShUtmpActive == BAD)
+    return SH_MOD_FAILED;
+#ifdef HAVE_PTHREAD
+  if (arg != NULL && arg->initval < 0)
+    {
+      if (0 == sh_pthread_create(sh_threaded_module_run, (void *)arg))
+        return SH_MOD_THREAD;
+      else
+        return SH_MOD_FAILED;
+    }
+#endif
+  return sh_utmp_init_internal();
 }
 
@@ -509 +525 @@
   (void) sh_utmp_login_clean();
 #endif
+  /* Reset the flag, such that the module
+   * can be re-enabled.
+   */
+  ShUtmpActive       = S_TRUE;
+  init_done          = 0;
   SL_RETURN( (0), _("sh_utmp_end"));
 }
@@ -536 +557 @@
 {
   SL_ENTER(_("sh_utmp_check"));
+  if (ShUtmpActive == BAD)
+    SL_RETURN( (-1), _("sh_utmp_check"));
   sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_UT_CHECK);
   sh_utmp_check_internal (1);