26 Commits

Author SHA1 Message Date
Rainer Gerhards
2387c9281d fix: ruleset queues were activated too early
This does not cause issues in v7, but here we have the problem
that the total number of actions, which now is required for wti sizing,
is not available at that early stage. So we needed to delay queue
startup until everything is processed (just as it should have been
already!). Note the previously we could have a segfault on first message
when ruleset queues were used.
2013-11-14 15:51:52 +01:00
Rainer Gerhards
9052857047 Merge branch 'master' into master-ruleeng
Conflicts:
	runtime/ruleset.c
2013-11-05 10:33:24 +01:00
Rainer Gerhards
938eff729c Merge branch 'v7-stable' 2013-11-05 10:01:22 +01:00
Rainer Gerhards
1f59e66eef milestone: calling sequence changed so that wti is passed to many functions 2013-10-26 17:56:04 +02:00
Rainer Gerhards
7d39740b3d refactor: use common code for message property description processing
in all cases except script var access -- this comes next...
2013-10-22 17:55:35 +02:00
Rainer Gerhards
696c084e51 bugfix: call to ruleset with async queue did not use the queue
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=443
2013-06-26 11:16:32 +02:00
Rainer Gerhards
81c8658769 bugfix: ruleset(){} directive errornously changed default ruleset
much like the $ruleset legacy conf statement. This potentially lead
to statements being assigned to the wrong ruleset.
2012-10-01 18:26:48 +02:00
Rainer Gerhards
38cdf1abad Implement RainerScript ruleset() statement 2012-09-28 11:06:16 +02:00
Rainer Gerhards
7351fcc0e2 Add skeleton for RainerScript optimizer
actual optimization is not yet done
2012-09-20 16:11:22 +02:00
Rainer Gerhards
77ea54a5b9 new ruleengine: restore action iterator functionality 2012-09-06 17:17:50 +02:00
Rainer Gerhards
200e08ac42 new ruleengine: some cleanup 2012-09-06 11:09:16 +02:00
Rainer Gerhards
b473bae2d7 new ruleengine: skeleton for reading conf file in place
code still does not work, actual functions not implemented
2012-09-04 12:35:36 +02:00
Rainer Gerhards
30b0a28786 Merge branch 'v6-stable'
Conflicts:
	runtime/msg.c
	runtime/ruleset.c
	runtime/ruleset.h
2012-04-18 16:37:04 +02:00
Rainer Gerhards
68538a9013 bugfix: assigned ruleset was lost when using disk queues
This looked quite hard to diagnose for disk-assisted queues, as the
pure memory part worked well, but ruleset info was lost for messages
stored inside the disk queue.
2012-04-18 15:13:27 +02:00
Rainer Gerhards
ac9afc4149 Merge branch 'v5-stable' into master
Conflicts:
	ChangeLog
	action.h
	configure.ac
	doc/manual.html
	plugins/immark/immark.c
	plugins/impstats/impstats.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	runtime/cfsysline.c
	runtime/cfsysline.h
	runtime/conf.c
	runtime/ctok.c
	runtime/ctok.h
	runtime/ctok_token.c
	runtime/ctok_token.h
	runtime/dnscache.h
	runtime/expr.c
	runtime/expr.h
	runtime/rule.c
	runtime/rule.h
	runtime/ruleset.h
	runtime/sysvar.c
	runtime/vm.h
	runtime/vmop.c
	runtime/vmop.h
	runtime/vmprg.c
	runtime/vmprg.h
	runtime/vmstk.c
	runtime/vmstk.h
	tools/omusrmsg.c
2012-01-18 14:08:24 +01:00
Rainer Gerhards
18e60f46a1 Merge branch 'v4-stable' into v5-stable
Conflicts:
	runtime/debug.h
	runtime/obj.c
	runtime/parser.h
	runtime/wti.h
2012-01-16 16:14:30 +01:00
Rainer Gerhards
bd22bf8cb4 license changes 2012-01-16 15:23:01 +01:00
Rainer Gerhards
e579791a78 more cleanup 2011-07-15 15:01:30 +02:00
Rainer Gerhards
542fd33006 some more work was required on the ruleset modification 2011-04-19 12:37:39 +02:00
Rainer Gerhards
b722cd3fe6 milestone: ruleset now supports rsconf_t 2011-04-19 12:18:26 +02:00
Rainer Gerhards
fe8d317c1b milestone commit(BUGGY): batch is now handed down to rule processing
Now, the full batch is passed down to the rule, which then enqueues
the elements as single messages. Note that this code has some known
defects and needs more changes until it is correct again. This is
primarily a commit to be able to return to a known-(somewhat)-good
state.
2010-06-10 14:36:49 +02:00
Rainer Gerhards
1b7f5c5468 moved rfc3164/5424 code to new parser modules
another milestone commit: the program works, the new interface
is used, some more cleanup is needed and the per-ruleset config
options are still missing. But we are getting closer...
2009-11-04 10:40:27 +01:00
Rainer Gerhards
b1db196953 one step closer to dynamically loadable parsers
This is a milestone commit, which adds new code that breaks
nothing, but also does not add any visible change. Just prep work...
2009-11-03 18:44:02 +01:00
Rainer Gerhards
1ada506e2d added the capability to have ruleset-specific main message queues
This offers considerable additional flexibility AND superior performance
(in cases where multiple inputs now can avoid lock contention)
2009-10-27 17:31:27 +01:00
Rainer Gerhards
ca0ddc30a3 completed multi-ruleset core support
... as well as added multi-ruleset support for imtcp
2009-06-12 15:31:08 +02:00
Rainer Gerhards
6f4e3c4e4c restructered code in perparation for multiple rule set support
... this was long overdue, and I finlly tackeld it. It turned out to
be more complex than I initially thought. The next step now probably is
to actually implement multiple rule sets and the beauty that comes
with them.
2009-06-10 16:49:14 +02:00