summaryrefslogtreecommitdiffstats
path: root/runtime/rule.h
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/rule.h')
-rw-r--r--runtime/rule.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/rule.h b/runtime/rule.h
index 309a2ed8..76ed5f0b 100644
--- a/runtime/rule.h
+++ b/runtime/rule.h
@@ -2,7 +2,7 @@
*
* This implements rules within rsyslog.
*
- * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2009-2011 Rainer Gerhards and Adiscon GmbH.
*
* This file is part of the rsyslog runtime library.
*
@@ -25,9 +25,10 @@
#ifndef INCLUDED_RULE_H
#define INCLUDED_RULE_H
+#include "libestr.h"
#include "linkedlist.h"
#include "regexp.h"
-#include "expr.h"
+#include "rainerscript.h"
/* the rule object */
struct rule_s {
@@ -49,8 +50,9 @@ struct rule_s {
cstr_t *pCSCompValue; /* value to "compare" against */
sbool isNegated;
propid_t propID; /* ID of the requested property */
+ es_str_t *propName; /* name of property for CEE-based filters */
} prop;
- expr_t *f_expr; /* expression object */
+ struct cnfexpr *expr; /* expression object */
} f_filterData;
ruleset_t *pRuleset; /* associated ruleset */