Rainer Gerhards
17ed6cff30
Merge branch 'v6-devel'
2012-10-02 15:14:18 +02:00
Rainer Gerhards
3a7c280e93
integrate logctl into build process
2012-10-02 15:07:41 +02:00
Rainer Gerhards
8062f67442
Merge branch 'v6-devel'
2012-10-02 11:43:27 +02:00
Rainer Gerhards
ca7cd5ef9c
Merge branch 'v6-stable' into v6-devel
2012-10-02 11:42:54 +02:00
Rainer Gerhards
c7ccf7d322
Merge branch 'v5-stable' into v6-stable
2012-10-02 11:22:06 +02:00
Rainer Gerhards
3496d1c818
minor: mention better doc in ChangeLog
2012-10-02 11:18:24 +02:00
Rainer Gerhards
fa541af577
implement "continue" RainerScript statement
2012-10-01 18:52:58 +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
b5be2270e0
preparing for 7.1.7 release
2012-10-01 17:54:10 +02:00
Rainer Gerhards
873e806df0
implement RainerScript "call" statement
2012-10-01 17:48:36 +02:00
Rainer Gerhards
11c203c673
implement imtcp "permittedPeers" module-global parameter
2012-10-01 12:00:52 +02:00
Rainer Gerhards
cdbeb9d75a
Merge branch 'master' into master-newruleset
...
Conflicts:
ChangeLog
2012-09-28 17:48:45 +02:00
Rainer Gerhards
bc9ca278b5
implement RainerScript array-based string comparison operations
2012-09-28 17:42:07 +02:00
6387d164bb
bugfix: fixed wrong bufferlength for snprintf in tcpflood.c
...
The problem occured when using the -f (dynafiles) option,
and caused some tests to fail.
2012-09-28 07:55:48 -07:00
Rainer Gerhards
cdd6328d1f
preparing for 7.1.6 release
2012-09-28 14:57:59 +02:00
Rainer Gerhards
38cdf1abad
Implement RainerScript ruleset() statement
2012-09-28 11:06:16 +02:00
Rainer Gerhards
8caf952c83
fix screwed-up ChangeLog
2012-09-28 08:45:48 +02:00
Rainer Gerhards
a96e496667
Merge branch 'v6-devel'
...
Conflicts:
ChangeLog
action.c
grammar/grammar.y
runtime/modules.h
runtime/rsconf.c
2012-09-27 16:25:53 +02:00
Rainer Gerhards
2ce900aea2
bugfix: config errors did not always cause statement to fail
...
This could lead to startup with invalid parameters.
2012-09-27 10:03:12 +02:00
Rainer Gerhards
7166461613
imfile: implement support for module parameters via module() stmt
2012-09-27 08:54:28 +02:00
Rainer Gerhards
2952b9196a
Merge branch 'v6-stable' into v6-devel-input
2012-09-26 12:26:28 +02:00
Rainer Gerhards
4cc23e9dc9
preparing for 7.1.5
2012-09-26 11:28:20 +02:00
Rainer Gerhards
f395c4f3b3
Merge branch 'v6-devel'
2012-09-26 10:57:06 +02:00
Rainer Gerhards
27beafede1
Merge branch 'v6-stable' into v6-devel
2012-09-26 10:56:30 +02:00
Rainer Gerhards
8812ffd58b
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
plugins/imrelp/imrelp.c
2012-09-26 10:56:19 +02:00
Apollon Oikonomopoulos
136f6e0978
enable DNS resolution in imrelp
2012-09-26 10:54:42 +02:00
Rainer Gerhards
63f41c3efe
doc: add recent changes to ChangeLog
2012-09-24 11:54:37 +02:00
Rainer Gerhards
32a882199a
Merge branch 'v6-stable' into v6-devel
2012-09-21 18:20:45 +02:00
Rainer Gerhards
e072512e46
Merge branch 'v6-stable' into master-newruleset
...
Conflicts:
grammar/lexer.l
2012-09-21 12:22:59 +02:00
Rainer Gerhards
1be79d5467
bugfix: some valid legacy PRI filters were flagged as errornous
...
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358
This happend to filters of the style "local0,local1.*", where the
multiple facilities were comma-separated.
2012-09-21 11:57:55 +02:00
Rainer Gerhards
24a248d021
Implement RainerScript prifield() function
2012-09-20 15:08:39 +02:00
Rainer Gerhards
a5dcf8cdb7
Implement RainerScript field() function
2012-09-20 11:26:24 +02:00
Rainer Gerhards
dc40e3b43f
Merge branch 'v6-devel'
2012-09-20 10:08:35 +02:00
Rainer Gerhards
760b23aac9
Merge branch 'v6-stable' into v6-devel
...
Conflicts:
ChangeLog
2012-09-20 10:08:24 +02:00
Rainer Gerhards
1e6469e920
doc: add last bugfix to ChangeLog
2012-09-20 10:07:24 +02:00
Rainer Gerhards
83b9b63e46
Merge branch 'v6-devel'
2012-09-20 09:44:53 +02:00
Rainer Gerhards
8815435209
Merge branch 'v6-stable' into v6-devel
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-09-20 09:41:40 +02:00
Rainer Gerhards
e99ca8246f
preparing for 6.4.2 release
2012-09-20 09:39:42 +02:00
Rainer Gerhards
762c1a81d5
bugfix: config validation run did not always return correct return state
2012-09-20 08:41:32 +02:00
Rainer Gerhards
c0e35e864a
bugfix: config validation run did not always return correct return state
2012-09-20 08:31:03 +02:00
Rainer Gerhards
1b1b2a1651
Merge branch 'v6-devel'
2012-09-19 18:57:37 +02:00
Rainer Gerhards
a85784a480
Merge branch 'v6-stable' into v6-devel
2012-09-19 18:57:24 +02:00
Rainer Gerhards
b40c83090e
bugfix: potential abort, if action queue could not be properly started
...
This most importantly could happen due to configuration errors.
2012-09-19 18:57:02 +02:00
Rainer Gerhards
80fb1eb77a
preparing for 7.1.4 release
2012-09-19 15:51:00 +02:00
Rainer Gerhards
5227871598
bugfix: debug output indicated improper queue type
2012-09-19 15:12:45 +02:00
Rainer Gerhards
67aebe1d0f
bugfix: omfile action did not respect "template" parameter
...
... and used default template in all cases
2012-09-19 14:49:57 +02:00
Rainer Gerhards
708b695283
Implement ability for CEE-based properties to be stored in disk queues
2012-09-19 14:19:55 +02:00
Rainer Gerhards
322b646204
doc: announce new features in ChangeLog
2012-09-19 12:35:17 +02:00
Rainer Gerhards
294630b886
bugfix: MsgDup() did not copy CEE structure
...
This function was called at various places, most importantly during
"last messages repeated n times" processing and omruleset. If CEE(JSON)
data was present, it was lost as part of the copy process.
2012-09-19 12:33:17 +02:00
Rainer Gerhards
1c68329a62
preparing for 7.1.3 release
2012-09-17 10:37:00 +02:00
