summaryrefslogtreecommitdiffstats
path: root/plugins/imuxsock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-5/+0
|\
| * bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
| |
* | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| |
* | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-8/+2
|\|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-8/+2
| |\ | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more).
| | * fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-10-101-1/+5
| | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-271-10/+119
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-121-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-121-8/+6
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-121-5/+5
| | |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-121-1/+5
| | | |
| | | * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-09-111-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\ \ \ | | | |/ | | |/|
| | * | fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| | | |
* | | | Fix length problem with _CMDLINEMilan Bartos2012-09-111-3/+3
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | imuxsock: use CEE root for trusted propertiesRainer Gerhards2012-09-101-1/+4
| | | | | | | | | | | | | | | | ... in order to keep in line with current lumberjack schema
* | | | Don't store uninitialized data in trusted JSON propertiesMiloslav Trmač2012-09-041-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | Add missing error handling. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | Don't overload length as error code indicator in getTrusted*Miloslav Trmač2012-09-041-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the return value to signal errors instead of overloading *lenProp == 0. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | imuxsock: changed to use new JSON based systemRainer Gerhards2012-08-271-48/+19
| |_|/ |/| | | | | | | | Warning: only minimal testing done so far
* | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
| | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
| | | | | | | | | | | | | | | * add support for parsing trusted properties into libee event structure * add $SystemLogParseTrusted config file option to enable it (default off)
* | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-021-1/+5
|\ \ \
| * | | Merge branch 'beta'Rainer Gerhards2012-08-011-1/+5
| |\| |
| | * | fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-08-011-1/+5
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | * Copy bAnnotateSysSock value from old config data into the new structure * Set bUseCreds on the system log socket if bAnnotateSysSock is set * Process all CMSG records, not only the first one Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | imuxsock: support for module() global config parameters addedRainer Gerhards2012-06-271-47/+128
| | |
* | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable.
* | | added --enable-debugless configure option for very high demanding environmentsRainer Gerhards2012-05-291-10/+8
|/ / | | | | | | | | This actually at compile time disables a lot of debug code, resulting in some speedup (but serious loss of debugging capabilities)
* | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-161-0/+1
| |
* | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-161-2/+2
| |
* | imuxsock: mini bugfix: closed fd was tried to close a second timeRainer Gerhards2012-04-131-3/+6
| |
* | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-6/+5
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-8/+7
| |\
| | * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-8/+7
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-10/+4
| | | |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-26/+1
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-141-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-5/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-021-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
| |\ \ \ \ \ \
* | | | | | | | 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-stable-newstats'Rainer Gerhards2012-04-071-4/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-26/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * | | | | imuxsock did ignore configured IP if - always used eth0 if one was set ;)Rainer Gerhards2012-03-101-1/+1
| | | | | |
| * | | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-5/+30
| | |_|_|/ | |/| | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-171-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
generated by cgit (git 2.34.1) at 2024-06-20 07:05:15 +0000