[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-99-g07efec5
OISF Git
noreply at openinfosecfoundation.org
Wed May 27 15:23:45 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 07efec550dd249f3c4a1a1fb926cbbe4298245cc (commit)
via 7e66c7050711f0fe423b3ef7399a3526e9ae99fb (commit)
via cb5aa8f8d5e2c348687c4756218f98b3400a76b6 (commit)
via e48153c6b0fb95e6cab8ff652a8211d54418c326 (commit)
via 81548ae3e804347f1c39b6f7e56738906ac53f64 (commit)
via 84b8829cb4073a1c202501b5abc7840f395e64cc (commit)
via 0a262acdfb00af0e8e1fa877c17dfa899b637b5d (commit)
via ac069c579ade91f9380c7bbe2c626f5aa0f4e169 (commit)
via cddbb0f606a0e20eb5ca5e8bef6540f8deedd6e1 (commit)
via f05d0692ef4e9e1ed38e68caad7512894147489e (commit)
via faef92f8daf09fd5134ea5556f3106b7878c741a (commit)
via 83f27ae2a571e5345d5146eda3b8e850d39543fd (commit)
via 41ead6611a427b3e3537c6efd9eb9f33ad325720 (commit)
via d2a9ef2680a3f0db00089594a6be8a645650f4ec (commit)
via 4c3ccda72efa6a089c733d8d0abcf05f242af1da (commit)
via 752f03e7a40225b05d9d0dbd56fe7b5cb4b23b9b (commit)
via 4362d0a6e9b0b48bf7f41b05ad8e1c6a26c0eef4 (commit)
via 628c3b1bc7b0dbb80a2932dbdc4d37fb8e954b7a (commit)
via 7e70f136ec41042c1f323be4d31eec91f39f5006 (commit)
via 30cce2bd297ff2c770a3e7b97155c696ced01a11 (commit)
via 1c0b4ee0aef1be39352481c5222646f55b766e1d (commit)
via 8992275b0c27aa3185696304b0526a2971231e63 (commit)
via 60d9eb6790d8f7d9fd2faf3d5b415d818a84591c (commit)
via 1ef786e7cba546780ecd8e8e48f13b4af26b9963 (commit)
via 3fab736539be109d5b6426061e1f75daebe52265 (commit)
via 2c9a2c83275facab15d9fab38d50e90ea7a4e46e (commit)
via 175831331c82b24e0feea7be0aa9f8c11fdad5cc (commit)
via 6565c86f96b1abb43415f050d916e153afb7b9e8 (commit)
via e4e07d0c3b3a87327fa35faa5f93b1aa77cc9950 (commit)
via 117eed0385431a85c91916b1c2c55d2b19ab4f97 (commit)
via 23f17950bca598b0b972aca3ece31db3124a5723 (commit)
via de82b6d31eb4aebf4e8c01778826ec13eef3a53a (commit)
via 60c5ad464964126bf309b77560b10c2fcb2d8d0d (commit)
via 33756abd87856fb95e06c1a41909cfd77943ca44 (commit)
via d05eed3735886d7df28299fac3f3d77285a6725c (commit)
via f300ad253ee88337d3e388540f1375a109fb6e38 (commit)
via 0478407833fe1328fa2014804c89fec87c44da1b (commit)
via 2346a88db7c659c9033e121df041d415de8b4c15 (commit)
via b5bd3dee1385e30b2c5cf2c39b2e4675fc808672 (commit)
via 06461e37dada97c72718cafdff1ff689b94fc7dc (commit)
via 9bbef55c4d0c5e8204c3b58a532cbb826afea5b7 (commit)
via b293a4b7d0ce06aeafdd41e0b3687a3e1357c655 (commit)
via 711cd7b59bfc2e4b5913ac7dad5a7c5d0c637acb (commit)
via 7da657dc3dd449ff00f3cb35841df84ff3f00871 (commit)
via ac6e24c06a3110dd682ebfb925dbf8a0871a1fcb (commit)
via 66635f0741befe295d0c76b26035475dfaf29263 (commit)
via 74ab84c194a915bddf36fe1d51f416c1ee830c8b (commit)
via 799640f9066f14e806e36abff078053ab8b18172 (commit)
via 55cfab89e4d55ea21b940736e4bf2f51beacb1be (commit)
via b34c6dc93aa5d280cd6fb611c24b61a7ed43a650 (commit)
via e9b067c1ebec3e30efbe99d1fcacb2c669b93ccd (commit)
via 9a8bff7d96038177f745315003113fd498c22299 (commit)
via 50bb995458d49d01c0a13c0947edeb6b9d82c818 (commit)
via 6ffbc3a36216f6dcf0c94c915fc743ddbbef6f97 (commit)
via 0a5ae1b403fb8f8a32e2da5b5c021981213bda46 (commit)
via 9f584483becf86cf91e7ee1ab6846d63210630d4 (commit)
from 0e955ccf3a8d46790dff241148515d707fc0359b (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 07efec550dd249f3c4a1a1fb926cbbe4298245cc
Author: Victor Julien <victor at inliniac.net>
Date: Wed May 27 14:29:54 2015 +0200
counters: use ptr to name instead of copy
All counters have hardcoded names, so copies are not needed.
commit 7e66c7050711f0fe423b3ef7399a3526e9ae99fb
Author: Victor Julien <victor at inliniac.net>
Date: Wed May 27 14:11:57 2015 +0200
counters: don't run if no counters have been registered
commit cb5aa8f8d5e2c348687c4756218f98b3400a76b6
Author: Victor Julien <victor at inliniac.net>
Date: Wed May 27 11:33:41 2015 +0200
counters: work around unix-socket init issues
commit e48153c6b0fb95e6cab8ff652a8211d54418c326
Author: Victor Julien <victor at inliniac.net>
Date: Wed May 27 11:23:19 2015 +0200
counters: make threads cleanup all memory
commit 81548ae3e804347f1c39b6f7e56738906ac53f64
Author: Victor Julien <victor at inliniac.net>
Date: Wed May 27 09:28:24 2015 +0200
counters: clean up global context
commit 84b8829cb4073a1c202501b5abc7840f395e64cc
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 19:44:01 2015 +0200
counters: turn flow.memuse into a global counter
commit 0a262acdfb00af0e8e1fa877c17dfa899b637b5d
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 19:36:59 2015 +0200
counters: make DNS counters globals
commit ac069c579ade91f9380c7bbe2c626f5aa0f4e169
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 19:16:23 2015 +0200
counters: make tcp.memuse a global counter
commit cddbb0f606a0e20eb5ca5e8bef6540f8deedd6e1
Author: Victor Julien <victor at inliniac.net>
Date: Thu Jan 8 01:44:18 2015 +0100
http: make http.memuse a global counter
http.memcap as well.
commit f05d0692ef4e9e1ed38e68caad7512894147489e
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:45:07 2015 +0200
counters: remove references to 'perf' counters
commit faef92f8daf09fd5134ea5556f3106b7878c741a
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:33:51 2015 +0200
counters: remove last and now unused tm_name reference
commit 83f27ae2a571e5345d5146eda3b8e850d39543fd
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:29:35 2015 +0200
counters: remove old unix socket json logic
commit 41ead6611a427b3e3537c6efd9eb9f33ad325720
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:28:01 2015 +0200
counters: minor internal API cleanups
commit d2a9ef2680a3f0db00089594a6be8a645650f4ec
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:24:39 2015 +0200
counters: rename unparsable SCPCAElem to StatsLocalCounter
commit 4c3ccda72efa6a089c733d8d0abcf05f242af1da
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:15:03 2015 +0200
counters: minor header cleanup
commit 752f03e7a40225b05d9d0dbd56fe7b5cb4b23b9b
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:10:17 2015 +0200
counters: remaining s/SCPerf/Stats/g
commit 4362d0a6e9b0b48bf7f41b05ad8e1c6a26c0eef4
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:04:30 2015 +0200
counters: s/SCPerfPrivateContext/StatsPrivateThreadContext/g
commit 628c3b1bc7b0dbb80a2932dbdc4d37fb8e954b7a
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 16:01:09 2015 +0200
counters: s/SCPerfPublicContext/StatsPublicThreadContext/g
commit 7e70f136ec41042c1f323be4d31eec91f39f5006
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 15:41:35 2015 +0200
counters: various renames and cleanups
commit 30cce2bd297ff2c770a3e7b97155c696ced01a11
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 15:08:35 2015 +0200
counters: s/SCPerfCounterSetUI64/StatsSetUI64/g
commit 1c0b4ee0aef1be39352481c5222646f55b766e1d
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 14:53:24 2015 +0200
counters: s/SCPerfCounterIncr/StatsIncr/g
commit 8992275b0c27aa3185696304b0526a2971231e63
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 14:45:43 2015 +0200
counters: s/SCPerfCounterAddUI64/StatsAddUI64/g
commit 60d9eb6790d8f7d9fd2faf3d5b415d818a84591c
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 14:38:02 2015 +0200
counters: clean up defines
commit 1ef786e7cba546780ecd8e8e48f13b4af26b9963
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 14:33:21 2015 +0200
counters: rename register API calls
Also remove 'type' parameter which was always the same.
commit 3fab736539be109d5b6426061e1f75daebe52265
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 13:51:38 2015 +0200
log-stats: make global/threads logging configurable
commit 2c9a2c83275facab15d9fab38d50e90ea7a4e46e
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 26 12:00:36 2015 +0200
stats: support per thread stats in json output
Default is only to output totals. Optionally per thread can be added.
Both can be enabled together.
commit 175831331c82b24e0feea7be0aa9f8c11fdad5cc
Author: Victor Julien <victor at inliniac.net>
Date: Tue Nov 4 10:07:25 2014 +0100
stats json: replace strndup
strndup is a banned function.
commit 6565c86f96b1abb43415f050d916e153afb7b9e8
Author: Victor Julien <victor at inliniac.net>
Date: Tue Nov 4 09:50:29 2014 +0100
stats-json: fixes and improvements
Use proper LogFileCtx and MemBuffer handling so we can have multiple
loggers active at the same time.
Change 'date' field to timestamp, and use ISO notation to make it
the same as the other JSON outputs.
commit e4e07d0c3b3a87327fa35faa5f93b1aa77cc9950
Author: Tom DeCanio <decanio.tom at gmail.com>
Date: Mon Nov 3 17:16:46 2014 -0800
eve-log: stats logging code cleanup.
commit 117eed0385431a85c91916b1c2c55d2b19ab4f97
Author: Tom DeCanio <decanio.tom at gmail.com>
Date: Mon Nov 3 17:01:59 2014 -0800
eve-log: add JSON stats logging
Support for counters in stats.log in eve output JSON stream.
commit 23f17950bca598b0b972aca3ece31db3124a5723
Author: Victor Julien <victor at inliniac.net>
Date: Mon May 25 20:53:17 2015 +0200
counters: pass per thread stats to output api
As well as the global (merged) stats.
commit de82b6d31eb4aebf4e8c01778826ec13eef3a53a
Author: Victor Julien <victor at inliniac.net>
Date: Mon May 25 13:46:19 2015 +0200
counters: rename widely used pctmi var to sts (stats thread store)
commit 60c5ad464964126bf309b77560b10c2fcb2d8d0d
Author: Victor Julien <victor at inliniac.net>
Date: Mon May 25 11:42:41 2015 +0200
counters: call global counters funcs
commit 33756abd87856fb95e06c1a41909cfd77943ca44
Author: Victor Julien <victor at inliniac.net>
Date: Mon May 25 11:40:42 2015 +0200
counters: split API init
Split into early ctx initialization and post-config setup.
commit d05eed3735886d7df28299fac3f3d77285a6725c
Author: Victor Julien <victor at inliniac.net>
Date: Sun May 24 20:18:02 2015 +0200
counters: start using Stats prefix
commit f300ad253ee88337d3e388540f1375a109fb6e38
Author: Victor Julien <victor at inliniac.net>
Date: Sun May 24 18:38:39 2015 +0200
counters: simplify and speedup counters sync
commit 0478407833fe1328fa2014804c89fec87c44da1b
Author: Victor Julien <victor at inliniac.net>
Date: Sun May 24 18:32:58 2015 +0200
counters: remove threadvars arg from SCPerfAddToClubbedTMTable
commit 2346a88db7c659c9033e121df041d415de8b4c15
Author: Victor Julien <victor at inliniac.net>
Date: Sun May 24 17:58:13 2015 +0200
counters: remove thread module name from counters API
commit b5bd3dee1385e30b2c5cf2c39b2e4675fc808672
Author: Victor Julien <victor at inliniac.net>
Date: Wed Jan 7 23:00:52 2015 +0100
stream: make tcp.reassembly_memuse counter global
Fixes bugs #632 and #1178
commit 06461e37dada97c72718cafdff1ff689b94fc7dc
Author: Victor Julien <victor at inliniac.net>
Date: Sun May 24 17:23:48 2015 +0200
counters: global counters registration
commit 9bbef55c4d0c5e8204c3b58a532cbb826afea5b7
Author: Victor Julien <victor at inliniac.net>
Date: Wed Jan 7 19:57:18 2015 +0100
Fix harmless typo in IPOnlyCIDRItemNew's SCReturnPtr use
commit b293a4b7d0ce06aeafdd41e0b3687a3e1357c655
Author: Victor Julien <victor at inliniac.net>
Date: Sun May 24 14:04:45 2015 +0200
counters: remove unused description
commit 711cd7b59bfc2e4b5913ac7dad5a7c5d0c637acb
Author: Victor Julien <victor at inliniac.net>
Date: Sun May 24 09:04:04 2015 +0200
counters: merge counters from threads for output
Merge counters so the table contains combined values from counters
from each thread.
Use global counter id's, track them in a hash.
Rename SCPCAElem members
Fix and improve average counters
commit 7da657dc3dd449ff00f3cb35841df84ff3f00871
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 14:16:21 2015 +0200
counters: remove unused public API calls and make them private
commit ac6e24c06a3110dd682ebfb925dbf8a0871a1fcb
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 13:41:49 2015 +0200
counters: make SCPerfSetupPrivate a function
commit 66635f0741befe295d0c76b26035475dfaf29263
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 13:27:41 2015 +0200
counters: minor cleanups
commit 74ab84c194a915bddf36fe1d51f416c1ee830c8b
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 13:24:08 2015 +0200
counters: introduce SCPerfSetupPrivate for thread setup
commit 799640f9066f14e806e36abff078053ab8b18172
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 12:56:16 2015 +0200
counters: make threadvars::perf_private_ctx static
Update SCPerfGetAllCountersArray and add a UT workaround.
commit 55cfab89e4d55ea21b940736e4bf2f51beacb1be
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 12:28:54 2015 +0200
counters: SCPerfGetLocalCounterValue cleanup
Return u64, update arguments.
commit b34c6dc93aa5d280cd6fb611c24b61a7ed43a650
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 12:15:10 2015 +0200
counters: remove references to SCPerfCounterAddDouble
They were all in comments anyway.
commit e9b067c1ebec3e30efbe99d1fcacb2c669b93ccd
Author: Victor Julien <victor at inliniac.net>
Date: Sat May 23 00:44:45 2015 +0200
counters: make increment call take threadvars
This hides the implementation from the caller.
commit 9a8bff7d96038177f745315003113fd498c22299
Author: Victor Julien <victor at inliniac.net>
Date: Fri May 22 20:56:09 2015 +0200
counters: threadvars s/sc_perf_pca/perf_private_ctx/g
commit 50bb995458d49d01c0a13c0947edeb6b9d82c818
Author: Victor Julien <victor at inliniac.net>
Date: Fri May 22 19:59:35 2015 +0200
counters: rename threadvars public counters
commit 6ffbc3a36216f6dcf0c94c915fc743ddbbef6f97
Author: Victor Julien <victor at inliniac.net>
Date: Fri May 22 17:04:17 2015 +0200
counters: s/SCPerfContext/SCPerfPublicContext/g
commit 0a5ae1b403fb8f8a32e2da5b5c021981213bda46
Author: Victor Julien <victor at inliniac.net>
Date: Fri May 22 16:59:07 2015 +0200
counters: s/SCPerfCounterArray/SCPerfPrivateContext/g
Goal is to make it's purpose clear.
commit 9f584483becf86cf91e7ee1ab6846d63210630d4
Author: Victor Julien <victor at inliniac.net>
Date: Fri May 22 14:16:10 2015 +0200
counters: minor cleanups
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 1 +
src/app-layer-dns-common.c | 20 +-
src/app-layer-dns-common.h | 5 +-
src/app-layer-htp-mem.c | 14 +-
src/app-layer-htp-mem.h | 4 +-
src/app-layer-htp.c | 1 +
src/app-layer.c | 50 +-
src/app-layer.h | 1 +
src/counters.c | 1426 +++++++++-----------
src/counters.h | 180 +--
src/decode-ethernet.c | 2 +-
src/decode-gre.c | 2 +-
src/decode-icmpv4.c | 2 +-
src/decode-icmpv6.c | 2 +-
src/decode-ipv4.c | 2 +-
src/decode-ipv6.c | 6 +-
src/decode-mpls.c | 2 +-
src/decode-null.c | 2 +-
src/decode-ppp.c | 2 +-
src/decode-pppoe.c | 4 +-
src/decode-raw.c | 2 +-
src/decode-sctp.c | 2 +-
src/decode-sll.c | 2 +-
src/decode-tcp.c | 2 +-
src/decode-teredo.c | 2 +-
src/decode-udp.c | 2 +-
src/decode-vlan.c | 4 +-
src/decode.c | 98 +-
src/defrag.c | 12 +-
src/detect-engine-iponly.c | 2 +-
src/detect-engine.c | 30 +-
src/detect.c | 24 +-
src/flow-manager.c | 74 +-
src/log-stats.c | 75 +-
src/output-json-stats.c | 363 +++++
src/{output-json-netflow.h => output-json-stats.h} | 10 +-
src/output-stats.h | 6 +-
src/runmode-unittests.c | 2 +-
src/runmode-unix-socket.c | 9 +-
src/source-af-packet.c | 43 +-
src/source-erf-dag.c | 40 +-
src/source-erf-file.c | 17 +-
src/source-ipfw.c | 10 +-
src/source-mpipe.c | 62 +-
src/source-napatech.c | 12 +-
src/source-netmap.c | 32 +-
src/source-nflog.c | 22 +-
src/source-nfq.c | 15 +-
src/source-pcap-file.c | 18 +-
src/source-pcap.c | 63 +-
src/source-pfring.c | 47 +-
src/stream-tcp-reassemble.c | 18 +-
src/stream-tcp-reassemble.h | 7 -
src/stream-tcp.c | 96 +-
src/stream-tcp.h | 2 -
src/suricata.c | 13 +-
src/threadvars.h | 10 +-
src/tm-modules.c | 1 +
src/tm-threads-common.h | 1 +
src/tm-threads.c | 22 +-
src/tmqh-flow.c | 2 +-
src/tmqh-ringbuffer.c | 6 +-
src/tmqh-simple.c | 2 +-
src/unix-manager.c | 7 +-
src/util-error.c | 2 +-
src/util-error.h | 2 +-
suricata.yaml.in | 5 +
67 files changed, 1538 insertions(+), 1488 deletions(-)
create mode 100644 src/output-json-stats.c
copy src/{output-json-netflow.h => output-json-stats.h} (79%)
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list