summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-276-73/+107
|\
| * added capability to specify substrings for field extraction modeRainer Gerhards2012-04-275-63/+97
| |
| * doc: correcting sample section of omudpspoofRainer Gerhards2012-04-201-8/+8
| | | | | | | | again, credits to Jo Rhett for reporting this issue
| * doc: omudpspoof doc had invalid directivesRainer Gerhards2012-04-201-2/+2
| | | | | | | | Thanks to Jo Rhett for reporting the bug.
* | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
|\ \ | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| |\|
| | * doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| | |
| | * bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be set config directive was accepted, but had no effect
| * | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| | | | | | | | | | | | and bump up version
| * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | config directive was accepted, but had no effect
* | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-184-5/+45
|\| |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-180-0/+0
| |\|
| | * fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | | | | | | | | | | | | | actually a regression from last bugfix - I just wonder why the other machine did not complain :-S
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| |\| | | | | | | | | | | | | Conflicts: runtime/msg.c
| | * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
| | | | | | | | | | | | | | | | | | 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.
* | | preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-124-9/+15
| | |
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-126-120/+168
|\| |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-126-120/+168
| |\| | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | * imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5
| | |
| | * Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com>
| | * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| | * doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| | |
| | * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-115-125/+161
| | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-073-33/+42
| | | | | | | | | | | | Thanks to Jo Rhett for the suggestion.
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-0714-123/+370
|\| | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-2/+2
| |\| | | | | | | | | | | | | Conflicts: configure.ac
| | * preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-073-3/+3
| | |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-078-10/+238
| |\| | | | | | | | | | | | | Conflicts: configure.ac
| | * bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵Tomas Heinrich2012-04-052-1/+5
| | | | | | | | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * doc: noted disk queue format change from v4->v5Rainer Gerhards2012-04-051-0/+5
| | |
| | * bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-052-3/+8
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-172-2/+6
| | |
| | * preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-153-3/+3
| | |
| | * added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-153-1/+211
| | |
| * | cosmetic: pushing temp version upRainer Gerhards2012-03-221-1/+1
| | |
| * | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-223-50/+3
| | | | | | | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
| * | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-216-65/+130
| | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
| * | do not provide weblink with meaningless (generic) error codeRainer Gerhards2012-03-211-2/+2
| | |
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-203-2/+23
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-203-3/+21
| | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-199-10/+30
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-199-10/+29
| | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-149-38/+69
|\| | | | | | | | | | | | | | Conflicts: configure.ac
| * | added missing initialization of stats countersRainer Gerhards2012-03-143-0/+3
| | | | | | | | | | | | | | | | | | | | | this was necessary due to refactoring of the stats subsystem ... but should have been done in the first place when this code was written. Thanks to Kaiwang Chen for his analysis of the stats subsystem, which ultimately lead to this patch!
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-146-38/+66
| |\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| | * changed statsobj interface and added better docRainer Gerhards2012-03-146-39/+67
| | |
| * | bumped version number (of temp branch)Rainer Gerhards2012-03-121-1/+1
| | |
* | | cosmetic: removed stray definitionRainer Gerhards2012-03-121-1/+0
| | |
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-1216-18/+176
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-124-2/+15
| |\|