Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | preparing for 6.3.12v6.3.12 | Rainer Gerhards | 2012-07-02 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'beta' into master-module | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h | |||||
| * | preparing for 6.3.11v6.3.11 | Rainer Gerhards | 2012-06-18 | 1 | -1/+1 | |
| | | ||||||
* | | doc: typo fix | Rainer Gerhards | 2012-06-25 | 1 | -1/+1 | |
| | | ||||||
* | | ompipe: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -0/+10 | |
| | | ||||||
* | | Merge branch 'beta' | Rainer Gerhards | 2012-06-04 | 1 | -1/+1 | |
|\| | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | preparing for 6.3.10 | Rainer Gerhards | 2012-06-04 | 1 | -1/+1 | |
| | | ||||||
* | | change action queue default enqueue timeout from 2000ms to 50ms | Rainer Gerhards | 2012-06-01 | 1 | -0/+9 | |
|/ | ||||||
* | preparing for 6.3.9 (beta) releasev6.3.9 | Rainer Gerhards | 2012-05-22 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-03 | 1 | -10/+10 | |
|\ | | | | | | | | | Conflicts: tools/syslogd.c | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -10/+10 | |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| | * | preparing for 5.8.11 releasev5.8.11 | Rainer Gerhards | 2012-05-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | 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. | |||||
* | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-26 | 1 | -0/+9 | |
| | | | ||||||
* | | | added the "jsonf" property replacer option (and fieldname) & bugfix | Rainer Gerhards | 2012-04-19 | 1 | -3/+27 | |
| | | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary | |||||
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 | |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h | |||||
| * | | doc: added new $uptime property | Rainer Gerhards | 2012-04-13 | 1 | -0/+4 | |
| | | | ||||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 2 | -9/+1 | |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 4 | -15/+10 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c | |||||
| * | | | preparing for 5.9.6v5.9.6 | Rainer Gerhards | 2012-04-12 | 2 | -6/+9 | |
| | | | | ||||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 2 | -9/+1 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 2 | -9/+1 | |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | |||||
| | | * | | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 2 | -9/+1 | |
| | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2012-04-07 | 1 | -2/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c | |||||
| * | | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion. | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 2 | -0/+18 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 1 | -0/+6 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c | |||||
| * \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-19 | 1 | -0/+6 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 2 | -2/+14 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | |||||
* | \ \ \ \ \ \ | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 5 | -2/+39 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c | |||||
| * | | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | |||||
| * | | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | |||||
| * | | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -0/+13 | |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step... | |||||
| * | | | | | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 1 | -0/+6 | |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming | |||||
| * | | | | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-19 | 1 | -0/+6 | |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming | |||||
| * | | | | | added capability to use a local interface IP address as fromhost-ip for imklog | Rainer Gerhards | 2012-03-10 | 2 | -1/+6 | |
| | | | | | | ||||||
| * | | | | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF | |||||
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-05 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | |||||
* | \ \ \ \ \ \ | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-07 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-07 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| | * | | | | | | preparing for 5.8.10v5.8.10 | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 | |
| | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | doc: noted disk queue format change from v4->v5 | Rainer Gerhards | 2012-04-05 | 1 | -0/+5 | |
| | | | | | | | ||||||
| | * | | | | | preparing for 5.8.9v5.8.9 | Rainer Gerhards | 2012-03-15 | 1 | -1/+1 | |
| | | |_|/ / | | |/| | | | ||||||
| | * | | | | preparing for 5.8.8v5.8.8 | Rainer Gerhards | 2012-03-05 | 1 | -1/+1 | |
| | | |/ / | | |/| | | ||||||
| | * | | | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | final prep for 6.2.0v6.2.0 | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | impstats: added $PStatsJSON directive | Rainer Gerhards | 2012-04-01 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | added "date-unixtimestamp" property replacer option to format as a unix ↵ | Rainer Gerhards | 2012-03-29 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | timestamp |