Changeset 183 for trunk/include

Timestamp:

Oct 26, 2008, 12:59:48 PM (16 years ago)

Author:

katerina

Message:

Support for logfile monitoring (ticket #122). Also improved some configure error messages.

Location:

trunk/include

Files:

• sh_cat.h (modified) (1 diff)
• sh_log_check.h (added)
• sh_log_evalrule.h (added)
• sh_logmon.h (added)
• sh_string.h (modified) (2 diffs)
• sh_unix.h (modified) (1 diff)
• slib.h (modified) (1 diff)

trunk/include/sh_cat.h

@@ -157 +157 @@
 #ifdef SH_USE_USERFILES
  MSG_USERFILES_SUMMARY,
+#endif
+
+#ifdef USE_LOGFILE_MONITOR
+ MSG_LOGMON_CHKS,
+ MSG_LOGMON_CHKE,
+ MSG_LOGMON_MISS,
+ MSG_LOGMON_EOPEN,
+ MSG_LOGMON_EREAD,
+ MSG_LOGMON_REP,
+ MSG_LOGMON_SUM,
 #endif
 

trunk/include/sh_string.h

@@ -19 +19 @@
 /* concat string to sh_string
  */
-sh_string * sh_string_cat_lchar(sh_string * s, char * str, size_t len);
+sh_string * sh_string_cat_lchar(sh_string * s, const char * str, size_t len);
+
+/* add char array to end of string */
+sh_string * sh_string_add_from_char(sh_string * s, const char * str);
 
 /* set sh_string from string
  */
-sh_string * sh_string_set_from_char(sh_string * s, char * str);
+sh_string * sh_string_set_from_char(sh_string * s, const char * str);
 
 /* create new sh_string from array of given length
  */
-sh_string * sh_string_new_from_lchar(char * str, size_t len);
+sh_string * sh_string_new_from_lchar(const char * str, size_t len);
 
-#define sh_string_copy(a) ((a) ? sh_string_new_from_lchar(((a)->str), ((a)->len)) : NULL)
+#define sh_string_copy(a)  ((a) ? sh_string_new_from_lchar(((a)->str), ((a)->len)) : NULL)
+#define sh_string_add(a,b) ((a && b) ? sh_string_add_from_lchar((a), ((b)->str), ((b)->len)) : NULL)
 
 /* create new sh_string from three arrays of given length
  */
-sh_string * sh_string_new_from_lchar3(char * str1, size_t len1,
-                                      char * str2, size_t len2,
-                                      char * str3, size_t len3);
+sh_string * sh_string_new_from_lchar3(const char * str1, size_t len1,
+                                      const char * str2, size_t len2,
+                                      const char * str3, size_t len3);
 
 /* Truncate to desired length.
@@ -45 +49 @@
 sh_string * sh_string_grow(sh_string * s, size_t increase);
 
+/* Read a string from a file, with maxlen. Return 0 on EOF,
+ * -1 on error, and -2 if a line exceeds maxlen.
+ */
+size_t sh_string_read(sh_string * s, FILE * fp, size_t maxlen);
+
+/* Split array at delim in at most nfields fields. 
+ * Empty fields are returned as empty (zero-length) strings. 
+ * Leading and trailing WS are removed from token. 
+ * The number of fields is returned in 'nfields', their
+ * lengths in 'lengths'.
+ * A single delimiter will return two empty fields.
+ */
+char ** split_array(char *line, unsigned int * nfields, 
+                    char delim, size_t * lengths);
+
+/* Split array at whitespace in at most nfields fields.
+ * Multiple whitespaces are collapsed. 
+ * Empty fields are returned as empty (zero-length) strings.
+ * The number of fields is returned in nfields.
+ * An empty string will return zero fields.
+ * If nfields < actual fields, last string will be remainder.
+ */
+char ** split_array_ws(char *line, unsigned int * nfields, size_t * lengths);
+
+/* Replaces fields in s with 'replacement'. Fields are given
+ * in the ordered array ovector, comprising ovecnum pairs 
+ * ovector[i], ovector[i+1] which list offset of first char
+ * of field, offset of first char after field (this is how
+ * the pcre library does it).
+ */  
+sh_string * sh_string_replace(const sh_string * s, 
+                              const int * ovector, int ovecnum, 
+                              const char * replacement, size_t rlen);
+
 #endif

trunk/include/sh_unix.h

@@ -243 +243 @@
 /* check a file 
  */
-int tf_trust_check (char * file, int mode);
+int tf_trust_check (const char * file, int mode);
 
 /* initialize group vector

trunk/include/slib.h

@@ -405 +405 @@
   /* Check whether file is trustworthy.
    */
-  int sl_trustfile(char * path, uid_t * ok, uid_t * bad);
+  int sl_trustfile(const char * path, uid_t * ok, uid_t * bad);
 
   /* Check whether file is trustworthy.
    */
-  int sl_trustfile_euid(char * filename, uid_t euid);
+  int sl_trustfile_euid(const char * filename, uid_t euid);
 
   /* purge list of trusted users