Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' into v7-stable-libnet-frag | Rainer Gerhards | 2012-12-20 | 3 | -7/+30 |
|\ | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c | ||||
| * | bugfix: on termination, actions were incorrectly called | Rainer Gerhards | 2012-12-20 | 2 | -7/+23 |
| | | | | | | | | | | | | | | The problem was that incomplete fiter evaluation was done *during the shutdown phase*. This affected only the LAST batches being processed. No problem existed during the regular run. Could usually only happen on very busy systems, which were still busy during shutdown. | ||||
| * | cosmetic: silence compiler warning | Rainer Gerhards | 2012-12-18 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-12-17 | 2 | -0/+9 |
| |\ | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c | ||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-12-17 | 2 | -1/+10 |
| | |\ | |||||
| | | * | bugfix[kind of]: omudpspoof discarded messages >1472 bytes (MTU size) | Rainer Gerhards | 2012-12-17 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | 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) | ||||
* | | | | imudp: make debug message clearer | Rainer Gerhards | 2012-12-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | cosmetic: re-use existing error code instead of new one | Rainer Gerhards | 2012-12-18 | 2 | -3/+2 |
| | | | | |||||
* | | | | version number increase for experimental version | Rainer Gerhards | 2012-12-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 | 4 | -18/+52 |
| | | | | | | | | | | | | | | | | retains bugfix while increasing performance again | ||||
* | | | | doc: added v7 conf samples to omudpspoof doc | Rainer Gerhards | 2012-12-18 | 1 | -5/+77 |
| | | | | |||||
* | | | | omudpspoof: add action parameter for mtu size | Rainer Gerhards | 2012-12-18 | 2 | -4/+3 |
| | | | | |||||
* | | | | omudpspoof: initialize libnet for each message | Rainer Gerhards | 2012-12-18 | 2 | -28/+32 |
| | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | |||||
* | | | | doc: document v7 omudpspoof config parameters | Rainer Gerhards | 2012-12-17 | 1 | -26/+60 |
| | | | | |||||
* | | | | omudpspoof: add support for new config system | Rainer Gerhards | 2012-12-17 | 2 | -2/+98 |
| | | | | |||||
* | | | | doc: mention omudpspoof message size limits | Rainer Gerhards | 2012-12-17 | 1 | -0/+5 |
| | | | | |||||
* | | | | omudpspoof: add support for packets larger than 1472 bytes | Rainer Gerhards | 2012-12-17 | 3 | -16/+87 |
|/ / / | | | | | | | | | | | | | | | | 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. | ||||
* | | | 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 |
| | | | |||||
* | | | doc: mention recent patches in ChangeLog | Rainer Gerhards | 2012-12-13 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-12-13 | 2 | -1/+5 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-12-13 | 2 | -1/+5 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | bugfix: invalid DST handling under Solaris | Scott Severtson | 2012-12-13 | 2 | -1/+3 |
| | | | |||||
* | | | build: link omelasticsearch against -lm | Michael Biebl | 2012-12-13 | 2 | -1/+2 |
| | | | | | | | | | | | | Use LT_LIB_M to find the math library which is needed for pow(). | ||||
* | | | build: drop obsolete --enable-pthreads configure switch | Michael Biebl | 2012-12-13 | 1 | -18/+2 |
| | | | | | | | | | | | | Building without pthreads support hasn't been support for a while. | ||||
* | | | build: fix uuid configure check | Michael Biebl | 2012-12-13 | 1 | -3/+3 |
| | | | |||||
* | | | prepare for 7.2.4v7.2.4 | Rainer Gerhards | 2012-12-07 | 3 | -3/+3 |
| | | | |||||
* | | | doc: mention important up-merged patch in ChangeLog | Rainer Gerhards | 2012-12-07 | 1 | -0/+15 |
| | | | |||||
* | | | Merge branch 'v6-stable-newmsglock' into v7-stable-newmsglock | Rainer Gerhards | 2012-12-06 | 5 | -167/+24 |
|\| | | | | | | | | | | | | | | Conflicts: tools/syslogd.c | ||||
| * | | bugfix: some message properties could be garbled due to race condition | Rainer Gerhards | 2012-12-06 | 6 | -169/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only on very high volume systems, if the same message was being processed by two different actions. This was a regression caused by the new config processor, which did no longer properly enable msg locking in multithreaded cases. The bugfix is actually a refactoring of the msg locking code - we no longer do unlocked operations, as the use case for it has mostly gone away. It is potentially possible only at very low-end systems, and there the small additional overhead of doing the locking does not really hurt. Instead, the removal of that capability can actually slightly improve performance in common cases, as the code path is smaller and requires slightly less memory writes. That probably outperforms the extra locking overhead (which in the low-end case always happens in user space, without need for kernel support as we can always directly aquire the lock - there is no contention at all). | ||||
* | | | permit RFC3339 timestamp in local log socket messages | Sebastien Ponce | 2012-12-03 | 2 | -3/+9 |
| | | | | | | | | | | | | Released under ASL 2.0, permission given via email. | ||||
* | | | fix missing functionality: ruleset(){} could not specify ruleset queue | Rainer Gerhards | 2012-11-30 | 9 | -63/+151 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "queue.xxx" parameter set was not supported, and legacy ruleset config statements did not work (by intention). The fix introduces the "queue.xxx" parameter set. It has some regression potential, but only for the new functionality. Note that using that interface it is possible to specify duplicate queue file names, which will cause trouble. This will be solved in v7.3, because there is a too-large regression potential for the v7.2 stable branch. | ||||
* | | | silence compiler warnings | Rainer Gerhards | 2012-11-30 | 5 | -8/+29 |
| | | | | | | | | | | | | | | | the changes do not affect actual code execution, just keep the compile log clean. | ||||
* | | | fix display problem with some date-format template options | Rainer Gerhards | 2012-11-29 | 1 | -1/+7 |
| | | | |||||
* | | | bugfix: template "type" parameter is mandatory (but was not) | Rainer Gerhards | 2012-11-29 | 2 | -4/+6 |
| | | | |||||
* | | | silence some primarily cosmetic compiler warning messages | Rainer Gerhards | 2012-11-28 | 4 | -7/+22 |
| | | | |||||
* | | | bugfix: modules not (yet) supporting new conf format were not properly ↵ | Rainer Gerhards | 2012-11-28 | 11 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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" ;)) | ||||
* | | | doc: improve imptcp doc | Rainer Gerhards | 2012-11-26 | 1 | -8/+10 |
| | | | |||||
* | | | bugfix: supportoctetcountedframing parameter did not work in imptcp | Rainer Gerhards | 2012-11-25 | 2 | -1/+2 |
| | | | |||||
* | | | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2012-11-22 | 2 | -0/+5 |
|\| | | |||||
| * | | bugfix: hostname set in rsyslog.conf was not picked up until HUP | oxpa | 2012-11-22 | 2 | -0/+5 |
| | | | | | | | | | | | | which could also mean "never" or "not for a very long time". | ||||
* | | | typo fix | Rainer Gerhards | 2012-11-22 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-22 | 1 | -12/+20 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-22 | 1 | -12/+20 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | typo correction | Rainer Gerhards | 2012-11-22 | 1 | -5/+5 |
| | | | |||||
* | | | doc: mention imported patches in ChangeLog | Rainer Gerhards | 2012-11-22 | 1 | -2/+12 |
| | | | |||||
* | | | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2012-11-22 | 5 | -28/+97 |
|\| | | |||||
| * | | imklog: add new config params to module() parameter set | Rainer Gerhards | 2012-11-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | This is based on Marius Tomaschewski's set of patches, mostly just applied manually (as I need to mangle with the merge). |