Changeset 373 for trunk/include

Timestamp:

Nov 1, 2011, 9:29:51 PM (13 years ago)

Author:

katerina

Message:

Patch for ticket #265 (inotify). Handling of added subdirectories and file list rescan.

Location:

trunk/include

Files:

• samhain.h (modified) (1 diff)
• sh_files.h (modified) (2 diffs)
• sh_inotify.h (modified) (2 diffs)
• sh_unix.h (modified) (1 diff)
• sh_utils.h (modified) (1 diff)

trunk/include/samhain.h

@@ -205 +205 @@
 #define SH_INOTIFY_DOSCAN   (1<<1)
 #define SH_INOTIFY_NEEDINIT (1<<2)
+#define SH_INOTIFY_INSCAN   (1<<3)
 
 

trunk/include/sh_files.h

@@ -21 +21 @@
 #define SH_FILES_H
 
-void sh_audit_mark (char * file);
+void sh_audit_mark (const char * file);
 void sh_audit_delete_all ();
 char * sh_audit_fetch (char * file, time_t time, char * result, size_t rsize);
@@ -226 +226 @@
 
 ShFileType sh_files_filecheck (int class, unsigned long check_mask,
-                               char * dirName, 
-                               char * infileName,
+                               const char * dirName, 
+                               const char * infileName,
                                int * reported, 
                                int rsrcflag);
 
-int sh_files_search_file(char * name, int * class, unsigned long *check_mask, int * reported);
-void sh_files_set_file_reported(char * name);
-void sh_files_clear_file_reported(char * name);
+int sh_files_checkdir (int iclass, unsigned long check_mask, 
+                       int idepth, char * iname, 
+                       char * relativeName);
+
+int sh_files_search_file(char * name, int * class, 
+                         unsigned long *check_mask, int * reported);
+int sh_files_search_dir(char * name, int * class, 
+                        unsigned long *check_mask, int *reported,
+                        int * rdepth);
+void sh_files_set_file_reported(const char * name);
+void sh_files_clear_file_reported(const char * name);
 
 #endif

trunk/include/sh_inotify.h

@@ -32 +32 @@
 
 int sh_inotify_add_watch(char * filename, sh_watches * watches, int  * errnum,
-                         int class, unsigned long check_mask, int type);
+                         int class, unsigned long check_mask, int type, int rdepth);
 
-int sh_inotify_add_watch_later(char * filename, sh_watches * watches, int  * errnum,
-                               int class, unsigned long check_mask, int type);
+int sh_inotify_add_watch_later(const char * filename, sh_watches * watches, 
+                               int  * errnum,
+                               int class, unsigned long check_mask, 
+                               int type, int rdepth);
 
-char * sh_inotify_pop_dormant(sh_watches * watches, int * class, unsigned long * check_mask, int * type);
+char * sh_inotify_pop_dormant(sh_watches * watches, int * class, 
+                              unsigned long * check_mask, int * type, int * rdepth);
 
 void sh_inotify_purge_dormant(sh_watches * watches);
@@ -44 +47 @@
 
 char * sh_inotify_search_item(sh_watches * watches, int watch, 
-                              int * class, unsigned long * check_mask, int * type);
+                              int * class, unsigned long * check_mask, 
+                              int * type, int * rdepth);
 ssize_t sh_inotify_read(char * buffer, size_t count);
 ssize_t sh_inotify_read_timeout(char * buffer, size_t count, int timeout);

trunk/include/sh_unix.h

@@ -307 +307 @@
 /* obtain file info
  */
-int sh_unix_getinfo (int level, char * filename, file_type * theFile, 
+int sh_unix_getinfo (int level, const char * filename, file_type * theFile, 
                      char * fileHash, int flagrel);
 

trunk/include/sh_utils.h

@@ -187 +187 @@
 /* check for obscure filenames
  */
-int sh_util_obscurename (ShErrLevel level, char * name, int flag);
+int sh_util_obscurename (ShErrLevel level, const char * name, int flag);
 
 /* returns freshly allocated memory, return value should be free'd