Rainer Gerhards
df90450d96
prepare for 7.1.8 release
2012-10-02 17:59:59 +02:00
Rainer Gerhards
7293018858
add "parser" parameter to ruleset(), so that parser chain can be configured
2012-10-02 17:25:32 +02:00
Rainer Gerhards
7a5cfb14ad
get rid of compiler warning
2012-10-02 15:53:17 +02:00
Rainer Gerhards
66e07f7b3e
cleanup
2012-10-02 15:41:58 +02:00
Rainer Gerhards
2ef5dd4739
mmjsonparse: also add MSG part of message if CEE-parsing fails
...
In that case, the CEE/lumberjack spec says MSG is NON-CEE and must
be treated accordingly. This means no JSON parsing happens. The case
is equal to missing CEE cookie.
Also adapted module to new interfaces provided by msg object.
2012-10-02 15:36:20 +02:00
Milan Bartos
0faec96283
Change mmjsonparse so non-json messages doesn't get lost from ceelog
...
modified: mmjsonparse.c
2012-10-02 15:26:09 +02:00
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
Ulrike Gerhards
ffab8e595e
add new tool "logctl" to access lumberjack logs in MongoDB
2012-10-02 12:18:25 +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
97d94ad9af
Merge branch 'v5-stable' into v6-stable
2012-10-02 11:23:27 +02:00
Rainer Gerhards
d855b1df7b
minor: disable debug support in complex1.sh test
2012-10-02 11:23:01 +02:00
Rainer Gerhards
c7ccf7d322
Merge branch 'v5-stable' into v6-stable
2012-10-02 11:22:06 +02:00
Rainer Gerhards
f50511a348
cleanup
2012-10-02 11:21:40 +02:00
Rainer Gerhards
3496d1c818
minor: mention better doc in ChangeLog
2012-10-02 11:18:24 +02:00
Florian Riedl
1269e9598d
doc: update module doc to new capabilities
2012-10-02 11:16:21 +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
Tim Eifler
819c816741
doc: add SQL-template example
2012-10-01 12:17:47 +02:00
Rainer Gerhards
11c203c673
implement imtcp "permittedPeers" module-global parameter
2012-10-01 12:00:52 +02:00
Rainer Gerhards
62c1997174
cleanup
2012-10-01 11:12:00 +02:00
Rainer Gerhards
8f11516a0e
refactor: unify nodetypes
2012-10-01 11:11:14 +02:00
Rainer Gerhards
c5f9139c71
fix: invalid free in array-based string comparisons
2012-10-01 10:53:24 +02:00
Rainer Gerhards
c0ccd3ff25
implement string arrays for config objects
...
as a tester, imudp now supports binding to multiple options
based on a string array
2012-10-01 10:29:38 +02:00
Rainer Gerhards
cdbeb9d75a
Merge branch 'master' into master-newruleset
...
Conflicts:
ChangeLog
2012-09-28 17:48:45 +02:00
Rainer Gerhards
e3a611ac62
cleanup
2012-09-28 17:46:50 +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
04c0124eb7
rainerscript: add basic plumbing for arrays
...
can be used in expressions, but always evaluate to the first
element, only
2012-09-28 14:45:34 +02:00
Rainer Gerhards
38cdf1abad
Implement RainerScript ruleset() statement
2012-09-28 11:06:16 +02:00
Rainer Gerhards
b0764541ab
somewhat better debug output
2012-09-28 09:51:29 +02:00
Rainer Gerhards
22a4fed556
cleanup
...
recent enhancement in RainerScript param handlers permit to remove
now-redundant code
2012-09-28 09:15:05 +02:00
Rainer Gerhards
8caf952c83
fix screwed-up ChangeLog
2012-09-28 08:45:48 +02:00
Rainer Gerhards
93cbf964ea
Merge branch 'v6-devel'
2012-09-28 08:25:13 +02:00
Rainer Gerhards
26ab13d976
Merge branch 'v6-devel-input' into v6-devel
2012-09-28 08:24:50 +02:00
Florian Riedl
cf0fd87e17
doc: update module doc to new config format
2012-09-28 08:24:13 +02:00
Rainer Gerhards
43da91636a
imtcp: implement support for module() parameters
2012-09-28 08:09:47 +02:00
Rainer Gerhards
5347e87dca
imptcp: implement support for module() parameters
2012-09-27 18:47:51 +02:00
Rainer Gerhards
f2f85fcf44
fix whitespace issue
2012-09-27 18:38:53 +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
53df506668
Merge branch 'v6-devel-input' into v6-devel
2012-09-27 15:46:06 +02:00
Rainer Gerhards
77b4efaeec
Do not load module if it had errorneous parameters
2012-09-27 14:22:23 +02:00
Rainer Gerhards
8020c651a1
cosmetic: remove irrelevant compiler warning
...
v7 does not even have this code any longer
2012-09-27 12:58:27 +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
95e73e3cd2
yet another nitfix...
2012-09-27 08:10:47 +02:00
