summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2009-07-141-1/+1
|\
| * Merge branch 'v4-beta' into v4-develRainer Gerhards2009-07-141-1/+1
| |\
| | * bugfix: fromhost-ip was sometimes truncatedRainer Gerhards2009-07-141-1/+1
| | |
* | | Merge branch 'beta'Rainer Gerhards2009-07-131-2/+2
|\| |
| * | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-07-131-2/+2
| |\|
| | * Merge branch 'v3-stable' into v4-betaRainer Gerhards2009-07-131-2/+2
| | |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * fix compile error in zip sender patchRainer Gerhards2009-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ... at least I was smart enough to remind me that I did not do one test ;) That reminder was the compiler error. Now removed and test done ;) [simple things tend to work, lol]
| | | * bugfix: sending syslog messages with zip compression did not workRainer Gerhards2009-07-131-2/+2
| | | |
* | | | Merge branch 'master' into udpspoof & cleanup & slight optimizationRainer Gerhards2009-07-091-233/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+0
| |\| | |
| | * | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-07-091-2/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/nettester.c
| | | * | bugfix: omfwd segfault when debugging is turned onRainer Gerhards2009-07-091-2/+0
| | | | |
* | | | | first version supporting udp spoofing and non-spoofing at the same timeRainer Gerhards2009-07-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-109/+13
| | | | |
* | | | | made udp spoofing code compile (but does not necessarily run right now, ↵Rainer Gerhards2009-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | untested)
* | | | | Merge branch 'master' into udpspoofRainer Gerhards2009-07-0910-984/+1400
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c
| * | | | Merge branch 'v4-devel'Rainer Gerhards2009-07-082-4/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/stream.c
| | * | | first shot at asynchronous stream writer with timeout capabilityRainer Gerhards2009-07-062-4/+9
| | |/ / | | | | | | | | | | | | | | | | ... seems to work on quick testing, but needs a far more testing and improvement. Good milestone commit.
| * | | Merge branch 'master' into v5-develRainer Gerhards2009-07-021-4/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | omfile itself no longer needs zlibRainer Gerhards2009-07-021-4/+0
| | | |
| * | | Merge branch 'master' into v5-develRainer Gerhards2009-07-011-38/+90
| |\| |
| | * | now put the new property-based methods to good useRainer Gerhards2009-07-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | ... 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-011-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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-301-24/+22
| | | | | | | | | | | | | | | | | | | | ... 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-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | Merge branch 'beta' into masterRainer Gerhards2009-06-291-1/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | | * \ Merge branch 'v4-stable' into betaRainer Gerhards2009-06-291-1/+13
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | | * | bugfix: ssh session hangs after rsyslgod is started from itRainer Gerhards2009-06-291-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stderr/stdout were not closed to be able to emit error messages, but this caused ssh sessions to hang. Now we close them after the initial initialization. See forum thread: http://kb.monitorware.com/controlling-terminal-issues-t9875.html
| | * | | | some cleanupRainer Gerhards2009-06-291-14/+14
| | | | | |
| | * | | | separate willRun and runInput calls for input modulesMichael Terry2009-06-291-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | add support for KLogPathMichael Terry2009-06-291-2/+2
| | | | | |
| * | | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-251-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | | | named queue worker threadsRainer Gerhards2009-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... but I don't see the name anywhere...?
| | * | | | improvements/fixes in queue termination timeout handlingRainer Gerhards2009-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: subtle (and usually irrelevant) issue in timout processing timeout could be one second too early if nanoseconds wrapped - set a more sensible timeout for shutdow, now 1.5 seconds to complete processing (this also removes those cases where the shutdown message was not written because the termination happened before it)
| * | | | | improvements/fixes in queue termination timeout handlingRainer Gerhards2009-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: subtle (and usually irrelevant) issue in timout processing timeout could be one second too early if nanoseconds wrapped - set a more sensible timeout for shutdow, now 1.5 seconds to complete processing (this also removes those cases where the shutdown message was not written because the termination happened before it)
| * | | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-241-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMPORTANT: this merge did NOT include the (important) changes to action.c . Consolidating them was too hard (aka "error-prone") because of the large differences in the code base. The fixes will be redone with a later commit. Conflicts: action.c configure.ac doc/manual.html
| | * | | | Merge branch 'omfile'Rainer Gerhards2009-06-248-1050/+642
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | Merge branch 'v4-stable' into betaRainer Gerhards2009-06-241-2/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-06-241-2/+2
| | | |\ \ \ | | | | | |/ | | | | |/|
| * | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-231-93/+35
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | * | | | optimized TAG handlingRainer Gerhards2009-06-231-4/+3
| | | | | |
| | * | | | optimized hostname processingRainer Gerhards2009-06-231-36/+11
| | | | | |
| | * | | | more strict parsing of the hostname in rfc3164 modeRainer Gerhards2009-06-231-73/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... hopefully removes false positives (but may cause some trouble with hostname parsing). For details, see this bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=126 This patch is not optimal for v4 - another one will follow. The spirit of this commit is to enable easier backporting if someone is interested in doing so.
| | * | | | prevented unneccessary apc callsRainer Gerhards2009-06-231-2/+1
| | | | | |
| | * | | | restored repeated message reduction processingRainer Gerhards2009-06-231-0/+1
| | | | | |
| * | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-221-16/+10
| |\| | | |
| | * | | | optimized processing of TAG message fieldRainer Gerhards2009-06-221-16/+10
| | | | | |
| * | | | | Merge branch 'omfile' into tmpRainer Gerhards2009-06-222-16/+41
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | switched default to keep in line with traditional syslogd behaviourRainer Gerhards2009-06-191-2/+2
| | | | | |