[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.1.2-65-gbbbc5ab
OISF Git
noreply at openinfosecfoundation.org
Mon Sep 19 18:51:55 UTC 2016
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 bbbc5ab1fcd7cb8b38a3ccb698c92f1439f8cbea (commit)
via 108d37a52defb8c1298f1bfdf8c3d2c4d8eeef2e (commit)
via a1de7e6dae450923eef68e23e61596eae3e6a795 (commit)
via 5a783e6854caf308eed9adfa516135101a0539d6 (commit)
via 8865009fcaf0dfeed3423d184482b1a94a4eee4f (commit)
via 688e8dbe7f4e085ae72cb140bb0192fd0742bd5c (commit)
via 55f2704a25876a1a9886a72f3057f7b5cf3ab8d7 (commit)
via 00b6e628d17f16789bfba1c4e8ca3029cef4f021 (commit)
via f8c2c3653bcfaecaaf0e9d7d20b0fd066ac3f9e4 (commit)
via 1b4ba4496c9dc08b61e26d169c6a05dd0df47a0b (commit)
via 04a44a077d06567b68381ee8e62e45237b958fec (commit)
via a093580527cf6cfa448be02f27681f561520492c (commit)
via fc35a78ba14c04c528adf198f8f10b97521e8012 (commit)
via d2c17ce9a04cf8ce445afbcaf8c801c627abc9cb (commit)
via 9489d5b9e36e4f0fbcffc157a330aad3e8a96563 (commit)
via 8b38b9d728d9b909b8ed5e663823f8410b42364c (commit)
via fa27a7646255ad684264b6d21e035344ff069d89 (commit)
via 42b8f302727ee416e010273669f5da573017074a (commit)
via 7a0737b9a9ce074693f3452f8200d0708936f47c (commit)
via 7cb16bc90d9fadc5ea821c1b426539944ac3e2fd (commit)
via 7a8e8343e52b2d6226c61447400727904a54604e (commit)
via 4d8b8ca0461fe80fb7d4f370f9639b3cf9bd8e38 (commit)
via 60b6ccc3c40696cae23ae3a49bd2aa46b6ac565e (commit)
via f9bb9029c543d376a81ad59a824d470026caacba (commit)
via 669827ae169c22ca5de14d8e19d8337f17402202 (commit)
via b580016c805d05a0d57964d914504ed7a9105c9f (commit)
via 9475c8371380f37ee83aecf8e30f47e6dbe128aa (commit)
via e00dcd52a0b3da1e39ba4d8d5d6043c0a97e03cc (commit)
via 869d2eb701daa6660692c0344eb0951a24d0db07 (commit)
via 5bbb4fd1341e9b204786b262743c94bb85f14a59 (commit)
via b605984f34aa3150afd4852bc9ff9f278a5a500a (commit)
via bac65f09e8aa810c9768e0f814e0e3d9c841b564 (commit)
via 38354479b7b18ddde3d905c106eb33097aa841c0 (commit)
via 3fea12d7b32e8c5ce4d8052d3886cd9ff6f6d676 (commit)
via 01cc50825718171f2adf92d406d9d6d5482f55fb (commit)
via 983a619ff075888b645d3dba4c72a078960f0cf3 (commit)
via ad15ac829761f0f1b429fd3f3c8f43dae18eaee9 (commit)
via aaa65f3d16174bf149ccffa98f23569de6c91039 (commit)
via 31663f1627e1e574b1c84c9a58ce048a657e9e24 (commit)
via dedda33f01a180214c2355a85f18e344c959a11f (commit)
via 687602c0ca2517f6e1c74f3d1b36aa494f085dce (commit)
via b1200dba54053cf9faccf080ff2f3e759acc9cc1 (commit)
via 637aa346109eefdc96131585cdb0a986336ab870 (commit)
via 99dce740ef3ab5bdeb0d5fc1c2fa6499a230132b (commit)
via e173016ded711e0bc26dee0dd013c8cb8a447a9a (commit)
via 9030e89c946819a4b4850bdb95ffab27d9279c8c (commit)
via c957c62824bff022f4633fcf24345828c02b04ad (commit)
via 621860f5b2d188a99ea2c04bdfa791f9892febc0 (commit)
via bcfa484bce226cda03c88edaadd82752156b95ee (commit)
via 85db260eed58c006ecac17277ccb016c5499f926 (commit)
via 045c10db43ca97fe0c2ebf70e8af6c874f3cad71 (commit)
via fb655d5f152bcd04d049631a15831142fc478fb5 (commit)
from 54503ef31012fe779b9abfd08911fa1b61d80234 (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 bbbc5ab1fcd7cb8b38a3ccb698c92f1439f8cbea
Author: Jason Ish <ish at unx.ca>
Date: Mon Sep 12 10:39:14 2016 -0600
setup-app-layer-logger.sh: update for logging changes
commit 108d37a52defb8c1298f1bfdf8c3d2c4d8eeef2e
Author: Jason Ish <ish at unx.ca>
Date: Wed Aug 24 08:39:39 2016 -0600
logging: proper failure on memory allocation error
unwinds all previous logger allocations
commit a1de7e6dae450923eef68e23e61596eae3e6a795
Author: Jason Ish <ish at unx.ca>
Date: Fri Jul 15 08:14:03 2016 -0600
flow-vars: remove flow locks
Code is now entered under flow lock.
commit 5a783e6854caf308eed9adfa516135101a0539d6
Author: Jason Ish <ish at unx.ca>
Date: Fri Jul 15 08:13:16 2016 -0600
flow-bits: remove flow locks
Code is now entered under flow lock.
commit 8865009fcaf0dfeed3423d184482b1a94a4eee4f
Author: Jason Ish <ish at unx.ca>
Date: Thu Jul 14 09:53:59 2016 -0600
lua: remove flow locking from the lua layer
commit 688e8dbe7f4e085ae72cb140bb0192fd0742bd5c
Author: Jason Ish <ish at unx.ca>
Date: Wed Jul 13 17:07:45 2016 -0600
stream: remove lock from StreamTcpSegmentForEach
This is only entered from logging functions which are already
called with a locked flow.
commit 55f2704a25876a1a9886a72f3057f7b5cf3ab8d7
Author: Jason Ish <ish at unx.ca>
Date: Wed Jul 13 10:48:14 2016 -0600
logging: remove the packetqueue's from the logging path
They are not referenced by any loggers, and they probably
shouldn't be either.
commit 00b6e628d17f16789bfba1c4e8ca3029cef4f021
Author: Jason Ish <ish at unx.ca>
Date: Mon Jun 20 09:52:28 2016 -0600
logging: hook into flow worker thread
commit f8c2c3653bcfaecaaf0e9d7d20b0fd066ac3f9e4
Author: Jason Ish <ish at unx.ca>
Date: Wed Jun 8 13:56:35 2016 -0600
output-streaming: free thread store on deinit
commit 1b4ba4496c9dc08b61e26d169c6a05dd0df47a0b
Author: Jason Ish <ish at unx.ca>
Date: Tue Jun 7 17:20:23 2016 -0600
logging: rename registration functions to not have tmm
As the logging modules are no longer threading modules, rename
them so they don't look like they are being registered as
threading modules.
Also, move the registration to the output.c which will handle
registration of the loggers.
commit 04a44a077d06567b68381ee8e62e45237b958fec
Author: Jason Ish <ish at unx.ca>
Date: Tue Jun 7 14:56:17 2016 -0600
logging: convert pcap log to non-thread module
commit a093580527cf6cfa448be02f27681f561520492c
Author: Jason Ish <ish at unx.ca>
Date: Tue Jun 7 14:55:18 2016 -0600
logging: just return if no tx loggers
commit fc35a78ba14c04c528adf198f8f10b97521e8012
Author: Jason Ish <ish at unx.ca>
Date: Mon Jun 6 13:58:37 2016 -0600
logging: use a single entry point for all loggers
Introduces a new thread module, TMM_LOGGER, which is the
root most logger.
Only handles loggers in the packet path, stats and flow
logging are not included.
The loggers are made up of a hierarchy of loggers. At the top we
have the root logger which is the main entry point to
logging. Under the root there exists parent loggers that are the
entry point for specific types of loggers such as packet logger,
transaction loggers, etc. Each parent logger may have 0 or more
loggers that actual handle the job of producing output to something
like a file.
commit d2c17ce9a04cf8ce445afbcaf8c801c627abc9cb
Author: Jason Ish <ish at unx.ca>
Date: Mon Jun 6 14:38:56 2016 -0600
logging: remove output priorities: not used
commit 9489d5b9e36e4f0fbcffc157a330aad3e8a96563
Author: Jason Ish <ish at unx.ca>
Date: Fri Jun 3 15:38:02 2016 -0600
logging: remove dead code from output-json
The "parent" json logger was setup like a real logger, but
some of that code was never being called.
commit 8b38b9d728d9b909b8ed5e663823f8410b42364c
Author: Jason Ish <ish at unx.ca>
Date: Sun May 29 00:11:03 2016 -0600
output.[ch]: consistent style
- Clean up function declaration.
- Consistenly use typedefs for function points.
No functional changes.
commit fa27a7646255ad684264b6d21e035344ff069d89
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 18:57:06 2016 -0600
logging: add profiling back for non-tmm loggers
The loggers moved away from a TMM required a new
profiling support.
commit 42b8f302727ee416e010273669f5da573017074a
Author: Jason Ish <ish at unx.ca>
Date: Tue May 31 10:23:34 2016 -0600
logging: convert lua output to non-thread module
commit 7a0737b9a9ce074693f3452f8200d0708936f47c
Author: Jason Ish <ish at unx.ca>
Date: Fri Jun 3 10:48:10 2016 -0600
logging: convert tls log to non-thread module
commit 7cb16bc90d9fadc5ea821c1b426539944ac3e2fd
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 13:16:22 2016 -0600
logging: convert alert debug log to non-thread module
commit 7a8e8343e52b2d6226c61447400727904a54604e
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 13:12:06 2016 -0600
logging: convert tcp data logging to non-thread module
commit 4d8b8ca0461fe80fb7d4f370f9639b3cf9bd8e38
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 13:03:58 2016 -0600
logging: convert tls store logging to non-thread module
commit 60b6ccc3c40696cae23ae3a49bd2aa46b6ac565e
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 12:55:50 2016 -0600
logging: convert file data logging to non-thread module
commit f9bb9029c543d376a81ad59a824d470026caacba
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 11:59:13 2016 -0600
logging: convert file logging to non-thread module
commit 669827ae169c22ca5de14d8e19d8337f17402202
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 10:45:11 2016 -0600
logging: convert unified2 to non-thread module
commit b580016c805d05a0d57964d914504ed7a9105c9f
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 10:39:50 2016 -0600
logging: convert stats loggers to non-thread module
commit 9475c8371380f37ee83aecf8e30f47e6dbe128aa
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 10:21:19 2016 -0600
logging: convert http log to non-thread module
commit e00dcd52a0b3da1e39ba4d8d5d6043c0a97e03cc
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 10:17:21 2016 -0600
logging: convert alert syslog to non-thread module
commit 869d2eb701daa6660692c0344eb0951a24d0db07
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 10:10:02 2016 -0600
logging: convert drop output to non-thread module
commit 5bbb4fd1341e9b204786b262743c94bb85f14a59
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 10:05:44 2016 -0600
logging: convert json template output to non-thread module
commit b605984f34aa3150afd4852bc9ff9f278a5a500a
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 10:01:54 2016 -0600
tests: setup unit test framework earlier
Allows tests to be registered early, in support of moving
outputs away from thread modules.
commit bac65f09e8aa810c9768e0f814e0e3d9c841b564
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 02:05:30 2016 -0600
logging: convert json drop output to non-thread module
commit 38354479b7b18ddde3d905c106eb33097aa841c0
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 02:01:52 2016 -0600
logging: convert json smtp output to non-thread module
commit 3fea12d7b32e8c5ce4d8052d3886cd9ff6f6d676
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 02:00:24 2016 -0600
logging: convert json ssh output to non-thread module
commit 01cc50825718171f2adf92d406d9d6d5482f55fb
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 01:54:36 2016 -0600
logging: convert json netflow output to non-thread module
commit 983a619ff075888b645d3dba4c72a078960f0cf3
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 01:52:01 2016 -0600
logging: convert json flow output to non-thread module
commit ad15ac829761f0f1b429fd3f3c8f43dae18eaee9
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 01:33:10 2016 -0600
logging: convert json alert output to non-thread module
commit aaa65f3d16174bf149ccffa98f23569de6c91039
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 01:18:22 2016 -0600
logging: convert json tls output to non-thread module
commit 31663f1627e1e574b1c84c9a58ce048a657e9e24
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 01:07:10 2016 -0600
logging: convert prelude output to non-thread module
commit dedda33f01a180214c2355a85f18e344c959a11f
Author: Jason Ish <ish at unx.ca>
Date: Fri May 27 01:03:13 2016 -0600
logging: convert eve http to non-thread module
commit 687602c0ca2517f6e1c74f3d1b36aa494f085dce
Author: Jason Ish <ish at unx.ca>
Date: Thu May 26 22:26:04 2016 -0600
logging: convert eve dns logging to non-thread module
commit b1200dba54053cf9faccf080ff2f3e759acc9cc1
Author: Jason Ish <ish at unx.ca>
Date: Thu May 26 10:45:55 2016 -0600
logging: convert fast log to a non-thread module
commit 637aa346109eefdc96131585cdb0a986336ab870
Author: Jason Ish <ish at unx.ca>
Date: Wed May 25 23:32:48 2016 -0600
logging: convert dns log to a non-thread module
commit 99dce740ef3ab5bdeb0d5fc1c2fa6499a230132b
Author: Victor Julien <victor at inliniac.net>
Date: Fri Sep 16 18:29:18 2016 +0200
detect: mark alproto in keyword reg deprecated
No existing code uses it, and it had been useless for some time.
commit e173016ded711e0bc26dee0dd013c8cb8a447a9a
Author: Victor Julien <victor at inliniac.net>
Date: Fri Sep 16 18:27:47 2016 +0200
gitignore: update to hide more local files
commit 9030e89c946819a4b4850bdb95ffab27d9279c8c
Author: Victor Julien <victor at inliniac.net>
Date: Fri Sep 16 18:24:29 2016 +0200
detect: don't set alproto while registering keyword
The field is not used except for some printing, and is wrong for
many keywords.
commit c957c62824bff022f4633fcf24345828c02b04ad
Author: Victor Julien <victor at inliniac.net>
Date: Fri Sep 16 15:13:33 2016 +0200
detect file: enable HTTP inspection from validate func
commit 621860f5b2d188a99ea2c04bdfa791f9892febc0
Author: Victor Julien <victor at inliniac.net>
Date: Fri Sep 16 14:40:35 2016 +0200
detect file: enforce protocol in single place
Instead of trying to enforce the app layer protocol in each file
function, enforce it in the generic validation function.
commit bcfa484bce226cda03c88edaadd82752156b95ee
Author: Victor Julien <victor at inliniac.net>
Date: Fri Sep 16 14:39:56 2016 +0200
app-layer: add function to check if app-layer supports files
commit 85db260eed58c006ecac17277ccb016c5499f926
Author: Victor Julien <victor at inliniac.net>
Date: Thu Jul 14 10:36:54 2016 +0200
threads: remove EngineKill & SURICATA_KILL
EngineStop and EngineKill were effectively doing the same, so
removed the kill variant.
commit 045c10db43ca97fe0c2ebf70e8af6c874f3cad71
Author: Victor Julien <victor at inliniac.net>
Date: Thu Jul 14 09:49:21 2016 +0200
threads: failed thread is a fatal error now
commit fb655d5f152bcd04d049631a15831142fc478fb5
Author: Victor Julien <victor at inliniac.net>
Date: Wed Jul 13 21:07:11 2016 +0200
threading: remove thread restart logic
Thread restarts never worked well and the rest of the engine was
never really expecting errors to lead to thread restarts. Either
and error is recoverable in the thread, or not at all.
So this patch removes the functionality completely.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 8 +
scripts/setup-app-layer-logger.sh | 46 ++--
src/alert-debuglog.c | 19 +-
src/alert-debuglog.h | 2 +-
src/alert-fastlog.c | 17 +-
src/alert-fastlog.h | 2 +-
src/alert-prelude.c | 31 +--
src/alert-prelude.h | 2 +-
src/alert-syslog.c | 18 +-
src/alert-syslog.h | 2 +-
src/alert-unified2-alert.c | 23 +-
src/alert-unified2-alert.h | 2 +-
src/app-layer-parser.c | 7 +
src/app-layer-parser.h | 1 +
src/decode.h | 7 +
src/detect-dce-iface.c | 1 -
src/detect-dce-opnum.c | 1 -
src/detect-dce-stub-data.c | 1 -
src/detect-dns-query.c | 1 -
src/detect-file-data.c | 1 -
src/detect-fileext.c | 10 -
src/detect-filemagic.c | 10 -
src/detect-filemd5.c | 11 -
src/detect-filename.c | 11 +-
src/detect-filesize.c | 10 -
src/detect-filestore.c | 6 -
src/detect-flowbits.c | 31 +--
src/detect-ftpbounce.c | 1 -
src/detect-http-client-body.c | 1 -
src/detect-http-cookie.c | 1 -
src/detect-http-header.c | 1 -
src/detect-http-hh.c | 1 -
src/detect-http-hrh.c | 1 -
src/detect-http-method.c | 1 -
src/detect-http-raw-header.c | 1 -
src/detect-http-raw-uri.c | 1 -
src/detect-http-server-body.c | 1 -
src/detect-http-stat-code.c | 1 -
src/detect-http-stat-msg.c | 1 -
src/detect-http-ua.c | 1 -
src/detect-http-uri.c | 1 -
src/detect-lua-extensions.c | 65 +----
src/detect-lua-extensions.h | 2 +-
src/detect-lua.c | 16 +-
src/detect-modbus.c | 1 -
src/detect-parse.c | 14 +
src/detect-pcre.c | 1 -
src/detect-pkt-data.c | 1 -
src/detect-ssh-proto-version.c | 1 -
src/detect-ssh-software-version.c | 1 -
src/detect-ssl-state.c | 1 -
src/detect-ssl-version.c | 1 -
src/detect-template-buffer.c | 1 -
src/detect-tls-sni.c | 1 -
src/detect-tls-version.c | 1 -
src/detect-tls.c | 4 -
src/detect-uricontent.c | 1 -
src/detect-urilen.c | 1 -
src/detect.c | 6 +-
src/detect.h | 7 +-
src/flow-bit.c | 23 +-
src/flow-bit.h | 3 -
src/flow-var.c | 4 -
src/flow-worker.c | 49 ++--
src/log-dnslog.c | 15 +-
src/log-dnslog.h | 2 +-
src/log-droplog.c | 21 +-
src/log-droplog.h | 2 +-
src/log-file.c | 16 +-
src/log-file.h | 2 +-
src/log-filestore.c | 22 +-
src/log-filestore.h | 2 +-
src/log-httplog.c | 15 +-
src/log-httplog.h | 2 +-
src/log-pcap.c | 36 ++-
src/log-pcap.h | 2 +-
src/log-stats.c | 14 +-
src/log-stats.h | 2 +-
src/log-tcp-data.c | 22 +-
src/log-tcp-data.h | 2 +-
src/log-tlslog.c | 16 +-
src/log-tlslog.h | 2 +-
src/log-tlsstore.c | 19 +-
src/log-tlsstore.h | 2 +-
src/output-file.c | 77 +++---
src/output-file.h | 6 +-
src/output-filedata.c | 79 +++---
src/output-filedata.h | 7 +-
src/output-flow.c | 55 ++--
src/output-flow.h | 4 +-
src/output-json-alert.c | 44 +---
src/output-json-alert.h | 2 +-
src/output-json-dns.c | 42 ++-
src/output-json-dns.h | 2 +-
src/output-json-drop.c | 34 +--
src/output-json-drop.h | 2 +-
src/output-json-file.c | 23 +-
src/output-json-file.h | 2 +-
src/output-json-flow.c | 30 +--
src/output-json-flow.h | 2 +-
src/output-json-http.c | 30 +--
src/output-json-http.h | 2 +-
src/output-json-netflow.c | 30 +--
src/output-json-netflow.h | 2 +-
src/output-json-smtp.c | 33 +--
src/output-json-smtp.h | 2 +-
src/output-json-ssh.c | 35 +--
src/output-json-ssh.h | 2 +-
src/output-json-stats.c | 30 +--
src/output-json-stats.h | 2 +-
src/output-json-template.c | 27 +-
src/output-json-template.h | 2 +-
src/output-json-tls.c | 34 +--
src/output-json-tls.h | 2 +-
src/output-json.c | 115 +--------
src/output-json.h | 3 +-
src/output-lua.c | 35 +--
src/output-lua.h | 2 +-
src/output-packet.c | 77 +++---
src/output-packet.h | 8 +-
src/output-stats.c | 52 ++--
src/output-stats.h | 4 +-
src/output-streaming.c | 86 +++----
src/output-streaming.h | 8 +-
src/output-tx.c | 80 +++---
src/output-tx.h | 9 +-
src/output.c | 520 ++++++++++++++++++++++++++++++--------
src/output.h | 188 +++++++++-----
src/runmode-erf-file.c | 5 -
src/runmode-pcap-file.c | 5 -
src/runmode-unittests.c | 3 +-
src/runmodes.c | 250 ++++--------------
src/runmodes.h | 1 -
src/source-af-packet.c | 3 -
src/source-erf-dag.c | 2 +-
src/source-erf-file.c | 2 +-
src/source-napatech.c | 2 +-
src/source-pcap-file.c | 10 +-
src/source-pcap.c | 2 +-
src/source-pfring.c | 4 +-
src/stream-tcp.c | 6 +-
src/stream.c | 2 +
src/suricata-common.h | 32 +++
src/suricata.c | 115 +--------
src/suricata.h | 3 -
src/threadvars.h | 15 --
src/tm-modules.c | 34 ---
src/tm-modules.h | 6 +-
src/tm-threads-common.h | 34 ---
src/tm-threads.c | 94 +------
src/tm-threads.h | 1 -
src/tmqh-packetpool.c | 9 -
src/unix-manager.c | 2 +-
src/util-error.c | 1 +
src/util-error.h | 1 +
src/util-lua-common.c | 59 +----
src/util-lua-smtp.c | 65 ++---
src/util-lua-ssh.c | 48 +---
src/util-lua-tls.c | 36 +--
src/util-lua.c | 10 +-
src/util-lua.h | 14 +-
src/util-profiling.c | 142 ++++++++++-
src/util-profiling.h | 22 ++
src/util-runmodes.c | 9 -
164 files changed, 1484 insertions(+), 2112 deletions(-)
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list