Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bugfix: mmjsonparse segfault if new-style config was used | Rainer Gerhards | 2013-01-30 | 1 | -11/+11 |
| | |||||
* | bugfix: imklog issued wrong facility in error messages | Rainer Gerhards | 2013-01-15 | 1 | -1/+1 |
| | | | | ...what could lead to problems in other parts of the code | ||||
* | Merge branch 'v7-stable-libnet-frag' | Rainer Gerhards | 2013-01-14 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: ChangeLog | ||||
| * | Merge branch 'v7-stable' into v7-stable-libnet-frag | Rainer Gerhards | 2013-01-14 | 1 | -1/+1 |
| |\ | |||||
| | * | bugfix: omelasticsearch failed when authentication data was provided | Rainer Gerhards | 2013-01-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | ... at least in most cases it emitted an error message: "snprintf failed when trying to build auth string" Thanks to Joerg Heinemann for alerting us. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=404 | ||||
* | | | fix compile problem in imklog | Rainer Gerhards | 2013-01-13 | 1 | -1/+1 |
| | | | |||||
* | | | Correct call to submitMsg() | Martin Carpenter | 2013-01-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v7-stable-libnet-frag' | Rainer Gerhards | 2013-01-11 | 2 | -6/+70 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac tools/omfile.c | ||||
| * | | impstats: added ability to write stats records to local file | Rainer Gerhards | 2013-01-10 | 1 | -5/+69 |
| | | | | | | | | | | | | | | | ...and avoid going through the syslog log stream. syslog logging can now also be turned off (see doc for details). | ||||
| * | | Merge branch 'v7-stable' into v7-stable-libnet-frag | Rainer Gerhards | 2013-01-09 | 2 | -1/+16 |
| |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | imudp: make debug message clearer | Rainer Gerhards | 2012-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-08 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | im3195: object was not freed on exit [ASL2.0] | Martin Körper | 2013-01-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This and the other patch from Martin (this morning) was released under ASL 2.0 by him. | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-08 | 2 | -1/+15 |
|\| | | |||||
| * | | bugfix: mmjsonparse errornously returned action error when no CEE cookie was ↵ | Rainer Gerhards | 2013-01-08 | 1 | -0/+1 |
| | | | | | | | | | | | | present. | ||||
| * | | bugfix: compile errors in im3195 | Martin Körper | 2013-01-08 | 1 | -1/+14 |
| | | | |||||
* | | | Merge branch 'v7-stable-libnet-frag' | Rainer Gerhards | 2012-12-18 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | cosmetic: re-use existing error code instead of new one | Rainer Gerhards | 2012-12-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v7-stable-libnet-frag' | Rainer Gerhards | 2012-12-18 | 2 | -86/+228 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac plugins/impstats/impstats.c plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h | ||||
| * | | omudpspoof: remove dead code | Rainer Gerhards | 2012-12-18 | 1 | -45/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | On-the-fly compression support code was present since the initial module was written, however, no config options existed to actually activate it. I have now removed that code for clarity (obviously there is no need to maintain it or add the feature - nobody ever complained in the past...) | ||||
| * | | omudpspoof: improve libnet calling sequence | Rainer Gerhards | 2012-12-18 | 1 | -18/+42 |
| | | | | | | | | | | | | retains bugfix while increasing performance again | ||||
| * | | omudpspoof: add action parameter for mtu size | Rainer Gerhards | 2012-12-18 | 1 | -3/+2 |
| | | | |||||
| * | | omudpspoof: initialize libnet for each message | Rainer Gerhards | 2012-12-18 | 1 | -27/+31 |
| | | | | | | | | | | | | | | | This is a brute-force troubleshooting aid. Will later be changed to better code. | ||||
| * | | add some better debug information to impstats | Rainer Gerhards | 2012-12-18 | 1 | -0/+2 |
| | | | |||||
| * | | omudpspoof: add support for new config system | Rainer Gerhards | 2012-12-17 | 1 | -2/+97 |
| | | | |||||
| * | | omudpspoof: add support for packets larger than 1472 bytes | Rainer Gerhards | 2012-12-17 | 1 | -15/+82 |
| | | | | | | | | | | | | | | | | | | On Ethernet, they need to be transmitted in multiple fragments. While it is known that fragmentation can cause issues, it is the best choice to be made in that case. Also improved debug output. | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-12-17 | 1 | -9/+20 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-12-17 | 1 | -0/+6 |
| |\ \ | | |/ | |/| | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c | ||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-12-17 | 1 | -1/+7 |
| | |\ | |||||
| | | * | bugfix[kind of]: omudpspoof discarded messages >1472 bytes (MTU size) | Rainer Gerhards | 2012-12-17 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | it now truncates these message, but ensures they are sent. Note that 7.2.5+ will switch to fragmented UDP messages instead (up to 64K) | ||||
| * | | | omudpspoof: better debug output | Rainer Gerhards | 2012-12-17 | 1 | -10/+14 |
| | | | | |||||
| * | | | add extra debug info to tackle omudpspoof problem | Rainer Gerhards | 2012-12-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | bugfix: very minimal bugfix in imfile | Rainer Gerhards | 2012-12-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | not really relevant for production, a few KB were lost during initialization phase if no state file was present | ||||
* | | | | bugfix: small, mostly static memory leak in imtcp | Rainer Gerhards | 2012-12-14 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | This had no practical effect, a handful of bytes was lost at most, no matter how many messages were processed (leak in config processor). | ||||
* | | | | ommysql: addd batching/transaction support | Ulrike Gerhards | 2012-12-14 | 1 | -4/+28 |
| | | | | |||||
* | | | | minor cleanup | Rainer Gerhards | 2012-12-14 | 1 | -2/+12 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-12-13 | 1 | -1/+1 |
|\| | | | |||||
| * | | | build: link omelasticsearch against -lm | Michael Biebl | 2012-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Use LT_LIB_M to find the math library which is needed for pow(). | ||||
* | | | | Merge branch 'v7-stable-newmsglock' into master-newmsglock | Rainer Gerhards | 2012-12-06 | 1 | -3/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/queue.c tools/syslogd.c | ||||
| * | | | permit RFC3339 timestamp in local log socket messages | Sebastien Ponce | 2012-12-03 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | Released under ASL 2.0, permission given via email. | ||||
* | | | | bugfix[minor]: invalid error code when mmnormalize could not access rulebase | Rainer Gerhards | 2012-11-30 | 1 | -3/+3 |
| | | | | |||||
* | | | | bugfix: segfault on imuxsock startup if system log socket is used and no ↵ | Rainer Gerhards | 2012-11-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ratelimiting supported. Happens only during initial config read phase, once this is over, everything works stable. | ||||
* | | | | bugfix: mmnormalize could abort rsyslog if config parameter was in error | Rainer Gerhards | 2012-11-28 | 1 | -1/+5 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-28 | 11 | -5/+21 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/imptcp.html plugins/mmjsonparse/mmjsonparse.c plugins/mmnormalize/mmnormalize.c | ||||
| * | | | silence some primarily cosmetic compiler warning messages | Rainer Gerhards | 2012-11-28 | 2 | -3/+12 |
| | | | | |||||
| * | | | bugfix: modules not (yet) supporting new conf format were not properly ↵ | Rainer Gerhards | 2012-11-28 | 9 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registered This lead to a "module not found" error message instead of the to-be-expected "module does not support new style" error message. That invalid error message could be quite misleading and actually stop people from addressing the real problem (aka "go nuts" ;)) | ||||
| * | | | bugfix: supportoctetcountedframing parameter did not work in imptcp | Rainer Gerhards | 2012-11-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | bugfix: mmnormalize build problems | Rainer Gerhards | 2012-11-27 | 1 | -6/+3 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-22 | 3 | -17/+37 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| * | | | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2012-11-22 | 3 | -25/+49 |
| |\| | |