Rainer Gerhards
cfa8d01f52
imptcp: support for Linux-Type ratelimiting added
2012-10-15 17:01:00 +02:00
Rainer Gerhards
34a88a7e9a
ratelimit: added linux-like ratelimiter type
2012-10-15 16:39:36 +02:00
Rainer Gerhards
6ab4666622
ratelimit: respect $repeatedmsgreduction setting
2012-10-15 13:05:42 +02:00
Rainer Gerhards
912db8bbac
milestone: convert imuxsock to ratelimitAddMsg() interface
2012-10-15 12:38:49 +02:00
Rainer Gerhards
706ddb4923
Merge branch 'master' into master-ratelimit
...
Conflicts:
ChangeLog
doc/v7compatibility.html
2012-10-15 12:31:56 +02:00
Rainer Gerhards
a3a3a322d8
imfile: converted to new ratelimit interface
2012-10-15 12:22:16 +02:00
Rainer Gerhards
0d60901e6e
ratelimit: imtcp (and gssapi) converted to new interface
2012-10-15 12:09:37 +02:00
Rainer Gerhards
25a8496a6a
imudp: add input batching & ratelimiter interface
2012-10-15 11:48:43 +02:00
Rainer Gerhards
3806643baa
ratelimiter: enable thread-safe mode & (related) API changes
2012-10-15 11:19:22 +02:00
Rainer Gerhards
1577b76e37
Change debug output defaults to match current needs
2012-10-15 11:06:18 +02:00
Rainer Gerhards
de3b0a7861
indicate no original code left in imudp
2012-10-15 08:57:08 +02:00
Rainer Gerhards
2a6ff7d53d
interface cleanup (probably not final)
2012-10-15 08:55:12 +02:00
Rainer Gerhards
49fb431e0c
milestone: ratelimiter used in imptcp
2012-10-15 08:41:04 +02:00
Rainer Gerhards
c7aa09bbb2
milestone: experimental rate limiter used in imuxsock
2012-10-12 18:30:51 +02:00
Rainer Gerhards
2014cf8562
doc: update ChangeLog with CEE cookie change
...
this is important for interop, so make sure each affected
version correctly lists it.
2012-10-11 18:32:38 +02:00
Rainer Gerhards
949c75305c
Merge branch 'beta'
2012-10-11 18:31:50 +02:00
Rainer Gerhards
f72faa803e
Merge branch 'v6-stable' into beta
...
Conflicts:
plugins/mmjsonparse/mmjsonparse.c
2012-10-11 18:31:31 +02:00
Rainer Gerhards
b8916d5cf1
change lumberjack cookie to "@cee" from "@cee "
...
CEE originally specified the cookie with SP, whereas other lumberjack
tools used it without space. In order to keep interop with lumberjack,
we now use the cookie without space as well. I hope this can be changed
in CEE as well when it is released at a later time.
Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
2012-10-11 18:21:57 +02:00
Miloslav Trmač
829b0639a0
Don't require the trailing space in @cee: cookie
...
The only mention of @cee: in the Lumberjack pages,
https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space,
and libumberlog does not in fact generate one.
2012-10-11 18:19:06 +02:00
Rainer Gerhards
17c15234a3
doc: add last patch to ChangeLog
2012-10-11 18:12:46 +02:00
Miloslav Trmač
5552202b01
Fix crash when date properties are used without a template
...
E.g. in
> set $!time = $timereported;
> set $!time_rcvd = $timegenerated;
pTpe is set to NULL by the caller.
(Is "default" the correct format to use?)
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2012-10-11 18:11:47 +02:00
Rainer Gerhards
7bebfd3b60
Merge branch 'beta'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-10-11 15:38:09 +02:00
Rainer Gerhards
2ae9e456db
add deprecated note to discard action
2012-10-11 15:36:55 +02:00
Rainer Gerhards
a208fcfc70
added deprecated note to omruleset
2012-10-11 15:27:27 +02:00
Rainer Gerhards
0f879f21ad
make omruleset non-default in ./configure
...
as this module's functionality has been superseeded by the "call"
statement.
Thanks to Michael Biebl for alerting me on the still-old default.
2012-10-11 14:59:37 +02:00
Rainer Gerhards
e21184cb28
preparing for 7.1.10 release
2012-10-11 14:42:08 +02:00
Rainer Gerhards
1b7e8bd1a8
fix regression introduced by last commit
...
action object was created twice, resulting in memleak
2012-10-11 12:38:17 +02:00
Rainer Gerhards
9fa59604e9
bugfixes in regards to action()
...
- bugfix: small memory leak when processing action() statements
- bugfix: unknown action() parameters were not reported
2012-10-11 12:22:49 +02:00
Rainer Gerhards
d91e8c31a1
bugfix: some config processing warning messages were treated as errors
2012-10-11 12:14:55 +02:00
Rainer Gerhards
ee1afa2f36
cosmetic: simplify
2012-10-11 11:45:22 +02:00
Rainer Gerhards
406f20f0cf
fix double-free
2012-10-11 11:45:05 +02:00
Rainer Gerhards
1563827466
Merge branch 'beta'
2012-10-11 10:06:22 +02:00
Rainer Gerhards
b6a66de263
add missing prototype
2012-10-11 10:05:54 +02:00
Rainer Gerhards
224ec91613
remove some assert()'s - valgrind does a better job...
2012-10-11 10:05:40 +02:00
Rainer Gerhards
55f67bfc9f
Merge branch 'beta'
...
Conflicts:
ChangeLog
2012-10-11 09:42:49 +02:00
Rainer Gerhards
98a94a68b6
Merge branch 'v6-devel'
...
Conflicts:
template.c
2012-10-11 09:41:53 +02:00
Rainer Gerhards
5114dc9fa2
mention recent changes in ChangeLog
2012-10-11 09:39:14 +02:00
Rainer Gerhards
231abc9709
fix small memory leak when template is specified in omfile
2012-10-11 09:37:43 +02:00
Rainer Gerhards
9de5fb77eb
fix small memory leak with string-type templates
2012-10-11 09:37:34 +02:00
Rainer Gerhards
e1037b5b1f
remove some assert()'s - valgrind does a better job...
2012-10-11 09:36:27 +02:00
Rainer Gerhards
d5b9d43f6a
fix small memory leak with string-type templates
2012-10-11 09:35:29 +02:00
Rainer Gerhards
a38ccf7899
fix small memory leak when template is specified in omfile
2012-10-11 09:33:12 +02:00
Rainer Gerhards
d752786d4f
re-enabled commented-out serialization support in debug handler
2012-10-11 09:27:30 +02:00
Rainer Gerhards
2aa16d3b1e
Merge branch 'beta'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-10-10 11:10:20 +02:00
Rainer Gerhards
573a2163dd
cosmetic cleanup
2012-10-09 18:59:05 +02:00
Rainer Gerhards
4269e45781
new ratelimit: interface plumbing added
...
no actual implementation yet done
2012-10-09 18:54:25 +02:00
Rainer Gerhards
1cddc1c360
prepare for 7.1.9 release
2012-10-09 15:38:37 +02:00
Rainer Gerhards
431932d8d6
bugfix: in (non)equal comparisons the position of arrays influenced result
...
This behaviour is OK for "contains"-type of comparisons (which have quite
different semantics), but not for == and <>, which shall be commutative.
This has been fixed now, so there is no difference any longer if the
constant string array is the left or right hand operand. We solved this
via the optimizer, as it keeps the actual script execution code small.
2012-10-09 15:24:04 +02:00
Rainer Gerhards
bf092de0fb
preparing for 7.3.0 release
2012-10-08 17:15:22 +02:00
Rainer Gerhards
71477d0bad
fix compile problem with DEBUG instrumentation enabled
2012-10-08 16:37:02 +02:00
