Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 6 | -73/+107 |
|\ | |||||
| * | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 5 | -63/+97 |
| | | |||||
| * | doc: correcting sample section of omudpspoof | Rainer Gerhards | 2012-04-20 | 1 | -8/+8 |
| | | | | | | | | again, credits to Jo Rhett for reporting this issue | ||||
| * | doc: omudpspoof doc had invalid directives | Rainer Gerhards | 2012-04-20 | 1 | -2/+2 |
| | | | | | | | | Thanks to Jo Rhett for reporting the bug. | ||||
* | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-19 | 2 | -2/+6 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| |\| | |||||
| | * | doc: added last bugfix to ChangeLog | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| | | | |||||
| | * | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be set config directive was accepted, but had no effect | ||||
| * | | doc: add last bugfix to changelog | Rainer Gerhards | 2012-04-19 | 2 | -1/+3 |
| | | | | | | | | | | | | and bump up version | ||||
| * | | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | config directive was accepted, but had no effect | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-18 | 4 | -5/+45 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 0 | -0/+0 |
| |\| | |||||
| | * | fixed compile bug | Rainer Gerhards | 2012-04-18 | 1 | -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-newstats | Rainer Gerhards | 2012-04-18 | 4 | -5/+45 |
| |\| | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | * | bugfix: assigned ruleset was lost when using disk queues | Rainer Gerhards | 2012-04-18 | 4 | -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.6 | Rainer Gerhards | 2012-04-12 | 4 | -9/+15 |
| | | | |||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 6 | -120/+168 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 6 | -120/+168 |
| |\| | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | ||||
| | * | imuxsock: do not cache hostname | Rainer Gerhards | 2012-04-12 | 2 | -11/+5 |
| | | | |||||
| | * | Free also LocalDomain in glbl class destructor | Marius Tomaschewski | 2012-04-11 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com> | ||||
| | * | Allocate LocalDomain as new string | Marius Tomaschewski | 2012-04-11 | 1 | -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 bugfix | Rainer Gerhards | 2012-04-11 | 1 | -1/+2 |
| | | | |||||
| | * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 5 | -125/+161 |
| | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
* | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 3 | -33/+42 |
| | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion. | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 14 | -123/+370 |
|\| | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 2 | -2/+2 |
| |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | preparing for 5.8.10v5.8.10 | Rainer Gerhards | 2012-04-07 | 3 | -3/+3 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 8 | -10/+238 |
| |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵ | Tomas Heinrich | 2012-04-05 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | doc: noted disk queue format change from v4->v5 | Rainer Gerhards | 2012-04-05 | 1 | -0/+5 |
| | | | |||||
| | * | bugfix: segfault if disk-queue was started up with old queue file | Tomas Heinrich | 2012-04-05 | 2 | -3/+8 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | bugfix: memory leak in array passing output module mode | Rainer Gerhards | 2012-03-17 | 2 | -2/+6 |
| | | | |||||
| | * | preparing for 5.8.9v5.8.9 | Rainer Gerhards | 2012-03-15 | 3 | -3/+3 |
| | | | |||||
| | * | added tool to recover disk queue if .qi file is missing (recover_qi.pl) | Kaiwang Chen | 2012-03-15 | 3 | -1/+211 |
| | | | |||||
| * | | cosmetic: pushing temp version up | Rainer Gerhards | 2012-03-22 | 1 | -1/+1 |
| | | | |||||
| * | | unified use of $LocalHostIPIF among all locally-emitting inputs | Rainer Gerhards | 2012-03-22 | 3 | -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-ip | Rainer Gerhards | 2012-03-21 | 6 | -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 code | Rainer Gerhards | 2012-03-21 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 3 | -2/+23 |
|\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c | ||||
| * | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 3 | -3/+21 |
| | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-19 | 9 | -10/+30 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h | ||||
| * | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-19 | 9 | -10/+29 |
| | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 9 | -38/+69 |
|\| | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | added missing initialization of stats counters | Rainer Gerhards | 2012-03-14 | 3 | -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-newstats | Rainer Gerhards | 2012-03-14 | 6 | -38/+66 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h | ||||
| | * | changed statsobj interface and added better doc | Rainer Gerhards | 2012-03-14 | 6 | -39/+67 |
| | | | |||||
| * | | bumped version number (of temp branch) | Rainer Gerhards | 2012-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | cosmetic: removed stray definition | Rainer Gerhards | 2012-03-12 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 16 | -18/+176 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-12 | 4 | -2/+15 |
| |\| |