summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-07101-381/+5139
|\ | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html
| * preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-313-3/+3
| |
| * Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-302-4/+6
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| * | Added changelog entryAndre Lorbach2011-08-111-0/+1
| | |
| * | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-112-1/+2
| |\ \
| * \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-092-1/+4
| |\ \ \
| * \ \ \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-053-14/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-113-3/+3
| | | | | |
| * | | | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-113-1/+28
| | | | | |
| * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-1114-29/+58
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-143-4/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-201-5/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-112-2/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-0915-21/+143
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| * | | | | | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-023-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections is aborted
| * | | | | | | | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-242-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: root <root@localhost.localdomain>
| * | | | | | | | | | imudp: removing new scheduling priority setting codeRainer Gerhards2011-01-102-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as it had too many implications. This will now be part of v5 only.
| * | | | | | | | | | added support for systems without epoll_create1()Rainer Gerhards2010-12-172-2/+20
| | | | | | | | | | |
| * | | | | | | | | | added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settingsRainer Gerhards2010-12-173-0/+44
| | | | | | | | | | |
| * | | | | | | | | | added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-166-14/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
| * | | | | | | | | | cleanup of cosmetic nit (result of clang static code analyser run)Rainer Gerhards2010-12-161-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-1618-39/+28
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| * | | | | | | | | | | Fix the build system to build outisde CERN.Luis Fernando Muñoz Mejías2010-11-301-17/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should build against Oracle 11, too. Depending on the user's installation, either a single ORACLE_HOME environment variable or ORACLE_LIB_PATH and ORACLE_INCLUDE_PATH environment variables will be needed.
| * | | | | | | | | | | Fix a potential missing '\0' on too long strings.Luis Fernando Muñoz Mejías2010-11-302-48/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By implementing a trivial strlcpy it's much easier to detect string truncations and react to them. This also gives a noticeable speedup in buffer handling (can be HUGE), since strlcpy() doesn't clear all the buffer entry before writing data. Converted all uses of strncpy() into strlcpy(). Also, we don't need to check for some null pointers, as there are no malloc-like operations in the doAction loop.
| * | | | | | | | | | | bugfix: atomic increment for msg object may not work correct on all platforms.Chris Metcalf2010-11-252-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | | | | | | added forgotten testcase filesv4.7.3Rainer Gerhards2010-11-252-0/+25
| | | | | | | | | | | |
| * | | | | | | | | | | preparing for 4.7.3Rainer Gerhards2010-11-253-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-11-251-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-11-242-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | | | | | doc/imfile: fixed small but important typoRainer Gerhards2010-10-201-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | imfile improvementsRainer Gerhards2010-10-243-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
| * | | | | | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-198-372/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-154-10/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/stream.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-stable-imptcp' into v4-develRainer Gerhards2010-08-118-20/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | imptcp: added $InputPTCPServerAddtlFrameDelimiter directiveRainer Gerhards2010-08-118-12/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also improved testbench
| | * | | | | | | | | | | | | | | | fixed minor issue: imptcp did a close(-1) on each acceptRainer Gerhards2010-08-111-1/+2
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | imptcp: added $InputPTCPServerNotifyOnConnectionClose directiveRainer Gerhards2010-08-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus some minor cleanup
| * | | | | | | | | | | | | | | | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-1119-62/+1434
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | * | | | | | | | | | | | | | | | more testbench improvements and new testsRainer Gerhards2010-08-106-58/+107
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | small improvements to testbenchRainer Gerhards2010-08-102-1/+3
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | some cleanup and minor optimizationRainer Gerhards2010-08-101-33/+32
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | added tests for imptcp and fixed some problems with itRainer Gerhards2010-08-105-19/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it now also works reliably in edge-triggered mode
| | * | | | | | | | | | | | | | | | added imptcpRainer Gerhards2010-08-1010-3/+1267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
| * | | | | | | | | | | | | | | | | doc nit: wrong title in omuxsock pageRainer Gerhards2010-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thanks to David Lang for finding this issue
| * | | | | | | | | | | | | | | | | solving an error ID collision with v5 buildRainer Gerhards2010-08-061-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | added omuxsock, which permits to write message to local Unix socketsRainer Gerhards2010-08-0614-4/+600
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is the counterpart to imuxsock, enabling fast local forwarding
| * | | | | | | | | | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-08-054-117/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-08-053-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-07-052-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \