summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-beta'Rainer Gerhards2012-04-129-138/+210
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * 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.
* | | | imuxsock: fixed regression from last mergeRainer Gerhards2012-04-111-0/+7
| | | | | | | | | | | | | | | | thanks to Brian Knox for alerting me and the initial analysis
* | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-075-35/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c
| * | | 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-newstats' into v5-develRainer Gerhards2012-03-203-2/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c
| * \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-199-10/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-149-38/+69
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | 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-develRainer Gerhards2012-03-022-2/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-018-63/+79
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | | | | | | | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | | | | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-0727-87/+283
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-newstatsRainer Gerhards2012-04-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-078-10/+238
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-203-3/+21
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
| * | | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-199-10/+29
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
| * | | | | | | | 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
| * | | | | | | | | bumped version number (of temp branch)Rainer Gerhards2012-03-121-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-124-2/+15
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-104-4/+34
| | | | | | | | | |
| * | | | | | | | | imuxsock did ignore configured IP if - always used eth0 if one was set ;)Rainer Gerhards2012-03-101-1/+1
| | | | | | | | | |
| * | | | | | | | | bugfix: imudp: only two listeners were activatedRainer Gerhards2012-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no matter how many were defined. Note that IPv4 and IPv6 count as two!
| * | | | | | | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-066-9/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
| * | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-057-21/+34
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | | queue: lightdelay config: keep default of 70% until mark is explicitely setRainer Gerhards2012-02-222-6/+10
| | | | | | | | | | |
| * | | | | | | | | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-216-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
| * | | | | | | | | | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6Rainer Gerhards2012-02-202-2/+4
| | | | | | | | | | |
| * | | | | | | | | | stats: added unique (and friendly) name for ruleset queuesRainer Gerhards2012-01-311-1/+4
| | | | | | | | | | |
| * | | | | | | | | | stats: generate friendly name for action queues, if possibleRainer Gerhards2012-01-312-3/+8
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-307-47/+63
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-04-073-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-073-5/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | | | | preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-073-3/+3
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | 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>