summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-beta' into betaRainer Gerhards2009-10-141-4/+4
|\
| * Merge branch 'v3-stable' into v4-betaRainer Gerhards2009-10-141-4/+4
| |\ | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | * enhance: imrelp now also provides remote peer's IP addressRainer Gerhards2009-10-141-4/+4
| | | | | | | | | | | | [if librelp != 1.0.0 is used]
* | | bugfix and testbench improvementsRainer Gerhards2009-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | - bugfix: solved potential (temporary) stall of messages when the queue was almost empty and few new data added (caused testbench to sometimes hang!) - fixed some race condition in testbench - added more elaborate diagnostics to parts of the testbench - solved a potential race inside the queue engine
* | | Merge branch 'v4-beta' into betaRainer Gerhards2009-10-023-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tcpsrv.c
| * | Merge branch 'aaron' into v4-betaRainer Gerhards2009-10-021-0/+5
| |\ \ | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | * | added $InputTCPServerNotifyOnConnectionClose config directiveRainer Gerhards2009-10-011-0/+5
| | | |
| * | | Merge branch 'v4-stable' into v4-beta & BUGFIXRainer Gerhards2009-10-012-1/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html runtime/datetime.h runtime/parser.c runtime/rsyslog.h tools/syslogd.c v4-stable had a bug with RFC5424-formatted structured data, which showed was detected by the enhanced automatted testbench of v4-beta.
| | * | bugfix: zero-sized UDP messages are no longer processedRainer Gerhards2009-09-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, they were forwarded to processing, but this makes no sense Also, it looks like the system seems to provide a zero return code on a UDP recvfrom() from time to time for some internal reasons. These "receives" are now silently ignored.
* | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-09-031-1/+1
|\| | |
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-09-031-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | bugfix: reverse lookup reduction logic in imudp do DNS queries too oftenRainer Gerhards2009-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A comparison was done between the current and the former source address. However, this was done on the full sockaddr_storage structure and not on the host address only. This has now been changed for IPv4 and IPv6. The end result of this bug could be a higher UDP message loss rate than necessary (note that UDP message loss can not totally be avoided due to the UDP spec)
* | | | Merge branch 'beta'Rainer Gerhards2009-08-181-0/+5
|\| | |
| * | | added $InputTCPMaxListeners directiveRainer Gerhards2009-08-171-0/+5
| | | | | | | | | | | | | | | | permits to specify how many TCP servers shall be possible (default is 20).
* | | | internal: added ability to terminate input modules not via pthread_cancel...Rainer Gerhards2009-07-205-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... but an alternate approach via pthread_kill. This is somewhat safer as we do not need to think about the cancel-safeness of all libraries we use. However, not all inputs can easily supported, so this now is a feature that can be requested by the input module (the most important ones request it).
* | | | done implementing omudpspoofRainer Gerhards2009-07-101-193/+98
| | | | | | | | | | | | | | | | | | | | | | | | This is now a "good" rsyslog output module, working as usual. I've also sorted out some reentrency issues. Code is clean and ready to be tested in practice ;)
* | | | commiting interim version with ability to specify spoof sourceRainer Gerhards2009-07-091-14/+23
| | | |
* | | | Merge branch 'master' into udpspoof & cleanup & slight optimizationRainer Gerhards2009-07-091-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c I messed up and did some changes during the merge commit ;) But these are not large, just a little bit of cleanup and some very slight optimizations inside the msg object.
| * | | | Merge branch 'v4-devel'Rainer Gerhards2009-07-091-1/+12
| |\| | |
| | * | | bugfix: message could be truncated after TAG, often when forwardingRainer Gerhards2009-07-091-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a result of an internal processing error if maximum field sizes had been specified in the property replacer. Also did some testbench improvements, including omstdout.
* | | | | first version supporting udp spoofing and non-spoofing at the same timeRainer Gerhards2009-07-091-396/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omudpspoof is now a dedicated output module. It's calling semantics so far are based on omfwd, plus the need for the template to have the IP address as a string in the starting position.
* | | | | moved udp spoofing code to its own output module (omudpspoof)Rainer Gerhards2009-07-092-0/+864
|/ / / /
* | | | Merge branch 'v5-devel'Rainer Gerhards2009-07-034-17/+174
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/datetime.c
| * | | Merge branch 'master' into v5-develRainer Gerhards2009-07-019-22/+143
| |\ \ \
| * \ \ \ Merge branch 'omfile' into v5-develRainer Gerhards2009-06-232-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * \ \ \ \ Merge branch 'omfile' into tmpRainer Gerhards2009-06-224-12/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
| * \ \ \ \ \ Merge branch 'omfile' into v5-develRainer Gerhards2009-06-1614-42/+100
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this was NOT a trivial merge, and there may be some issues. This needs to be seen when we continue developing. Conflicts: runtime/msg.h runtime/obj.h runtime/queue.c runtime/srUtils.h runtime/stream.c runtime/stream.h runtime/wti.c tests/Makefile.am tools/omfile.c tools/syslogd.c
| * \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-06-041-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * \ \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-05-291-3/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-05-291-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-05-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | | | | | | | | | preserving current changesRainer Gerhards2009-05-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in preparation for some larger changes - I need to apply some serious design changes, as the current system does not play well at all with ultra-reliable queues. Will do that in a totally new version.
| * | | | | | | | | | | adapted testbench to new capabilitiesRainer Gerhards2009-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and now make check fails again, we have obviously found some new bugs thanks to the additional cases
| * | | | | | | | | | | Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-272-14/+132
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am tests/diskqueue.sh tests/imtcp-multiport.sh tests/manytcp.sh tests/memq-persist.sh
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-251-52/+195
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am tests/diskqueue.sh
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-226-40/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h tests/Makefile.am tools/syslogd.c
| * | | | | | | | | | | | | | minor cleanupRainer Gerhards2009-05-201-5/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into multi-dequeueRainer Gerhards2009-05-122-46/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | | | | | | | | | | | | | fixed some bugs & added testing helpersRainer Gerhards2009-05-071-11/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The action state machine now works correctly and has been verified a few hand-picked cases. I am missing automatted tests, though, this is not easy to achive... Anyhow, I've improved omtesting, so that it can be used in such automatted tests.
| * | | | | | | | | | | | | | | begin implementation of new transactional output module interfaceRainer Gerhards2009-04-271-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code is not complete, error cases are not handled.
| * | | | | | | | | | | | | | | fixing a small (newly-introduced) memory leakRainer Gerhards2009-04-231-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... plus simplifying free() calls after agreement on mailing list that we no longer need to check if the pointer is non-NULL
* | | | | | | | | | | | | | | | added $klogConsoleLogLevel directiveRainer Gerhards2009-07-032-9/+7
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...which permits to set a new console log level while rsyslog is active
* | | | | | | | | | | | | | | now put the new property-based methods to good useRainer Gerhards2009-07-012-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... hopefully reducing the number of allocs/frees as well as overall memory usage in a busy system (plus that these shared properties hopefully remain in cache longer than its single-instance counterparts...)
* | | | | | | | | | | | | | | RcvFromIP now also a propertyRainer Gerhards2009-07-013-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets stage to enable use of the property-interface to speed up things (mildly), the next step to be done. I have also fixed one regression of yesterday's changes.
* | | | | | | | | | | | | | | introduced a new way of handling the RcvFrom propertyRainer Gerhards2009-06-303-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... plus a fix for a long-time bug in obj-types.h. That lead to the object pointer only then to become NULL when the object was actually destructed, I discovered this issue during introduction of the pRcvFrom property in msg_t, but it potentially had other effects, too. I am not sure if some experienced instability resulted from this bug OR if its fix will cause harm to so-far "correctly" running code. The later may very well be. Thus I will change it only for the current branch and also the beta, but not in all old builds. Let's see how things evolve.
* | | | | | | | | | | | | | | finished transition to using inputName propertyRainer Gerhards2009-06-306-11/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... plus some celanup and adding minor missing functionality (the rule debug info again tell the property name, not just number).
* | | | | | | | | | | | | | | introduced the idea of detached propertiesRainer Gerhards2009-06-295-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some things inside the message can be used over a large number of messages and need to to be allocated and re-written every time. I now begin to implement this as a "prop_t" object, first use for the inputName. Some input modules are already converted, some others to go. Will do a little performance check on the new method before I go further. Also, this commit has some cleanup and a few bug fixes that prevented compiliation in debug mode (I overlooked this as I did not compile for debug, what I normally do, and the automatted test also does not do that)
* | | | | | | | | | | | | | | add support for KLogPathMichael Terry2009-06-294-5/+25
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | optimized hostname processingRainer Gerhards2009-06-232-2/+2
| |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | optimized handling of MSG part in msg objectRainer Gerhards2009-06-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: currently, message repeation processing is disabled, must be reenabled (but prefer to do some other tests first)