[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta3-95-ge250040
OISF Git
noreply at openinfosecfoundation.org
Mon Mar 16 15:54:32 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 e250040b72169536022efdac017eaddb0a58d37a (commit)
via da3e8ad8f6e77583cc7998057d41959a85758868 (commit)
via 840efe17fe00ab10a231648ea17964024eb1d47e (commit)
via e984a57203722e45335e113ee8a5b96f5dfd82b5 (commit)
via 2a23627a82a655b808ca4dd67e8f40194c491333 (commit)
via 774bb9035130efb95d32fe349e11483394dc2377 (commit)
via 6279da0fbd643ea365f338bb5c27246da09f9aaa (commit)
via 1cf02560c8aa60ec3f009f4efee28ac08dcfb637 (commit)
via 866d9684eaef61481d9a3bb52ab057e772980d05 (commit)
via 7e752799771b8c4df725dd228ba8cca3b07412be (commit)
via eec22ce19b597d56efea8470a2c665374f14794d (commit)
via bf818b8fb244fad460dfd776c83438e29fb01d04 (commit)
via 206f9d40108d72c687e5444e5c987d525843934c (commit)
via e390e24a7cabe9ae8bf7fd39868d8d23d5f9eed6 (commit)
via 072ae12771f516e23ba23aa21b78f32757858566 (commit)
via b710f2dd59fbfc676ad3b3ee9f444d23bb3a8b13 (commit)
via 54cb2b68774c5e037777d22703ecf47427f2273a (commit)
via 97cab030d77cac2ab016953008929adcf9e60235 (commit)
via 9f1b4176608bf71d75b83910a02b82948b35eee4 (commit)
via 6723d03c7e1e2bdafe06249c6c8bd54669d3e0a7 (commit)
via c0f265fd82cdf4fccad2eb8c53f37ce325d5d438 (commit)
via 5b8c94db3026bcfd324eaa6f61a1655358182667 (commit)
from 2d7f79a62bc1ad75dd5d97b1a43710a5b36552cc (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 e250040b72169536022efdac017eaddb0a58d37a
Author: Victor Julien <victor at inliniac.net>
Date: Tue Mar 10 17:41:03 2015 +0100
detect-state: implement tx state reset for reload
In case of Detect Reload, we need to reset active tx' state.
commit da3e8ad8f6e77583cc7998057d41959a85758868
Author: Victor Julien <victor at inliniac.net>
Date: Fri Feb 27 15:21:17 2015 +0100
detect-state: split flow and tx state
Use separate data structures for storing TX and FLOW (AMATCH) detect
state.
- move state storing into util funcs
- remove de_state_m
- simplify reset state logic on reload
commit 840efe17fe00ab10a231648ea17964024eb1d47e
Author: Victor Julien <victor at inliniac.net>
Date: Mon Mar 9 15:58:07 2015 +0100
modbus: tx de_state
commit e984a57203722e45335e113ee8a5b96f5dfd82b5
Author: Victor Julien <victor at inliniac.net>
Date: Mon Mar 9 15:45:39 2015 +0100
smtp: tx de_state
commit 2a23627a82a655b808ca4dd67e8f40194c491333
Author: Victor Julien <victor at inliniac.net>
Date: Mon Mar 9 15:32:40 2015 +0100
dns: implement tx de_state
commit 774bb9035130efb95d32fe349e11483394dc2377
Author: Victor Julien <victor at inliniac.net>
Date: Mon Mar 9 11:08:47 2015 +0100
http: clean up tx destate at tx destroy
commit 6279da0fbd643ea365f338bb5c27246da09f9aaa
Author: Victor Julien <victor at inliniac.net>
Date: Fri Mar 6 19:37:55 2015 +0100
http: support per TX destate storage
commit 1cf02560c8aa60ec3f009f4efee28ac08dcfb637
Author: Victor Julien <victor at inliniac.net>
Date: Fri Mar 6 19:11:10 2015 +0100
app-layer: per tx destate
Add API calls for storing detection state in the TX.
commit 866d9684eaef61481d9a3bb52ab057e772980d05
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 18:40:31 2015 +0100
detect-state: fix profiling
commit 7e752799771b8c4df725dd228ba8cca3b07412be
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 18:38:04 2015 +0100
detect-state: various cleanups
commit eec22ce19b597d56efea8470a2c665374f14794d
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 17:23:49 2015 +0100
detect-state: rip per sig detect out of ContinueDetect
commit bf818b8fb244fad460dfd776c83438e29fb01d04
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 17:32:36 2015 +0100
detect-state: remove DeStateResetFileInspection
It was effectively unused.
commit 206f9d40108d72c687e5444e5c987d525843934c
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 17:49:30 2015 +0100
detect-state: remove redundant code
commit e390e24a7cabe9ae8bf7fd39868d8d23d5f9eed6
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 16:11:31 2015 +0100
detect-state: add helper to test state
Add little helper function StateIsValid() to test if the state
can be inspected safely.
Cleans up stateful detection loops.
commit 072ae12771f516e23ba23aa21b78f32757858566
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 15:58:43 2015 +0100
detect-state: add helper to indicate last tx
Add little helper to indicate current tx is that last we have.
commit b710f2dd59fbfc676ad3b3ee9f444d23bb3a8b13
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 15:23:41 2015 +0100
detect-state: cleanup ContinueDetection
Only lock f->de_state->m when we start to access it. So after
declaration and initialization of local vars.
commit 54cb2b68774c5e037777d22703ecf47427f2273a
Author: Victor Julien <victor at inliniac.net>
Date: Thu Feb 26 15:02:21 2015 +0100
detect-state: cleanup retvals
Use DETECT_ENGINE_INSPECT_SIG_* instead of 0, 1, 2 and 3.
commit 97cab030d77cac2ab016953008929adcf9e60235
Author: Victor Julien <victor at inliniac.net>
Date: Mon Mar 9 15:49:28 2015 +0100
modbus: shrink data structure
commit 9f1b4176608bf71d75b83910a02b82948b35eee4
Author: Victor Julien <victor at inliniac.net>
Date: Fri Feb 27 17:10:09 2015 +0100
file: don't 'close' file if we need to track it
commit 6723d03c7e1e2bdafe06249c6c8bd54669d3e0a7
Author: Victor Julien <victor at inliniac.net>
Date: Mon Mar 9 14:56:24 2015 +0100
http: add inspection engine for http request line
No MPM though.
commit c0f265fd82cdf4fccad2eb8c53f37ce325d5d438
Author: Victor Julien <victor at inliniac.net>
Date: Fri Feb 27 00:04:11 2015 +0100
http: fix stat_msg and stat_code state tracking
commit 5b8c94db3026bcfd324eaa6f61a1655358182667
Author: Victor Julien <victor at inliniac.net>
Date: Sat Feb 21 14:19:48 2015 +0100
Remove spinning PacketPoolWait
PacketPoolWait in autofp can wait for considerable time. Until now
it was essentially spinning, keeping the CPU 100% busy.
This patch introduces a condition to wait in such cases.
Atomically flag pool that consumer is waiting, so that we can sync
the pending pool right away instead of waiting for the
MAX_PENDING_RETURN_PACKETS limit.
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 1 +
src/app-layer-dns-common.c | 16 +
src/app-layer-dns-common.h | 4 +
src/app-layer-dns-tcp.c | 2 +
src/app-layer-dns-udp.c | 2 +
src/app-layer-htp.c | 27 +
src/app-layer-htp.h | 2 +
src/app-layer-modbus.c | 18 +
src/app-layer-modbus.h | 7 +-
src/app-layer-parser.c | 40 +
src/app-layer-parser.h | 8 +
src/app-layer-smtp.c | 17 +
src/app-layer-smtp.h | 1 +
src/detect-engine-content-inspection.h | 1 +
src/{detect-engine-uri.c => detect-engine-hrl.c} | 19 +-
src/{detect-engine-uri.h => detect-engine-hrl.h} | 14 +-
src/detect-engine-hscd.c | 2 +-
src/detect-engine-hsmd.c | 2 +-
src/detect-engine-state.c | 1037 +++++++++++++---------
src/detect-engine-state.h | 34 +-
src/detect-engine.c | 10 +
src/detect-lua.c | 2 +-
src/detect-parse.c | 2 +
src/detect.c | 13 +-
src/detect.h | 2 +
src/flow-util.h | 12 +-
src/flow.h | 7 +-
src/tmqh-packetpool.c | 17 +-
src/tmqh-packetpool.h | 3 +
src/util-file.c | 6 +-
30 files changed, 869 insertions(+), 459 deletions(-)
copy src/{detect-engine-uri.c => detect-engine-hrl.c} (99%)
copy src/{detect-engine-uri.h => detect-engine-hrl.h} (75%)
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list