summaryrefslogtreecommitdiffstats
Commit message (Expand)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
| * doc: omudpspoof doc had invalid directivesRainer Gerhards2012-04-201-2/+2
* | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
|\ \
| * | 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
| * | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
* | | 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
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| |\|
| | * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
* | | 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
| |\|
| | * imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5
| | * Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | * doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| | * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-115-125/+161
* | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-073-33/+42
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-0714-123/+370
|\| |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-2/+2
| |\|
| | * 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
| |\|
| | * bugfix: segfault on startup if $actionqueuefilename was missing for disk queu...Tomas Heinrich2012-04-052-1/+5
| | * 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
| | * 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
| * | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-216-65/+130
| * | 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
|\| |
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-203-3/+21
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-199-10/+30
|\| |
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-199-10/+29
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-149-38/+69
|\| |
| * | added missing initialization of stats countersRainer Gerhards2012-03-143-0/+3
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-146-38/+66
| |\|
| | * 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
|\| |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-124-2/+15
| |\|