summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | nit fixed (testing aid removed)Rainer Gerhards2012-01-081-2/+1
| | | | | | | |
| | * | | | | | cleanup of imudp to use better lstn data structure (part I)Rainer Gerhards2012-01-081-68/+60
| | | | | | | |
* | | | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-1818-293/+257
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * | | | | | | licensing updateRainer Gerhards2012-01-161-17/+16
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1416-252/+226
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * | | | | more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| | | | | | |
| | * | | | | relicense parts under ASL 2.0Rainer Gerhards2012-01-1112-186/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | after carful check for copyright holder
| * | | | | | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
| | |_|_|_|/ | |/| | | |
* | | | | | removed imtemplate/omtemplate template modules, as this was waste of timeRainer Gerhards2012-01-094-715/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion on what their role was.
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-201-9/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-9/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2011-12-201-2/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-201-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-192-1/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-0/+17
| |\| | | |
| | * | | | imudp: stats addedRainer Gerhards2011-12-191-0/+17
| | | | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * | | | added instrumentationRainer Gerhards2011-12-191-1/+1
| | |/ / /
| * | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-161-5/+161
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
| * | | | imuxsock: added capability to "annotate" messages with "trusted information",Rainer Gerhards2011-11-291-6/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd.
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-171-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | \ \ \ \ Merge branch 'beta'Rainer Gerhards2011-12-161-3/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-161-3/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-161-3/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-161-3/+1
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2011-10-171-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-131-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-5/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-4/+9
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-071-4/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
| | * | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-311-0/+1
| |\| | |
| * | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-301-3/+0
| | | | | |
| * | | | | backported patch for testbench race reductionRainer Gerhards2011-06-301-9/+14
| | | | | |
* | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-082-14/+50
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2011-08-311-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: action.c
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-311-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-051-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-9/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
* | | | | | somewhat more informative imklog status messages (mostly cosmetic)Rainer Gerhards2011-08-051-2/+4
| | | | | |
* | | | | | mostly cosmetic: error message did incorrectly contain errno-infoRainer Gerhards2011-08-051-1/+1
| | | | | |
* | | | | | - imudp&imtcp now report error if no listener at all was definedRainer Gerhards2011-08-052-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marcin for suggesting this error message
* | | | | | milestone: added module config namesRainer Gerhards2011-07-2041-1/+42
| | | | | |
* | | | | | Merge branch 'v5-stable'Rainer Gerhards2011-07-131-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | doc: cleanup of copy-and-paste error in commentRainer Gerhards2011-07-131-1/+1
| | |/ / / | |/| | | | | | | | | | | | | thanks to darix for alerting me
| * | | | reduced sporadic failures during make checkRainer Gerhards2011-06-301-9/+14
| | | | | | | | | | | | | | | | | | | | backport from v6