Changeset 496 for trunk

Timestamp:

Dec 7, 2015, 7:04:28 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #393 (wrong policy assigned).

Location:

trunk

Files:

• include/sh_inotify.h (modified) (1 diff)
• include/sh_modules.h (modified) (1 diff)
• src/samhain.c (modified) (1 diff)
• src/sh_fInotify.c (modified) (5 diffs)
• src/sh_inotify.c (modified) (3 diffs)
• src/sh_modules.c (modified) (1 diff)
• src/sh_pthread.c (modified) (1 diff)

trunk/include/sh_inotify.h

@@ -45 +45 @@
 void sh_inotify_remove(sh_watches * watches);
 void sh_inotify_init(sh_watches * watches);
+void sh_inotify_close();
 
 char * sh_inotify_search_item(sh_watches * watches, int watch, 

trunk/include/sh_modules.h

@@ -7 +7 @@
 enum
   {
-    SH_MODFL_NOTIMER = (1 << 0)
+    SH_MODFL_NOTIMER    = (1 << 0),
+    SH_MODFL_NEEDPAUSED = (1 << 1),
+    SH_MODFL_ISPAUSED   = (1 << 2)
   };
 

trunk/src/samhain.c

@@ -1250 +1250 @@
   
   sh_thread_pause_flag = S_TRUE;
+
+  for (modnum = 0; modList[modnum].name != NULL; ++modnum) 
+    {
+      if (0 != (SH_MODFL_NEEDPAUSED & modList[modnum].flags) &&
+          modList[modnum].initval == SH_MOD_THREAD)
+        {
+          int count = 50;
+          while (count && 0 == (SH_MODFL_ISPAUSED & modList[modnum].flags))
+            retry_msleep(0, 100), --count;
+        }
+    }
   
 #if defined(WITH_EXTERNAL)

trunk/src/sh_fInotify.c

@@ -52 +52 @@
 
 static int ShfInotifyActive = S_FALSE;
+static int ShfInotifyClose  = S_FALSE; /* for reconf, mark instance for closing */
 
 static unsigned long ShfInotifyWatches = 0;
@@ -154 +155 @@
     {
       /* Reconfigure from main thread */
-      /* sh_fInotify_init_internal(); */
+
       SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_DOSCAN;   );
       SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_NEEDINIT; );
@@ -175 +176 @@
     {
       return SH_MOD_FAILED;
+    }
+
+  if (ShfInotifyClose == S_TRUE)
+    {
+      ShfInotifyClose = S_FALSE;
+      sh_inotify_close();
     }
 
@@ -261 +268 @@
 }
 
+/* This runs in the main thread, so it won't close
+ * the (threadspecific) inotify instance.
+ */
 int sh_fInotify_reconf()
 {
@@ -267 +277 @@
   ShfInotifyWatches = 0;
   ShfInotifyActive  = 0;
+
+  ShfInotifyClose   = S_TRUE;
 
   return sh_fInotify_cleanup();

trunk/src/sh_inotify.c

@@ -427 +427 @@
 }
 
-
+void sh_inotify_close()
+{
+  int     ifd = sh_inotify_getfd();
+
+  if (ifd >= 0)
+    close(ifd);
+  sh_set_inotify_fd(-1);
+
+  return;
+}
+
+  
 /* This function removes all watches from the list,
  * and closes the inode file descriptor in this thread.
@@ -433 +444 @@
 void sh_inotify_remove(sh_watches * watches)
 {
-  int     ifd = sh_inotify_getfd();
   zAVLTree   * all_watches;
 
@@ -446 +456 @@
   SH_MUTEX_UNLOCK(mutex_watches);
 
-  if (ifd >= 0)
-    close(ifd);
-  sh_set_inotify_fd(-1);
-
+  sh_inotify_close();
   return;
 }

trunk/src/sh_modules.c

@@ -160 +160 @@
     N_("INOTIFY"),
     -1,
-    0,
+    SH_MODFL_NEEDPAUSED,
     sh_fInotify_init,
     sh_fInotify_timer,

trunk/src/sh_pthread.c

@@ -184 +184 @@
           while (1)
             {
-              if (sh_thread_pause_flag != S_TRUE && 
-                  0 != this_module->mod_timer(time(NULL)))
+              if (sh_thread_pause_flag != S_TRUE)
                 {
-                  /* 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();
+                  this_module->flags &= ~SH_MODFL_ISPAUSED;
+                  
+                  if (0 != this_module->mod_timer(time(NULL)))
+                    {
+                      /* 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();
+                    }
                 }
-              if (0 == (SH_MODFL_NOTIMER & this_module->flags))
+              else
+                {
+                  this_module->flags |= SH_MODFL_ISPAUSED;
+                }
+              if (0 == (SH_MODFL_NOTIMER & this_module->flags) ||
+                  sh_thread_pause_flag == S_TRUE)
                 retry_msleep(1,0);
             }