summaryrefslogtreecommitdiffstats
path: root/runtime/parser.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-08-251-10/+10
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-10/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-221-10/+10
| | | | | | | | | | | | This is done to prevent name claches with libraries.
* | | improved support for --enable-debuglessRainer Gerhards2012-05-291-3/+3
|/ / | | | | | | Now it's probably time to prove the effect in practice...
* | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-7/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-6/+6
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
* | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-1/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
| * | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
| | |
| * | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| | * \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-1/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | | * | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-241-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: root <root@localhost.localdomain>
| | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-2/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
* | | | | | some more work was required on the ruleset modificationRainer Gerhards2011-04-191-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-311-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-241-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: root <root@localhost.localdomain>
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-12-171-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-161-2/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| | * | | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-161-2/+0
| | | | |
* | | | | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-6/+6
|/ / / / | | | | | | | | | | | | first step: adding object-type specifier to config statement table
* | | | fixing msg duplication & loss regression, causes slowdownRainer Gerhards2010-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages could get lost or be duplicated due to non-proper sync of transactions. This is a notable slowdown again, but we know how to get back concurrency, it just takes "some" more programming. It is important now to come back to correct code, so that we can base further improvements on that.
* | | | Merge branch 'v5-stable' into masterRainer Gerhards2010-04-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | bugfix(minor): status variable was uninitializedRainer Gerhards2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, this would have caused harm only if NO parser modules at all were loaded, which would lead to a defunctional configuration at all. And, even more important, this is impossible as two parser modules are built-in and thus can not be "not loaded", so we always have a minimum of two.
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-04-011-2/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * | | temporary bugfix replaced by permanent one for...Rainer Gerhards2010-03-311-2/+7
| | | |/ | | |/| | | | | | | | | | | | | | | | | ...message-induced off-by-one error (potential segfault) (see 4.6.2) The analysis has been completed and a better fix been crafted and integrated.
* | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-191-12/+17
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: runtime/msg.h
| * | | changed imsolaris to use submitMsg() APIRainer Gerhards2010-04-191-12/+17
| | | | | | | | | | | | | | | | | | | | This includes a modification to the rsyslog engine so that messages without PRI inside the message can properly be handled.
* | | | Merge branch 'beta' into masterRainer Gerhards2010-04-091-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c runtime/stream.h tests/Makefile.am tests/diag.sh tools/omfile.c
| * | | | Merge branch 'v4-stable-solaris' into betaRainer Gerhards2010-04-091-2/+7
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/Makefile.am runtime/rsyslog.c tests/nettester.c tools/syslogd.c
| | * | enhanced nettester tool so that it re-uses it's callers environmentRainer Gerhards2010-04-071-2/+7
| | |/ | | | | | | | | | | | | | | | this enables us to work with the "usual" environment tweaks (for debugging and other purposes), without the need for any special handling in nettester itself
* | | replaced data type "bool" by "sbool" because this created some portability ↵Rainer Gerhards2010-02-021-3/+3
| | | | | | | | | | | | issues
* | | added $Escape8BitCharactersOnReceive directiveRainer Gerhards2010-01-271-0/+14
| | | | | | | | | | | | Thanks to David Lang for suggesting this functionality.
* | | re-implemented $EscapeControlCharacterTab config directiveRainer Gerhards2009-11-271-1/+9
| | | | | | | | | | | | | | | Based on Jonathan Bond-Caron's patch for v4. This now also includes some automatted tests.
* | | moved DNS resolution code out of imudp and into the backend processingRainer Gerhards2009-11-171-1/+2
|/ / | | | | | | | | | | | | | | Most importantly, DNS resolution now never happens if the resolved name is not required. Note that this applies to imudp - for the other inputs, DNS resolution almost comes for free, so we do not do it there. However, the new method has been implemented in a generic way and as such may also be used by other modules in the future.
* | first complete implementation of loadable parser systemRainer Gerhards2009-11-041-2/+54
| | | | | | | | | | | | | | I have now done the necessary cleanup. Looks like everything is in place. Unfortunately, I do not yet have any actual parser that is not built-in, but I think we can postpone working on that when the first one appears. I don't expect troubles in that case, but you never know ;)
* | added $RulesetParser config directiveRainer Gerhards2009-11-041-3/+5
| | | | | | | | | | The implementation is now almost done and works, including doc. I now need to verify shutdown, guess there are some resource leaks left...
* | finalized parser module calling interfaceRainer Gerhards2009-11-041-26/+67
| | | | | | | | | | looks like we are almost done and need only to add the ruleset parser-specific config options.
* | moved rfc3164/5424 code to new parser modulesRainer Gerhards2009-11-041-407/+69
| | | | | | | | | | | | another milestone commit: the program works, the new interface is used, some more cleanup is needed and the per-ruleset config options are still missing. But we are getting closer...
* | one step closer to dynamically loadable parsersRainer Gerhards2009-11-031-6/+159
| | | | | | | | | | This is a milestone commit, which adds new code that breaks nothing, but also does not add any visible change. Just prep work...
* | more cleanup and working towards a parser module calling interfaceRainer Gerhards2009-11-031-14/+70
| | | | | | | | | | | | I cleaned up a lot of config variable access along the way. This version compiles and runs, but does not yet offer any enhanced functionality. pmrfc5424 is just a dummy that is not yet being used.
* | restructured parser part of rsyslogRainer Gerhards2009-11-031-0/+382
| | | | | | | | | | | | now cleaner and hopefully usuable as a basis for loadable parser modules. I also cleaned up/consolidated some of the internal message generation functionality in rsyslogd.
* | enhanced test environment (including testbench)Rainer Gerhards2009-10-221-2/+2
| | | | | | | | | | | | | | | | support for enhancing probability of memory addressing failure by using non-NULL default value for malloced memory (optional, only if requested by configure option). This helps to track down some otherwise undetected issues within the testbench and is expected to be very useful in the future.
* | bugfix in debug system and more instrumentation to find an issueRainer Gerhards2009-10-081-8/+8
|/ | | | | bugfix: debug string larger than 1K were improperly displayed. Max size is now 32K, and if a string is even longer it is meaningful truncated.
* Merge branch 'v4-stable' into v4-beta & BUGFIXRainer Gerhards2009-10-011-2/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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: invalid handling of zero-sized messagesRainer Gerhards2009-09-291-2/+4
| | | | | | | | could lead to mis-addressing and potential memory corruption/segfault
| * bugfix: random data could be appended to message, possibly causing segfaultsRainer Gerhards2009-09-241-3/+8
| |
* | bugfix: message sanitation had some issuesRainer Gerhards2009-08-261-4/+12
| | | | | | | | | | | | | | | | - control character DEL was not properly escaped - NUL and LF characters were not properly stripped if no control character replacement was to be done - NUL characters in the message body were silently dropped (this was a regeression introduced by some of the recent optimizations)
* | bugfix: potential segfault when zip-compressed syslog records were received ↵Rainer Gerhards2009-07-101-1/+0
| | | | | | | | (double free)
* | introduced a new way of handling the RcvFrom propertyRainer Gerhards2009-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | ... 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.
* | bugfix: msg_t mutex was sometimes initialized twiceRainer Gerhards2009-06-251-1/+0
| |