[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.2.1-206-gbc480fa
OISF Git
noreply at openinfosecfoundation.org
Thu Apr 6 13:51:45 UTC 2017
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 bc480fa8c3fe47f3fe1fea182904f2c17beb4fe3 (commit)
via 845e18f25ac840955f2bcc71292d33c3f78107dd (commit)
via 7922f9be1bb96654a2b3928bc9a7fa2047490a12 (commit)
via ca92be896eb51634d1165be30de5e7b6aa5ef4ff (commit)
via 00cd47b2bf16625346a5681e527cb02a5a752df4 (commit)
via ff30d924db83734e395c946b84289e30f1e03d49 (commit)
via 20d4d400518347407a9c8e05cbda42734300cfb0 (commit)
via af174c82bb127481055e7f84bf661e3b6d186ff6 (commit)
via d5a0eb4b2cbfd5e93796e975be25e6304c7a14db (commit)
via b134dfcce71ae6a5ae45bf1ce2e47d024e0d3a7a (commit)
via e1bf48c0ee89d16b2fc0867b4958dbad814b55ec (commit)
from 6227d0955f568a79a457b55c59635d97ad34007f (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 bc480fa8c3fe47f3fe1fea182904f2c17beb4fe3
Author: Victor Julien <victor at inliniac.net>
Date: Thu Apr 6 13:05:35 2017 +0200
pcre: disable jit on powerpc64
It appears that both using gcc and clang something gets misoptimised
around pcre's jit. So disable jit for now.
commit 845e18f25ac840955f2bcc71292d33c3f78107dd
Author: Jason Ish <ish at unx.ca>
Date: Mon Mar 6 14:38:04 2017 -0600
defrag: (windows) detect more overlaps
commit 7922f9be1bb96654a2b3928bc9a7fa2047490a12
Author: Jason Ish <ish at unx.ca>
Date: Mon Mar 6 11:23:48 2017 -0600
defrag: (linux) fix an error in overlapping fragments
If a subsequent fragment has a lower offset than a previous
one and overlaps, trim off the beginning of the previous
fragment.
Based on an issue reported privately.
commit ca92be896eb51634d1165be30de5e7b6aa5ef4ff
Author: Jason Ish <ish at unx.ca>
Date: Sun Mar 5 21:17:47 2017 -0600
defrag: use new unit test macros
Also reformat unit test functions to Suricata style.
commit 00cd47b2bf16625346a5681e527cb02a5a752df4
Author: Jason Ish <ish at unx.ca>
Date: Wed Mar 29 14:09:32 2017 -0600
travis: use new container build infrastructure
Migrate to the new Travis container build system. This build system does
not allow use of sudo, so required packages must be done declaratively
which required reworking how we install packages that are conditional
based on the build being done.
Mac builds are still done with sudo=true.
commit ff30d924db83734e395c946b84289e30f1e03d49
Author: Jason Ish <ish at unx.ca>
Date: Tue Apr 4 07:51:19 2017 -0600
unix-socket: return failure on failure
UnixManagerThreadInit needs to return a failure code if the socket
fails to initialize to avoid entering the UnixManager loop which
will continuously fail on the call to bind, as no listening
socket was setup.
This can occur when the socket fails to initialize due to a
permissions error and fatal init errors is not on.
commit 20d4d400518347407a9c8e05cbda42734300cfb0
Author: fooinha <fooinha at gmail.com>
Date: Sat Dec 3 19:26:16 2016 +0000
log: tls custom format log
commit af174c82bb127481055e7f84bf661e3b6d186ff6
Author: fooinha <fooinha at gmail.com>
Date: Sat Dec 3 12:22:26 2016 +0000
log: common custom format output
commit d5a0eb4b2cbfd5e93796e975be25e6304c7a14db
Author: Victor Julien <victor at inliniac.net>
Date: Thu Apr 6 08:59:34 2017 +0200
geoip: fix compiler warning
detect-geoip.c:78:40: error: incompatible pointer types assigning to 'int (*)(ThreadVars *, DetectEngineThreadCtx *, Packet *, const Signature *, const SigMatchCtx *)' from 'int (ThreadVars *, DetectEngineThreadCtx *, Packet *, Signature *, const SigMatchCtx *)' [-Werror,-Wincompatible-pointer-types]
sigmatch_table[DETECT_GEOIP].Match = DetectGeoipMatch;
^ ~~~~~~~~~~~~~~~~
1 error generated.
Bug #2045
commit b134dfcce71ae6a5ae45bf1ce2e47d024e0d3a7a
Author: Victor Julien <victor at inliniac.net>
Date: Wed Apr 5 15:19:33 2017 -0400
modbus: fix compiler warnings about alignment
app-layer-modbus.c:1226:39: warning: taking address of packed member 'transactionId' of class or structure 'ModbusHeader_' may result in an unaligned pointer value [-Waddress-of-packed-member]
if (ModbusExtractUint16(modbus, &(header->transactionId), input, input_len, &offset) ||
^~~~~~~~~~~~~~~~~~~~~
app-layer-modbus.c:1228:39: warning: taking address of packed member 'protocolId' of class or structure 'ModbusHeader_' may result in an unaligned pointer value [-Waddress-of-packed-member]
ModbusExtractUint16(modbus, &(header->protocolId), input, input_len, &offset) ||
^~~~~~~~~~~~~~~~~~
app-layer-modbus.c:1230:39: warning: taking address of packed member 'length' of class or structure 'ModbusHeader_' may result in an unaligned pointer value [-Waddress-of-packed-member]
ModbusExtractUint16(modbus, &(header->length), input, input_len, &offset) ||
^~~~~~~~~~~~~~
3 warnings generated.
Bug #2088
commit e1bf48c0ee89d16b2fc0867b4958dbad814b55ec
Author: Victor Julien <victor at inliniac.net>
Date: Wed Apr 5 15:13:17 2017 +0200
pool: fix compiler warning
clang-4.0 reported:
util-pool.c:242:13: warning: logical not is only applied to the left hand side of this bitwise operator [-Wlogical-not-parentheses]
if (! pb->flags & POOL_BUCKET_PREALLOCATED) {
^ ~
util-pool.c:242:13: note: add parentheses after the '!' to evaluate the bitwise operator first
if (! pb->flags & POOL_BUCKET_PREALLOCATED) {
^
( )
util-pool.c:242:13: note: add parentheses around left hand side expression to silence this warning
if (! pb->flags & POOL_BUCKET_PREALLOCATED) {
^
( )
util-pool.c:261:13: warning: logical not is only applied to the left hand side of this bitwise operator [-Wlogical-not-parentheses]
if (! pb->flags & POOL_BUCKET_PREALLOCATED) {
^ ~
util-pool.c:261:13: note: add parentheses after the '!' to evaluate the bitwise operator first
if (! pb->flags & POOL_BUCKET_PREALLOCATED) {
^
( )
util-pool.c:261:13: note: add parentheses around left hand side expression to silence this warning
if (! pb->flags & POOL_BUCKET_PREALLOCATED) {
^
( )
2 warnings generated.
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 124 ++--
configure.ac | 17 +-
doc/userguide/output/custom-tls-logging.rst | 43 ++
doc/userguide/output/index.rst | 1 +
src/Makefile.am | 1 +
src/app-layer-modbus.c | 23 +-
src/defrag.c | 878 ++++++++++++----------------
src/detect-geoip.c | 4 +-
src/log-cf-common.c | 274 +++++++++
src/log-cf-common.h | 90 +++
src/log-httplog.c | 210 ++-----
src/log-tlslog.c | 255 ++++++--
src/output.c | 4 +
src/unix-manager.c | 2 +-
src/util-error.c | 1 +
src/util-error.h | 1 +
src/util-pool.c | 4 +-
src/util-time.c | 9 +
src/util-time.h | 11 +-
suricata.yaml.in | 4 +-
20 files changed, 1175 insertions(+), 781 deletions(-)
create mode 100644 doc/userguide/output/custom-tls-logging.rst
create mode 100644 src/log-cf-common.c
create mode 100644 src/log-cf-common.h
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list