[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta3-171-g00d6298
OISF Git
noreply at openinfosecfoundation.org
Thu Apr 16 08:43:28 UTC 2015
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 00d62986666a4f78552de6157278b7399b7ca878 (commit)
via ab7882fbf38a9e0dcf796f8554e1f847072d7b46 (commit)
via e8a59250122008277d759c8c12de258a7ca0ed51 (commit)
via f2349e10ad42591b1781593c180773b0b6fbd274 (commit)
via 67dd5c0430dda97c8ba15b9fada525b5eee0acb1 (commit)
via ca1f3e68d4b75f88c9b4ef72298c572411bc5051 (commit)
via fbdcffabc2ebe36f663aeacc431407b3e130ed43 (commit)
via 7b79b9458d0b3f5675618d3bbed5c903b05c36d1 (commit)
via 57d93cbcfec50ade29350cbfd423dbb4bbf832ec (commit)
via 8e6453faacbdde56dd456eafebcdb4b76316e7ab (commit)
via dea8dda3c19773ba51a6bb67d9e365047251c598 (commit)
via f77c3d9a2c5602a088ebf5fb92659ee480bf42b6 (commit)
via a716dded04d493618b47e5d89eb9b4d4a6a4dbc3 (commit)
via 61cb2abc8d3dab3e17663a0db21d2d910bd0bdbe (commit)
via 4c6d564211f41348d8c28af5c4a0af9893c3d82d (commit)
via 2cb0df7cf98798865b212a7e7a82237a09698ebe (commit)
via be725a5ba2b1dba6905bc89667ed57269581f926 (commit)
via d67fd306f855a6d394b9bd8ec494d04723d6dc98 (commit)
via 5c880377ae6dd62f5fbc43224b890aa331c92f4f (commit)
via 99ae643e4e6142d5dea9c8a82aac4e8ed1d70679 (commit)
from f7a25f2b241fa3cc93f3c82654e6891f231a86ba (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 00d62986666a4f78552de6157278b7399b7ca878
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 22:43:21 2014 +0100
host: handle timeout
Set expiration for regular hostbits keyword.
commit ab7882fbf38a9e0dcf796f8554e1f847072d7b46
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 22:19:11 2014 +0100
ippair: handle timeouts in the flow manager
Like host and defrag, handle timeouts of ippair in the first flow
manager thread.
commit e8a59250122008277d759c8c12de258a7ca0ed51
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 21:30:12 2014 +0100
ippair: implement basic timeout check
The only user is the xbits subsys, so it's timeout controls all.
commit f2349e10ad42591b1781593c180773b0b6fbd274
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 21:12:15 2014 +0100
hosts: consider hostbits/xbits status in timeout
Consider the host's xbits expiry status when checking the host for
timeout. If a single active non-expired bit is found, the host won't
be timeout just yet.
commit 67dd5c0430dda97c8ba15b9fada525b5eee0acb1
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 20:02:19 2014 +0100
host: implement hostbits/xbits expire
commit ca1f3e68d4b75f88c9b4ef72298c572411bc5051
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 19:07:48 2014 +0100
ippair: implement xbits expiration
commit fbdcffabc2ebe36f663aeacc431407b3e130ed43
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 17:14:53 2014 +0100
xbits: expire (first steps)
commit 7b79b9458d0b3f5675618d3bbed5c903b05c36d1
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 13:39:23 2014 +0100
xbits: implement ip_src/ip_dst support
Just a wrapper for regular 'hostbits'.
commit 57d93cbcfec50ade29350cbfd423dbb4bbf832ec
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 12:28:01 2014 +0100
hostbits: prepare for xbits integration
commit 8e6453faacbdde56dd456eafebcdb4b76316e7ab
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 12:24:03 2014 +0100
xbits: prepare for non-ippair support
commit dea8dda3c19773ba51a6bb67d9e365047251c598
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 12:02:59 2014 +0100
vars: redo var name <-> idx handling
Can't use sm type anymore as multiple var carriers (host/flow/etc) will
all have xbits.
commit f77c3d9a2c5602a088ebf5fb92659ee480bf42b6
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 10:06:30 2014 +0100
xbits: hostbits use xbits type
Make hostbits use xbits type.
commit a716dded04d493618b47e5d89eb9b4d4a6a4dbc3
Author: Victor Julien <victor at inliniac.net>
Date: Sat Dec 20 10:00:24 2014 +0100
xbit: move to util-var
We can reuse the type for hostbits and flowbits as well.
commit 61cb2abc8d3dab3e17663a0db21d2d910bd0bdbe
Author: Victor Julien <victor at inliniac.net>
Date: Fri Dec 19 17:40:36 2014 +0100
ippair: xbit implementation
detect xbits for ippair: initial implementation
commit 4c6d564211f41348d8c28af5c4a0af9893c3d82d
Author: Victor Julien <victor at inliniac.net>
Date: Tue Dec 16 11:22:24 2014 +0100
hostbits: unittest cleanups
commit 2cb0df7cf98798865b212a7e7a82237a09698ebe
Author: Victor Julien <victor at inliniac.net>
Date: Tue Dec 16 08:41:23 2014 +0100
hostbits: allow for src/dst parameter
By default, the hostbit checks the 'src' host. By adding the dst option
the dst host is used instead.
commit be725a5ba2b1dba6905bc89667ed57269581f926
Author: Victor Julien <victor at inliniac.net>
Date: Sun Dec 14 00:04:47 2014 +0100
hostbits: add more tests, include sigorder
commit d67fd306f855a6d394b9bd8ec494d04723d6dc98
Author: Victor Julien <victor at inliniac.net>
Date: Sun Dec 14 00:04:14 2014 +0100
hostbits: implement sigorder
Like with flowbits, make sure that 'set's are evaluated before
'isset's, etc.
commit 5c880377ae6dd62f5fbc43224b890aa331c92f4f
Author: Victor Julien <victor at inliniac.net>
Date: Fri Dec 12 23:40:30 2014 +0100
detect: hostbits keyword
Per host bit similar to 'flowbits'.
Initial code that uses just the 'src' ip for the operations.
commit 99ae643e4e6142d5dea9c8a82aac4e8ed1d70679
Author: Victor Julien <victor at inliniac.net>
Date: Thu Dec 18 23:33:03 2014 +0100
ippair: track ippairs, enable tests
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 8 +
src/detect-engine-sigorder.c | 135 ++++++
src/detect-engine-sigorder.h | 2 +
src/detect-flowbits.c | 10 +-
src/detect-flowint.c | 4 +-
src/detect-flowvar.c | 2 +-
src/{detect-flowbits.c => detect-hostbits.c} | 699 ++++++++++++++++++---------
src/{alert-debuglog.h => detect-hostbits.h} | 14 +-
src/detect-lua.c | 4 +-
src/detect-pcre.c | 4 +-
src/detect-xbits.c | 547 +++++++++++++++++++++
src/{detect-flowbits.h => detect-xbits.h} | 39 +-
src/detect.c | 6 +-
src/detect.h | 3 +
src/flow-manager.c | 2 +
src/host-bit.c | 504 +++++++++++++++++++
src/{detect-dsize.h => host-bit.h} | 29 +-
src/host-timeout.c | 9 +-
src/host.c | 7 +
src/host.h | 5 +
src/ippair-bit.c | 507 +++++++++++++++++++
src/{detect-dsize.h => ippair-bit.h} | 28 +-
src/{host-queue.c => ippair-queue.c} | 43 +-
src/{host-queue.h => ippair-queue.h} | 33 +-
src/ippair-storage.c | 299 ++++++++++++
src/{host-storage.h => ippair-storage.h} | 26 +-
src/{host-timeout.c => ippair-timeout.c} | 86 ++--
src/{host-timeout.h => ippair-timeout.h} | 11 +-
src/ippair.c | 687 ++++++++++++++++++++++++++
src/{host.h => ippair.h} | 102 ++--
src/runmode-unittests.c | 8 +
src/runmode-unix-socket.c | 3 +
src/suricata.c | 8 +
src/util-error.c | 1 +
src/util-error.h | 1 +
src/util-storage.c | 2 +
src/util-storage.h | 1 +
src/util-var-name.c | 10 +-
src/util-var-name.h | 4 +-
src/util-var.c | 17 +
src/util-var.h | 27 ++
41 files changed, 3488 insertions(+), 449 deletions(-)
copy src/{detect-flowbits.c => detect-hostbits.c} (56%)
copy src/{alert-debuglog.h => detect-hostbits.h} (72%)
create mode 100644 src/detect-xbits.c
copy src/{detect-flowbits.h => detect-xbits.h} (50%)
create mode 100644 src/host-bit.c
copy src/{detect-dsize.h => host-bit.h} (61%)
create mode 100644 src/ippair-bit.c
copy src/{detect-dsize.h => ippair-bit.h} (60%)
copy src/{host-queue.c => ippair-queue.c} (72%)
copy src/{host-queue.h => ippair-queue.h} (78%)
create mode 100644 src/ippair-storage.c
copy src/{host-storage.h => ippair-storage.h} (58%)
copy src/{host-timeout.c => ippair-timeout.c} (56%)
copy src/{host-timeout.h => ippair-timeout.h} (81%)
create mode 100644 src/ippair.c
copy src/{host.h => ippair.h} (60%)
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list