[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0rc1-46-ga6bb86a
OISF Git
noreply at openinfosecfoundation.org
Mon Mar 3 09:17:40 UTC 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".
The branch, master has been updated
via a6bb86a9e0b916947ba977cfe86c01c784419f8a (commit)
via 941cfe16419d3c4a9fd09610c012b6cc896e912c (commit)
via 9f6527dc1687053f31abc2bb98afec6cbd07634b (commit)
via 1c48a81f91dacc91761618792cbb3ef2d553e59a (commit)
via d8a305356ea32175b89578245d0ecdfb714e1616 (commit)
via 00c8408c5542c98b0802ad395883eb465859eb31 (commit)
via 6b2ca63d9d162082083889e01bf7fca619b61b50 (commit)
via a12c46c700ac8d8e52a58146247f0d98d744f683 (commit)
via 970f22c752b692e585ec0e05b964ce62372c05d1 (commit)
via cd1c18d98194b5a0c249680f0eaa1bc3722bec92 (commit)
via 6b1517c0b83ca10c50be4dd6cc9076b1e62dddaa (commit)
via c41041a9c76f74ba99608391eb2e9b62143f6d32 (commit)
via b7baa561c0637fea90a2c062922879b6d615cc4e (commit)
from df927f7ea89b0652dd140bf2633422a76a00c9ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a6bb86a9e0b916947ba977cfe86c01c784419f8a
Author: Eric Leblond <eric at regit.org>
Date: Wed Feb 26 11:13:33 2014 +0100
Exit if BPF filter file is specified in IPS mode
This patch adds a check that was missing when specifying BPF filter
from a file. Suricata behavior should have been the same as when
BPF filter is specified on command line.
commit 941cfe16419d3c4a9fd09610c012b6cc896e912c
Author: Eric Leblond <eric at regit.org>
Date: Thu Feb 27 18:39:07 2014 +0100
ipfw: fix operator error in test
Fix warning spotted by clang on FreeBSD:
source-ipfw.c:241:49: warning: use of logical '||' with constant operand [-Wconstant-logical-operand]
if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
^ ~~~~~~~~~~~~~
source-ipfw.c:241:49: note: use '|' for a bitwise operation
if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
^~
|
Use same logic as the one used in other capture mode.
commit 9f6527dc1687053f31abc2bb98afec6cbd07634b
Author: Eric Leblond <eric at regit.org>
Date: Thu Feb 27 18:16:13 2014 +0100
ipfw: improve exit message
This patch synchronizes the exit message with what is done in
NFQ capture mode.
commit 1c48a81f91dacc91761618792cbb3ef2d553e59a
Author: Eric Leblond <eric at regit.org>
Date: Thu Feb 27 18:12:37 2014 +0100
ipfw: update running modes to hide device stats
This patch adds call to the function used to disable the display
of live device stats at exit.
commit d8a305356ea32175b89578245d0ecdfb714e1616
Author: Eric Leblond <eric at regit.org>
Date: Thu Feb 27 18:08:46 2014 +0100
nfq: update message displayed at exit
This patch updates the message displayed at exit to have something
more readable.
commit 00c8408c5542c98b0802ad395883eb465859eb31
Author: Eric Leblond <eric at regit.org>
Date: Thu Feb 27 18:07:34 2014 +0100
nfq: update running modes to hide device stats
This patch adds call to the function used to disable the display
of live device stats at exit.
commit 6b2ca63d9d162082083889e01bf7fca619b61b50
Author: Eric Leblond <eric at regit.org>
Date: Thu Feb 27 18:03:13 2014 +0100
util-device: add function to avoid stat display
In the case of running mode like NFQ there is no need possibility
to compute the statistics as it is done in LiveDevice (drop and
checksum count are meaningless).
This patch adds a function that allow running mode to disable the
display of the counters at exit.
commit a12c46c700ac8d8e52a58146247f0d98d744f683
Author: Eric Leblond <eric at regit.org>
Date: Thu Feb 27 17:33:42 2014 +0100
util-device: fix debug message
Reference to Pcap was not correct.
commit 970f22c752b692e585ec0e05b964ce62372c05d1
Author: Ken Steele <ken at tilera.com>
Date: Wed Feb 26 16:42:22 2014 -0500
Move memcpy_lower() into new util-memcpy.h
Remove local copies from each MPM file and use include file instead.
Might be better to also add util-memcpy.c rather than inlining it each time,
to get smaller code, since only seems to be used at initialization.
commit cd1c18d98194b5a0c249680f0eaa1bc3722bec92
Author: Ken Steele <ken at tilera.com>
Date: Wed Feb 26 16:15:42 2014 -0500
Store case-insensitive patterns as lowercase.
This is required because SCMemcmpLowercase() expects it first argument
to be already lowercase for the comparison. This is done by using
memcpy_tolower() for NO_CASE patterns.
This addresses code review comments from Victor.
commit 6b1517c0b83ca10c50be4dd6cc9076b1e62dddaa
Author: Ken Steele <ken at tilera.com>
Date: Thu Feb 13 23:21:53 2014 -0500
Remove case_state usage
The case_state in MPMs was just to track when a pid could have no-case and
case-sensitive matches for the same PID. Now that can't happen after fixing
bug 1110, so remove the code and storage for case_state.
commit c41041a9c76f74ba99608391eb2e9b62143f6d32
Author: Ken Steele <ken at tilera.com>
Date: Thu Feb 13 22:38:33 2014 -0500
When assigning Pattern IDs pids, check Case flags
This fixes bug 1110. When assigning PIDs, use the NO_CASE flag when comparing
for duplicates. The state of the flag must be the same, but also use the same
type of comparisons when checking for duplicates.
Previously, "foo":CS would match with "foo":CI when it should not.
and "foo":CI would not match "FoO":CI when it should. Both of those
cases are fixed with this change.
This then allows simplifying the use of pid in MPMs because now if they
pids match, then so do the flags, so checking the flags is not required.
commit b7baa561c0637fea90a2c062922879b6d615cc4e
Author: Ken Steele <ken at tilera.com>
Date: Wed Feb 12 15:23:44 2014 -0500
Cleanup in ac-tile MPM
Remove return from void functions.
Add some commments
Remove inline on functions where it doesn't make sense.
Rewrote if statement to be more clear.
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 1 +
src/detect-engine-mpm.c | 49 ++++++++--
src/runmode-ipfw.c | 6 ++
src/runmode-nfq.c | 7 ++
src/source-ipfw.c | 8 +-
src/source-nfq.c | 6 +-
src/suricata.c | 7 ++
src/util-device.c | 17 +++-
src/util-device.h | 1 +
src/{util-logopenfile-tile.h => util-memcpy.h} | 29 ++++--
src/util-mpm-ac-bs.c | 95 +++---------------
src/util-mpm-ac-bs.h | 3 +-
src/util-mpm-ac-gfbs.c | 76 ++-------------
src/util-mpm-ac-gfbs.h | 3 +-
src/util-mpm-ac-tile.c | 124 +++++++-----------------
src/util-mpm-ac-tile.h | 3 +-
src/util-mpm-ac.c | 100 +++----------------
src/util-mpm-ac.h | 3 +-
src/util-mpm-b2g.c | 12 +--
src/util-mpm-b3g.c | 8 +-
20 files changed, 193 insertions(+), 365 deletions(-)
copy src/{util-logopenfile-tile.h => util-memcpy.h} (57%)
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list