summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-172-8/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| * | | | Fix other small memory leaks in template() processingRainer Gerhards2012-09-171-4/+7
| | | | |
| * | | | bugfix: small memory leaks in template() statementsRainer Gerhards2012-09-172-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-145-3/+23
|\| | | | | |/ / / |/| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-145-3/+23
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
| | |\|
| | | * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
| | | |
| | * | Fix length calculation for script string constantsRainer Gerhards2012-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This could lead to various problems, like if-filters not working. Note this is a regression from yesterdays escape fix, so there exist no released version with this problem.
| | * | Fix new testbench testRainer Gerhards2012-09-141-1/+1
| | | |
| | * | Add test for script-based contains filter to testbenchRainer Gerhards2012-09-143-0/+20
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-136-80/+275
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | fix ChangeLogRainer Gerhards2012-09-131-3/+15
| | | | | | | | | | | | | | | | got messed-up during merge :-(
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-136-80/+254
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| | * | Fixing string unescaping (new code from this morning's commit)Rainer Gerhards2012-09-131-1/+1
| | | |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-132-78/+87
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c
| | | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
| | | | | | | | | | | | | | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
| | * | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later.
| | * | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
| | | |
* | | | preparing for 7.1.2 releasev7.1.2Rainer Gerhards2012-09-123-2/+11
| | | |
* | | | new ruleengine: fix memory leakRainer Gerhards2012-09-121-0/+3
| | | |
* | | | another small cleanupRainer Gerhards2012-09-121-1/+0
| | | |
* | | | bugfix: abort when invalid property name was configuredRainer Gerhards2012-09-122-1/+7
| | | |
* | | | cleanupRainer Gerhards2012-09-121-1/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-123-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-122-8/+10
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
| | |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| | | |
| | | * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
| * | | forward-compatibility patch for $ruleset processingRainer Gerhards2012-09-122-0/+5
| | | | | | | | | | | | | | | | | | | | v7 needs a different handling, it's easer in the long term if we introduce this in v6 as well. Non-intrusive change.
* | | | new ruleengine: properly handle $ruleset directiveRainer Gerhards2012-09-123-4/+9
| | | |
* | | | new ruleengine: fixed action handling in regard to filtersRainer Gerhards2012-09-124-78/+76
| | | | | | | | | | | | | | | | This was not yet adapted to the new "active" structure.
* | | | new ruleengine: bugfix, messages were processed multiple timesRainer Gerhards2012-09-121-10/+2
| | | |
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-09-111-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\ \ \ | | | |/ | | |/|
| | * | fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| | | |
* | | | doc nit: version in v7 compatibility docRainer Gerhards2012-09-111-1/+1
| | | |
* | | | minor nit: version nbr in doc main indexRainer Gerhards2012-09-111-1/+1
| | | |
* | | | preparing for 7.1.1 releasev7.1.1Rainer Gerhards2012-09-112-2/+7
| | | |
* | | | new ruleengine: properly remove BSD-style blocksRainer Gerhards2012-09-118-192/+124
| | | |
* | | | Fix length problem with _CMDLINEMilan Bartos2012-09-111-3/+3
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | correct library link orderRainer Gerhards2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution.
* | | | Merge branch 'master-newruleset'Rainer Gerhards2012-09-1014-535/+719
|\ \ \ \
| * | | | new ruleengine: fix memory leaks & a little cleanupRainer Gerhards2012-09-102-8/+5
| | | | |
| * | | | new ruleengine: more cleanupRainer Gerhards2012-09-103-210/+3
| | | | |
| * | | | new ruleengine: cleanupRainer Gerhards2012-09-072-54/+0
| | | | |
| * | | | new ruleengine: properly freeing stmt treeRainer Gerhards2012-09-064-5/+53
| | | | |
| * | | | new ruleengine: restore action iterator functionalityRainer Gerhards2012-09-064-50/+41
| | | | |
| * | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-064-8/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-068-9/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c
| * | | | | | new ruleengine: some cleanupRainer Gerhards2012-09-067-104/+4
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 22:35:43 +0000