7554 Commits

Author SHA1 Message Date
Rainer Gerhards
a452fe7093 mmjsonparse: support for different cookies and target containers complete
This fixes the case where the target container was selected wrongly.
2014-07-15 15:19:32 +02:00
Rainer Gerhards
ac08e97083 testbench: add tests for mmjsonparse 2014-07-15 15:05:29 +02:00
Rainer Gerhards
0b141c01dd tcpflood: add json format support
this is required for mmjsonparse testing
2014-07-15 14:53:41 +02:00
Rainer Gerhards
00abf92b4c milestone/mmnormalize: support configurable cookies and target containers
code looks ok and compiles, but has NOT yet undergone real testing
2014-07-15 14:29:53 +02:00
Rainer Gerhards
eb1517e107 Merge branch 'v8-stable' 2014-07-15 12:33:39 +02:00
Rainer Gerhards
b13dad0df7 Merge branch 'v8-stable' 2014-07-15 12:36:28 +02:00
Rainer Gerhards
9605156fa0 Merge branch 'v7-stable' into v8-stable 2014-07-15 12:36:20 +02:00
Rainer Gerhards
51f5693b50 fix compiler warnings on some platforms 2014-07-15 12:35:57 +02:00
Rainer Gerhards
db75200066 Merge branch 'v7-stable' into v8-stable 2014-07-15 12:33:27 +02:00
Rainer Gerhards
8d12c36e73 imptcp: fix printf format type 2014-07-15 12:33:14 +02:00
Rainer Gerhards
ffaf9609a2 imptcp: fix printf format type 2014-07-15 12:24:14 +02:00
Rainer Gerhards
fd2c84dda8 Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog into v7-stable 2014-07-15 11:16:05 +02:00
Rainer Gerhards
8ce0927fea Merge branch 'v8-stable' 2014-07-15 11:15:30 +02:00
Rainer Gerhards
8cc88863e2 Merge branch 'v7-stable' into v8-stable 2014-07-15 11:15:17 +02:00
Rainer Gerhards
058c3864d5 bugfix: make dist failed when GUARDTIME or LIBGCRYPT feature was disabled 2014-07-15 11:15:00 +02:00
Rainer Gerhards
7eb15f7b8d Merge branch 'v8-stable' 2014-07-15 10:34:03 +02:00
Rainer Gerhards
4ed5c5ee27 Merge branch 'v7-stable' into v8-stable 2014-07-15 10:33:53 +02:00
Rainer Gerhards
f4134a877a testbench regression: some other tests failed due to new HOSTNAME logic 2014-07-15 10:33:24 +02:00
Rainer Gerhards
3e4ee11c3e Merge branch 'v8-stable' 2014-07-15 09:41:53 +02:00
Rainer Gerhards
fdb94fe968 Merge branch 'v7-stable' into v8-stable 2014-07-15 09:41:40 +02:00
Rainer Gerhards
8e17622529 testbench: change some control files to use dynamic hostname 2014-07-15 09:37:26 +02:00
Rainer Gerhards
b3dcc3abdf add file missing in last commit 2014-07-15 09:25:51 +02:00
Rainer Gerhards
49cc32e1de testbench: another shot at dynamically checking HOSTNAME property 2014-07-15 09:22:41 +02:00
Rainer Gerhards
7da26f060e Merge branch 'v8-stable' 2014-07-15 08:40:19 +02:00
Rainer Gerhards
aa38f64bb3 Merge branch 'v7-stable' into v8-stable 2014-07-15 08:39:56 +02:00
Rainer Gerhards
cf01379662 testbench: do no longer rely in some text on specific hostname 2014-07-14 19:01:32 +02:00
Rainer Gerhards
44672374ad Merge branch 'v8-stable' 2014-07-14 15:48:09 +02:00
Rainer Gerhards
4b8a2267b4 testbench: some tests had inappropriate configs
which could lead to *correct* message loss on slow or heavily
loaded systems
2014-07-14 15:47:40 +02:00
Rainer Gerhards
15cabb1b6f testbench: some tests had inappropriate configs
which could lead to *correct* message loss on slow or heavily
loaded systems
2014-07-14 15:46:30 +02:00
Rainer Gerhards
f1d00f3c91 Merge branch 'v8-stable'
Conflicts:
	ChangeLog
	grammar/lexer.l
2014-07-14 14:58:27 +02:00
Rainer Gerhards
278a2c8357 Merge branch 'v8-stable' of https://github.com/rsyslog/rsyslog into v8-stable 2014-07-14 14:50:16 +02:00
Rainer Gerhards
4afd000982 nitfixes 2014-07-14 14:38:15 +02:00
Rainer Gerhards
d4de83d846 testbench: make extended mysql test a bit more elaborate 2014-07-14 14:23:25 +02:00
Rainer Gerhards
bae2cf3cce Merge branch 'v8-stable' 2014-07-14 11:39:27 +02:00
Rainer Gerhards
5a80893186 Merge branch 'v8-stable' of git+ssh://git.adiscon.com/git/rsyslog into v8-stable 2014-07-14 11:39:06 +02:00
Rainer Gerhards
380b3b3bcf testbench: adjust test to new config param defaults
The test didn't make sense with the new defaults, as the disk queue
was never activated. While at it, also improved test output a bit.
2014-07-14 11:38:16 +02:00
Rainer Gerhards
f81cdc257e testbench: add -m option to chkseq
This permits to check files with a limited number of missing messages
2014-07-14 11:21:58 +02:00
Rainer Gerhards
10a055ddaa fix: remove accidently left-in debug output (in previous commit) 2014-07-13 15:36:44 +02:00
Rainer Gerhards
085928dac2 Merge branch 'v7-stable' into v8-stable 2014-07-13 15:31:35 +02:00
Rainer Gerhards
674e2aec3d regression fix: invalid ptr was passed
happend by merging patches this morning, never released
2014-07-13 14:57:32 +02:00
Rainer Gerhards
eb89f4ddba Merge branch 'v8-stable' 2014-07-13 13:07:19 +02:00
Rainer Gerhards
c2c8c26c87 Merge branch 'v7-stable' into v8-stable
Conflicts:
	plugins/imfile/imfile.c
2014-07-13 13:07:08 +02:00
Rainer Gerhards
14fef23001 Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable 2014-07-13 13:01:02 +02:00
Rainer Gerhards
bb0a0352e6 Merge remote-tracking branch 'github/v7-stable-th-coverity' into v7-stable 2014-07-13 13:00:51 +02:00
Rainer Gerhards
6d668c915f cosmetic: fix some gcc --pedantic messages 2014-07-13 12:43:07 +02:00
Rainer Gerhards
a45ea8a144 testbench: make more reliable shutdown
so far, we checked only the main queue size to become zero, ignoring
the sizes of action queues. For some tests, this caused racieness and
unreliability. Now, we check all queues. This should make matters
much more stable.
2014-07-11 17:23:21 +02:00
Rainer Gerhards
244ca62e33 Merge branch 'v8-stable' 2014-07-11 15:32:54 +02:00
Rainer Gerhards
bb48b34db0 Merge branch 'v7-stable' into v8-stable 2014-07-11 15:32:45 +02:00
Rainer Gerhards
c3db2ef98d add --enable-generate-man-pages configure switch (default: enabled)
This forces generation of man pages, even if cached ones exists. This
"fixes" a typical release tarball nit. While it is hackish, the
benefit is clear given the history of failed tarball releases since
we changed the cached man page handling. It was just too easy to get
that wrong.
2014-07-11 15:32:10 +02:00
Tomas Heinrich
c3caf0f4f6 bugfix: plug a memleak in imudp
Error: RESOURCE_LEAK (CWE-772):
rsyslog-7.4.10/plugins/imudp/imudp.c:413: alloc_arg: "msgConstructWithTime(msg_t **, struct syslogTime *, time_t)" allocates memory that is stored into "pMsg".
rsyslog-7.4.10/runtime/msg.c:745:2: alloc_arg: "msgBaseConstruct(msg_t **)" allocates memory that is stored into "*ppThis".
rsyslog-7.4.10/runtime/msg.c:674:2: alloc_fn: Storage is returned from allocation function "malloc(size_t)".
rsyslog-7.4.10/runtime/msg.c:674:2: var_assign: Assigning: "pM" = "malloc(576UL)".
rsyslog-7.4.10/runtime/msg.c:725:2: var_assign: Assigning: "*ppThis" = "pM".
rsyslog-7.4.10/plugins/imudp/imudp.c:414: noescape: Resource "pMsg" is not freed or pointed-to in function "MsgSetRawMsg(msg_t *, char *, size_t)".
rsyslog-7.4.10/runtime/msg.c:2403:26: noescape: "MsgSetRawMsg(msg_t *, char *, size_t)" does not free or save its pointer parameter "pThis".
rsyslog-7.4.10/plugins/imudp/imudp.c:415: noescape: Resource "pMsg" is not freed or pointed-to in function "MsgSetInputName(msg_t *, prop_t *)".
rsyslog-7.4.10/runtime/msg.c:2208:29: noescape: "MsgSetInputName(msg_t *, prop_t *)" does not free or save its pointer parameter "pThis".
rsyslog-7.4.10/plugins/imudp/imudp.c:416: noescape: Resource "pMsg" is not freed or pointed-to in function "MsgSetRuleset(msg_t *, ruleset_t *)".
rsyslog-7.4.10/runtime/msg.c:1921:27: noescape: "MsgSetRuleset(msg_t *, ruleset_t *)" does not free or save its pointer parameter "pMsg".
rsyslog-7.4.10/plugins/imudp/imudp.c:417: noescape: Resource "pMsg" is not freed or pointed-to in function "MsgSetFlowControlType(msg_t *, flowControl_t)".
rsyslog-7.4.10/runtime/msg.c:1755:30: noescape: "MsgSetFlowControlType(msg_t *, flowControl_t)" does not free or save its pointer parameter "pMsg".
rsyslog-7.4.10/plugins/imudp/imudp.c:421: noescape: Resource "pMsg" is not freed or pointed-to in function "msgSetFromSockinfo(msg_t *, struct sockaddr_storage *)".
rsyslog-7.4.10/runtime/msg.c:2229:27: noescape: "msgSetFromSockinfo(msg_t *, struct sockaddr_storage *)" does not free or save its pointer parameter "pThis".
rsyslog-7.4.10/plugins/imudp/imudp.c:436: leaked_storage: Variable "pMsg" going out of scope leaks the storage it points to.
2014-07-11 15:19:44 +02:00