diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-10 18:41:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-10 18:41:43 +0200 |
| commit | 7c0f8bf6c1413ab10015f656104cc3a42bea8907 (patch) | |
| tree | cfdd82d9cca0ce4a9d29b64966a1b32442c85df5 /runtime/ruleset.h | |
| parent | 9fd578a8683813fe461b0b303ad23b9ee4f56ebc (diff) | |
| parent | d3bb43798c95f9d95f9e031387f4aedd814c34ab (diff) | |
| download | rsyslog-7c0f8bf6c1413ab10015f656104cc3a42bea8907.tar.gz rsyslog-7c0f8bf6c1413ab10015f656104cc3a42bea8907.tar.bz2 rsyslog-7c0f8bf6c1413ab10015f656104cc3a42bea8907.zip | |
Merge branch 'master-newruleset'
Diffstat (limited to 'runtime/ruleset.h')
| -rw-r--r-- | runtime/ruleset.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/runtime/ruleset.h b/runtime/ruleset.h index f4443e18..50c8071e 100644 --- a/runtime/ruleset.h +++ b/runtime/ruleset.h @@ -29,9 +29,10 @@ /* the ruleset object */ struct ruleset_s { BEGINobjInstance; /* Data to implement generic object - MUST be the first data element! */ - linkedList_t llRules; /* this is NOT a pointer - no typo here ;) */ uchar *pszName; /* name of our ruleset */ qqueue_t *pQueue; /* "main" message queue, if the ruleset has its own (else NULL) */ + struct cnfstmt *root; + struct cnfstmt *last; parserList_t *pParserLst;/* list of parsers to use for this ruleset */ }; @@ -42,9 +43,7 @@ BEGINinterface(ruleset) /* name must also be changed in ENDinterface macro! */ rsRetVal (*Construct)(ruleset_t **ppThis); rsRetVal (*ConstructFinalize)(rsconf_t *conf, ruleset_t __attribute__((unused)) *pThis); rsRetVal (*Destruct)(ruleset_t **ppThis); - rsRetVal (*IterateAllActions)(rsconf_t *conf, rsRetVal (*pFunc)(void*, void*), void* pParam); rsRetVal (*DestructAllActions)(rsconf_t *conf); - rsRetVal (*AddRule)(ruleset_t *pThis, rule_t **ppRule); rsRetVal (*SetName)(ruleset_t *pThis, uchar *pszName); rsRetVal (*ProcessBatch)(batch_t*); rsRetVal (*GetRuleset)(rsconf_t *conf, ruleset_t **ppThis, uchar*); @@ -60,8 +59,12 @@ BEGINinterface(ruleset) /* name must also be changed in ENDinterface macro! */ * removed conf ptr from SetName, AddRule as the flex/bison based * system uses globals in any case. */ + /* v7, 2012-09-04 */ + /* AddRule() removed */ + /*TODO:REMOVE*/rsRetVal (*IterateAllActions)(rsconf_t *conf, rsRetVal (*pFunc)(void*, void*), void* pParam); + void (*AddScript)(ruleset_t *pThis, struct cnfstmt *script); ENDinterface(ruleset) -#define rulesetCURR_IF_VERSION 6 /* increment whenever you change the interface structure! */ +#define rulesetCURR_IF_VERSION 7 /* increment whenever you change the interface structure! */ /* prototypes */ |