summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bugfix (testbench): left-over from manual test removedRainer Gerhards2009-10-211-7/+0
|
* Merge branch 'v4-devel'Rainer Gerhards2009-10-211-2/+7
|\ | | | | | | | | Conflicts: runtime/wtp.c
| * Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-212-4/+7
| |\
| | * Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-10-212-3/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imrelp/imrelp.c
| | | * bumped version numberRainer Gerhards2009-10-203-4/+6
| | | |
| | | * added imported bugfix to changelogRainer Gerhards2009-10-201-0/+2
| | | |
| | | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-202-2/+1
| | | |\
| | | | * bugfix: potential hang condition on queue shutdownRainer Gerhards2009-10-202-2/+1
| | | | |
| | | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-143-5/+9
| | | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | | * | preparing for 4.4.2 releasev4.4.2Rainer Gerhards2009-10-091-1/+1
| | | | |
| | * | | Merge branch 'aaron' into v4-betaRainer Gerhards2009-10-211-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | preparing for 4.5.5v4.5.5Rainer Gerhards2009-10-211-1/+1
| | | | | |
* | | | | | updated project statusRainer Gerhards2009-10-211-7/+7
| | | | | |
* | | | | | Merge branch 'newqueue'Rainer Gerhards2009-10-2117-482/+180
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * | | | | | bugfix: message processing states were not set correctly in all casesRainer Gerhards2009-10-198-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | however, this had no negative effect, as the message processing state was not evaluated when a batch was deleted, and that was the only case where the state could be wrong.
| * | | | | | Merge branch 'master' into newqueueRainer Gerhards2009-10-1615-115/+184
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ \ \ Merge branch 'master' into newqueueRainer Gerhards2009-10-158-111/+42
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | | | | | new queue engine - initial commit (probably not 100% working!)Rainer Gerhards2009-10-1414-492/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplified and thus speeded up the queue engine, also fixed some potential race conditions (in very unusual shutdown conditions) along the way. The threading model has seriously changes, so there may be some regressions. NOTE: the code passed basic tests, but there is still more work and testing to be done. This commit should be treated with care.
| * | | | | | | | added some debug settings plus improved shutdown sequenceRainer Gerhards2009-10-139-27/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... non-working version!
* | | | | | | | | preparing for 5.3.2v5.3.2Rainer Gerhards2009-10-212-3/+3
| | | | | | | | |
* | | | | | | | | bugfix: segfault when starting up with an invalid .qi file for a disk queueRainer Gerhards2009-10-202-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failed for both pure disk as well as DA queues. Now, we emit an error message and disable disk queueing facility.
* | | | | | | | | added some tests for IPv4-Only configurationRainer Gerhards2009-10-203-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are "abusing" the parser tests to test the TCP/UDP reception handling. Thus we do not run the other tests through to an IPv4 only config. It acutally is not that parser that matters but rather the hope to find some init issues when running with only a single listening socket (in IPv6, we usually both have an IPv4 AND an IPv6 listening socket, what - as practice has shown - may hide listener setup errors).
* | | | | | | | | bugfix: first UDP listener was incorrectly assigned its rulesetRainer Gerhards2009-10-192-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was a regression of the recent imudp multi-ruleset enhancement bug was not in any released version
* | | | | | | | | Merge branch 'david-segfault'Rainer Gerhards2009-10-197-2/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | streamlined new addition to testbenchRainer Gerhards2009-10-195-4/+25
| | | | | | | | | |
| * | | | | | | | | added new testcase; fixed bug in testdriverRainer Gerhards2009-10-193-2/+22
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | my imfile cleanup was a bit too agressive ;)Rainer Gerhards2009-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... so I moved the one line that some platforms need back in.
* | | | | | | | | fixed regression in new multi-ruleset imudp codeRainer Gerhards2009-10-192-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new code has not been released so far, so this does not fix any bug known to the "real world".
* | | | | | | | | cleanup: finally moved some config variables just to conf.cRainer Gerhards2009-10-193-27/+15
|/ / / / / / / /
* | | | | | | | some minor cleanup, consolidated some codeRainer Gerhards2009-10-163-33/+2
| | | | | | | |
* | | | | | | | improved input thread termination for imtcp and imuxsockRainer Gerhards2009-10-162-0/+7
| | | | | | | |
* | | | | | | | cosmetic: cleanup of imfileRainer Gerhards2009-10-161-35/+13
| | | | | | | |
* | | | | | | | ensure proper imudp shutdown even on a very busy systemRainer Gerhards2009-10-163-5/+9
| | | | | | | |
* | | | | | | | added forgotten fileRainer Gerhards2009-10-161-0/+42
| | | | | | | |
* | | | | | | | Merge branch 'david-master' into masterRainer Gerhards2009-10-165-11/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.c
| * | | | | | | | bugfix: potential segfault on messages with empty MSG part.Rainer Gerhards2009-10-093-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a recently introduced regression.
| * | | | | | | | bugfix in debug system and more instrumentation to find an issueRainer Gerhards2009-10-086-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | bugfix: compile problem when system provided only epoll_create()Rainer Gerhards2009-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I introduced that problem yesterday when I improved epoll support.
* | | | | | | | | solved a recently introduced race during input thread shutdownRainer Gerhards2009-10-155-31/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced when we re-enabled non-cancel thread termination a few commits ago. This code has never been released as a tarball, so that is no bugfix for a release but rather a WiP regression fix and thus does not need to be mentioned in the ChangeLog.
* | | | | | | | | improved imudp so that epoll can be used in more environmentsRainer Gerhards2009-10-153-3/+12
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fixed potential compile time problem if EPOLL_CLOEXEC is not available.
* | | | | | | | updated project statusRainer Gerhards2009-10-151-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'v4-devel'Rainer Gerhards2009-10-143-4/+9
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-143-4/+9
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 'v3-stable' into v4-betaRainer Gerhards2009-10-143-4/+9
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | | * | | | | enhance: imrelp now also provides remote peer's IP addressRainer Gerhards2009-10-143-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [if librelp != 1.0.0 is used]
| * | | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-142-1/+7
| |\| | | | | |
| * | | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-085-5/+15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfile.c
* | | | | | | | | doc[minor]: as requested by Adiscon, moved professional services info to webRainer Gerhards2009-10-141-102/+17
| | | | | | | | |
* | | | | | | | | Merge branch 'beta'Rainer Gerhards2009-10-144-1/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-10-142-1/+7
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |