Changeset 285 for trunk

Timestamp:

May 11, 2010, 8:22:06 PM (15 years ago)

Author:

katerina

Message:

Fix for ticket #209 (check for pcre_dfa_exec).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_log_correlate.c (modified) (2 diffs)
• src/sh_log_evalrule.c (modified) (3 diffs)

trunk/configure.ac

@@ -1496 +1496 @@
                           ]
            )
+           AC_CHECK_LIB(pcre, pcre_dfa_exec, [
+                              AC_DEFINE([HAVE_PCRE_DFA_EXEC], 1, [Define if you have pcre_dfa_exec])
+                              ], [
+                              AC_MSG_WARN([pcre_dfa_exec not available])
+                              ])
         fi
         ]

trunk/docs/Changelog

@@ +1 @@
+2.7.1:
+        * check for pcre_dfa_exec (not available in old versions
+          of libpcre, reported by Shinoj)
+        * patch to allow server to log client reports to prelude
+          (by J. Ventura)
+
 2.7.0a (09-05-2010):
         * fix /dev/kmem detection (reported by S. Clormann)

trunk/src/sh_log_correlate.c

@@ -271 +271 @@
                * array, otherwise number of matches is not returned.
                */
+#if defined(HAVE_PCRE_DFA_EXEC)
               int ovector[SH_MINIBUF];
               int wspace[SH_MINIBUF];
+#endif
+
+#if defined(HAVE_PCRE_DFA_EXEC)
               int val = pcre_dfa_exec(mkeep->rule, NULL, 
                                       sh_string_str(res), 
@@ -280 +284 @@
                                       ovector, SH_MINIBUF,
                                       wspace, SH_MINIBUF);
+#else
+              int val = pcre_exec(mkeep->rule, NULL, 
+                                  sh_string_str(res), 
+                                  (int)sh_string_len(res), 
+                                  0, /* start at offset 0 in the subject */
+                                  0, 
+                                  NULL, 0);
+              val = (val >= 0) ? 1 : val;                             
+#endif
+
               if (val >= 0)
                 {

trunk/src/sh_log_evalrule.c

@@ -1034 +1034 @@
     mmm = replace_captures(record->message, rule->ovector, 
                            rule->ovecnum);
+    rule->ovecnum = 0;
     msg = sh_util_safe_name_keepspace (sh_string_str(mmm));
   }
@@ -1133 +1134 @@
  */
 static int  process_counter(struct sh_ceval * counter, 
-                            struct sh_geval * rule,  struct sh_logrecord * record)
+                            struct sh_geval * rule,  
+                            struct sh_logrecord * record)
 {
   int retval = -1;
@@ -1142 +1144 @@
       counter->counted_str = replace_captures(record->message, rule->ovector, 
                                               rule->ovecnum);
+      rule->ovecnum        = 0;
       counter->filename    = sh_string_new_from_lchar(record->filename,
                                                       strlen(record->filename));