]>
git.ipfire.org Git - thirdparty/snort3.git/log
Russ Combs (rucombs) [Fri, 15 Apr 2016 18:41:13 +0000 (14:41 -0400)]
Merge pull request #425 in SNORT/snort3 from capture to master
* commit '
26fa7261586551c86c355dc7ad40b12567616784 ':
Remove debug functions used
huica [Fri, 15 Apr 2016 18:23:57 +0000 (14:23 -0400)]
Remove debug functions used
Russ Combs [Fri, 15 Apr 2016 15:00:43 +0000 (11:00 -0400)]
fix stream tcp config leak
Russ Combs (rucombs) [Thu, 14 Apr 2016 21:22:33 +0000 (17:22 -0400)]
Merge pull request #423 in SNORT/snort3 from crc/s5 to master
* commit '
2f3b4798d61999c2531a3c65d7ef3b1207129c84 ':
revert delete temporarily
Russ Combs [Thu, 14 Apr 2016 21:19:23 +0000 (17:19 -0400)]
revert delete temporarily
Russ Combs (rucombs) [Thu, 14 Apr 2016 17:36:20 +0000 (13:36 -0400)]
Merge pull request #421 in SNORT/snort3 from perf_build2 to master
* commit '
dc806bf0dfc872363334ed990aef28d37f80f15b ':
fixed include order
fixed build without unit tests
Carter Waxman [Thu, 14 Apr 2016 17:31:08 +0000 (13:31 -0400)]
fixed include order
Russ Combs (rucombs) [Thu, 14 Apr 2016 17:27:30 +0000 (13:27 -0400)]
Merge pull request #422 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to master
* commit '
15f6fb12bff50d08b9b412bf1ced37da54e4d562 ':
expected: Fix static analysis useless initialization warning
Michael Altizer [Thu, 14 Apr 2016 14:53:24 +0000 (10:53 -0400)]
expected: Fix static analysis useless initialization warning
Carter Waxman [Thu, 14 Apr 2016 13:21:42 +0000 (09:21 -0400)]
fixed build without unit tests
Russ Combs (rucombs) [Wed, 13 Apr 2016 21:40:54 +0000 (17:40 -0400)]
Merge pull request #417 in SNORT/snort3 from ~MIALTIZE/snort3:sfdaq to master
* commit '
4c0d2abc95992d478e19f9aa3b39841e85894123 ':
sfdaq: Let the Style Wookiee win.
snort2lua: Handle DAQ/SFDAQ config changes
util: Remove unused StringVector code
sfdaq: Replace Snort DAQ module with the SFDAQ module
thread_config: Only log when actually changing thread affinity
dce_rpc: Make DCE2_HandleSegmentation static
m4: Update macros with upstream from autoconf-archive
Michael Altizer [Wed, 13 Apr 2016 21:11:53 +0000 (17:11 -0400)]
sfdaq: Let the Style Wookiee win.
Russ Combs (rucombs) [Wed, 13 Apr 2016 21:09:02 +0000 (17:09 -0400)]
Merge pull request #415 in SNORT/snort3 from perf_format to master
* commit '
9b8bb00969bea18b2f5f8ec77173c1fb9c35ba88 ':
fixed method access
hid file and time implementation details from PerfTrackers
fixed file rotation
fixed dev_notes comments. fixed line wrapping
fixed extra keyword
added comments for perfmon APIs
added unit tests to FlowTracker following major refactor. Fixed uninitialized and improperly sized variables in FlowTracker.
removed EventTracker in place of search_engine peg counts. Added unit tests to BaseTracker.
added mock formatter to ease tracker unit testing
Refactored perf_formatter to replace the bulk of explicit copy operations with pointers (FlowStateValue remains / 128 byte memcpy per flow ip entry)
removed double type from formatter
Update dev notes
refactored FlowTracker into c++. added PegCount vector type to PerfFormatter. removed unused test directory. removed remainder of legacy code (perf_flow.*)
integrated base, cpu, event with formatters. added string value for formatters.
created TextFormatter
completed CSVFormatter
added unit for CSVFormatter
update makefiles
created PerfFormatter
Michael Altizer [Wed, 30 Mar 2016 21:54:29 +0000 (17:54 -0400)]
snort2lua: Handle DAQ/SFDAQ config changes
Michael Altizer [Tue, 12 Apr 2016 21:18:17 +0000 (17:18 -0400)]
util: Remove unused StringVector code
Michael Altizer [Tue, 12 Apr 2016 21:16:59 +0000 (17:16 -0400)]
sfdaq: Replace Snort DAQ module with the SFDAQ module
Michael Altizer [Tue, 29 Mar 2016 16:04:03 +0000 (12:04 -0400)]
thread_config: Only log when actually changing thread affinity
Michael Altizer [Tue, 5 Apr 2016 15:15:16 +0000 (11:15 -0400)]
dce_rpc: Make DCE2_HandleSegmentation static
Michael Altizer [Tue, 5 Apr 2016 14:46:20 +0000 (10:46 -0400)]
m4: Update macros with upstream from autoconf-archive
Russ Combs (rucombs) [Wed, 13 Apr 2016 20:02:16 +0000 (16:02 -0400)]
Merge pull request #419 in SNORT/snort3 from nhttp42 to master
* commit '
e701252271b415b4237a522e0d7b6f5411e898cf ':
comment fix
Unicode map file
Tom Peters [Wed, 13 Apr 2016 19:57:41 +0000 (15:57 -0400)]
comment fix
Carter Waxman [Wed, 13 Apr 2016 19:00:11 +0000 (15:00 -0400)]
fixed method access
Carter Waxman [Wed, 13 Apr 2016 18:38:31 +0000 (14:38 -0400)]
hid file and time implementation details from PerfTrackers
Carter Waxman [Wed, 13 Apr 2016 18:25:22 +0000 (14:25 -0400)]
fixed file rotation
Russ Combs (rucombs) [Wed, 13 Apr 2016 18:04:24 +0000 (14:04 -0400)]
Merge pull request #418 in SNORT/snort3 from ~JOCORNET/snort3:latency_leak_fix to master
* commit '
4f8c6e7578143ea4fb2e0efbe12334f18d3f58b4 ':
further cleanup and fixed review comments
added thread-local cleanup for latency
Carter Waxman [Wed, 13 Apr 2016 17:37:12 +0000 (13:37 -0400)]
fixed dev_notes comments. fixed line wrapping
Carter Waxman [Wed, 13 Apr 2016 15:22:28 +0000 (11:22 -0400)]
fixed extra keyword
Carter Waxman [Wed, 13 Apr 2016 14:54:39 +0000 (10:54 -0400)]
added comments for perfmon APIs
Carter Waxman [Wed, 13 Apr 2016 13:30:27 +0000 (09:30 -0400)]
added unit tests to FlowTracker following major refactor. Fixed uninitialized and improperly sized variables in FlowTracker.
Joel Cornett [Tue, 12 Apr 2016 21:37:44 +0000 (17:37 -0400)]
further cleanup and fixed review comments
Joel Cornett [Tue, 12 Apr 2016 20:00:50 +0000 (16:00 -0400)]
added thread-local cleanup for latency
Russ Combs (rucombs) [Tue, 12 Apr 2016 19:43:29 +0000 (15:43 -0400)]
Merge pull request #404 in SNORT/snort3 from ~JOCORNET/snort3:fix_coverage_clang to master
* commit '
984e3de28555cfb2fc08d504ece8978389cc177f ':
test for GNU compiler before attempting to link against libgcov
Carter Waxman [Tue, 12 Apr 2016 18:45:45 +0000 (14:45 -0400)]
removed EventTracker in place of search_engine peg counts. Added unit tests to BaseTracker.
Tom Peters [Wed, 23 Mar 2016 21:14:44 +0000 (17:14 -0400)]
Unicode map file
Carter Waxman [Tue, 12 Apr 2016 15:58:09 +0000 (11:58 -0400)]
added mock formatter to ease tracker unit testing
Carter Waxman [Tue, 12 Apr 2016 14:00:15 +0000 (10:00 -0400)]
Refactored perf_formatter to replace the bulk of explicit copy operations with pointers (FlowStateValue remains / 128 byte memcpy per flow ip entry)
Russ Combs (rucombs) [Mon, 11 Apr 2016 19:28:48 +0000 (15:28 -0400)]
Merge pull request #413 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ to master
* commit '
73e6c98b8906ff3ce04b70840e7277b9861fdc8b ':
expected: Fix some memory leaks and move some comments
Michael Altizer [Mon, 11 Apr 2016 19:22:13 +0000 (15:22 -0400)]
expected: Fix some memory leaks and move some comments
Russ Combs (rucombs) [Mon, 11 Apr 2016 17:35:46 +0000 (13:35 -0400)]
Merge pull request #416 in SNORT/snort3 from perf_hinky to master
* commit '
68c6f7518e820ffed47eef195f2b0a28fa2fb0e6 ':
fixed hinkiness
Carter Waxman [Mon, 11 Apr 2016 17:28:01 +0000 (13:28 -0400)]
removed double type from formatter
Carter Waxman [Mon, 11 Apr 2016 16:18:59 +0000 (12:18 -0400)]
Update dev notes
Carter Waxman [Mon, 11 Apr 2016 15:01:45 +0000 (11:01 -0400)]
fixed hinkiness
Russ Combs (rucombs) [Mon, 11 Apr 2016 14:32:06 +0000 (10:32 -0400)]
Merge pull request #414 in SNORT/snort3 from crc/leaks to master
* commit '
23d1d3796e20ece2d3d90e5044d2054d71f6aca1 ':
plug misc leaks
Russ Combs (rucombs) [Sun, 10 Apr 2016 00:52:51 +0000 (20:52 -0400)]
plug misc leaks
Russ Combs [Fri, 8 Apr 2016 21:48:26 +0000 (17:48 -0400)]
build 194
Carter Waxman [Fri, 8 Apr 2016 20:55:20 +0000 (16:55 -0400)]
refactored FlowTracker into c++. added PegCount vector type to PerfFormatter. removed unused test directory. removed remainder of legacy code (perf_flow.*)
Russ Combs (rucombs) [Fri, 8 Apr 2016 20:12:14 +0000 (16:12 -0400)]
Merge pull request #410 in SNORT/snort3 from crc/func to master
* commit '
b196cbe1c0d2507aa903599058f4b1cdb87b61ac ':
__FUNCTION__ -> __func__
Victor Roemer [Fri, 8 Apr 2016 19:31:46 +0000 (15:31 -0400)]
Ignore files generated by the build-scripts
Russ Combs [Fri, 8 Apr 2016 19:19:42 +0000 (15:19 -0400)]
__FUNCTION__ -> __func__
Russ Combs (rucombs) [Fri, 8 Apr 2016 18:48:18 +0000 (14:48 -0400)]
Merge pull request #409 in SNORT/snort3 from remove-old-obfuscation to master
* commit '
d494cc8d3bf30991767b993ca4e0a74cb2d3c99e ':
Remove legacy/unused obfuscation api.
Victor Roemer [Fri, 8 Apr 2016 18:06:54 +0000 (14:06 -0400)]
Remove legacy/unused obfuscation api.
Russ Combs (rucombs) [Fri, 8 Apr 2016 17:24:11 +0000 (13:24 -0400)]
Merge pull request #405 in SNORT/snort3 from crc/ranger to master
* commit '
d59873e05503baefb302bdb629c1218973810163 ':
update from functor to lambda by way of std::function
fix pedantic warnings about casting between pointers to function and object
Russ Combs (rucombs) [Fri, 8 Apr 2016 14:11:32 +0000 (10:11 -0400)]
Merge pull request #408 in SNORT/snort3 from dce_bugfix to master
* commit '
90409123a0738535873eeeb0e93be655ea0679e9 ':
Fix for potential dereference of null ptr in dce_common.cc (nightly build analysis)
mdagon [Fri, 8 Apr 2016 13:55:57 +0000 (09:55 -0400)]
Fix for potential dereference of null ptr in dce_common.cc (nightly build analysis)
Russ Combs [Fri, 8 Apr 2016 11:29:35 +0000 (07:29 -0400)]
update from functor to lambda by way of std::function
Russ Combs (rucombs) [Fri, 8 Apr 2016 10:47:39 +0000 (06:47 -0400)]
Merge pull request #407 in SNORT/snort3 from norm_head_leak to master
* commit '
166c724677b95b6ae71ee5ae953bc22b88c75a1f ':
leak fix
Russ Combs (rucombs) [Thu, 7 Apr 2016 22:12:31 +0000 (18:12 -0400)]
Merge pull request #406 in SNORT/snort3 from ignore_data_after_rst to master
* commit '
39747c1154b36243f5243640f5cf5fe51dabaefb ':
fix data seg handling to not queue packets from remote that is in closed state
Tom Peters [Thu, 7 Apr 2016 21:11:58 +0000 (17:11 -0400)]
leak fix
Russ Combs (rucombs) [Thu, 7 Apr 2016 20:02:55 +0000 (16:02 -0400)]
Merge pull request #402 in SNORT/snort3 from dce_smb to master
* commit '
16603837d1aee33c69e9014871183e1f5b6dd75b ':
Code review: replace calls to SmbNtohs, SmbNtohl with extract_16bits, ntohs, ntohl
code review comments
dce smb header checks port - non segmented packets
mdagon [Thu, 7 Apr 2016 19:04:57 +0000 (15:04 -0400)]
Code review: replace calls to SmbNtohs, SmbNtohl with extract_16bits, ntohs, ntohl
mdagon [Thu, 7 Apr 2016 14:10:17 +0000 (10:10 -0400)]
code review comments
davis mcpherson [Thu, 7 Apr 2016 14:10:12 +0000 (10:10 -0400)]
fix data seg handling to not queue packets from remote that is in closed state
Russ Combs [Thu, 7 Apr 2016 12:38:49 +0000 (08:38 -0400)]
fix pedantic warnings about casting between pointers to function and object
Joel Cornett [Wed, 6 Apr 2016 19:24:59 +0000 (15:24 -0400)]
test for GNU compiler before attempting to link against libgcov
Carter Waxman [Wed, 6 Apr 2016 19:50:23 +0000 (15:50 -0400)]
integrated base, cpu, event with formatters. added string value for formatters.
Russ Combs (rucombs) [Wed, 6 Apr 2016 19:34:35 +0000 (15:34 -0400)]
Merge pull request #403 in SNORT/snort3 from ~JOCORNET/snort3:fix_warnings to master
* commit '
e5f817c6f23be0c75cb2bfa30033ce526069ccab ':
fixed piglet warnings
fixed flow warnings
Joel Cornett [Wed, 6 Apr 2016 19:02:46 +0000 (15:02 -0400)]
fixed piglet warnings
Joel Cornett [Wed, 6 Apr 2016 19:02:33 +0000 (15:02 -0400)]
fixed flow warnings
Carter Waxman [Wed, 6 Apr 2016 17:25:00 +0000 (13:25 -0400)]
created TextFormatter
mdagon [Wed, 6 Apr 2016 17:15:32 +0000 (13:15 -0400)]
dce smb header checks port - non segmented packets
Carter Waxman [Wed, 6 Apr 2016 16:39:42 +0000 (12:39 -0400)]
completed CSVFormatter
Carter Waxman [Wed, 6 Apr 2016 14:33:00 +0000 (10:33 -0400)]
added unit for CSVFormatter
Carter Waxman [Tue, 5 Apr 2016 12:53:30 +0000 (08:53 -0400)]
update makefiles
Carter Waxman [Mon, 4 Apr 2016 18:03:42 +0000 (14:03 -0400)]
created PerfFormatter
Russ Combs (rucombs) [Wed, 6 Apr 2016 13:46:44 +0000 (09:46 -0400)]
Merge pull request #401 in SNORT/snort3 from perf_warnings to master
* commit '
f1f55692fa72001a9bdbd9e518f4411749be3828 ':
fixed CPUTracker build warnings.
Carter Waxman [Wed, 6 Apr 2016 13:08:32 +0000 (09:08 -0400)]
fixed CPUTracker build warnings.
Russ Combs (rucombs) [Tue, 5 Apr 2016 22:32:33 +0000 (18:32 -0400)]
Merge pull request #382 in SNORT/snort3 from ~JOCORNET/snort3:preemptive_memory_actions to master
* commit '
cc94779d96fa59d81980a41d5b2e75f8d8204f43 ':
added bugfix for last_pkt_type update
minor fixes
changed preemptive pruning to work iteratively
fixed propagation of do_cleanup for flow->reset
fixed missing funciton due to rebase
added preemptive and memcap prunes to stream base stats & peg counts
added flow->reset() without session cleanup, more prune reasons
added preemptive cleanup action
added threshold config and hooks
Joel Cornett [Tue, 5 Apr 2016 22:06:57 +0000 (18:06 -0400)]
added bugfix for last_pkt_type update
Russ Combs (rucombs) [Tue, 5 Apr 2016 21:50:41 +0000 (17:50 -0400)]
Merge pull request #400 in SNORT/snort3 from crc/cruft to master
* commit '
e530fe52686c76d05b15bb0ffc559875976c5613 ':
delete cruft
Joel Cornett [Tue, 5 Apr 2016 21:34:45 +0000 (17:34 -0400)]
minor fixes
Russ Combs [Tue, 5 Apr 2016 20:46:31 +0000 (16:46 -0400)]
delete cruft
Russ Combs (rucombs) [Tue, 5 Apr 2016 20:08:17 +0000 (16:08 -0400)]
Merge pull request #399 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ to master
* commit '
868dd064c0abf8416bd06bacefa85f784b8dd07f ':
snort2lua: Fix more memory leaks
Michael Altizer [Tue, 5 Apr 2016 19:47:19 +0000 (15:47 -0400)]
snort2lua: Fix more memory leaks
Joel Cornett [Tue, 5 Apr 2016 19:48:56 +0000 (15:48 -0400)]
changed preemptive pruning to work iteratively
Joel Cornett [Tue, 5 Apr 2016 19:44:23 +0000 (15:44 -0400)]
fixed propagation of do_cleanup for flow->reset
Joel Cornett [Tue, 5 Apr 2016 19:43:59 +0000 (15:43 -0400)]
fixed missing funciton due to rebase
Joel Cornett [Tue, 5 Apr 2016 19:41:39 +0000 (15:41 -0400)]
added preemptive and memcap prunes to stream base stats & peg counts
Russ Combs (rucombs) [Tue, 5 Apr 2016 19:39:27 +0000 (15:39 -0400)]
Merge pull request #397 in SNORT/snort3 from perf_maccpu to master
* commit '
482227d99c993194d4239a816e149345e6a99800 ':
added support for OSX thread timekeeping. fixed accuracy errors in perfmon cpu
fixed mac issues
Joel Cornett [Wed, 30 Mar 2016 20:31:24 +0000 (16:31 -0400)]
added flow->reset() without session cleanup, more prune reasons
Joel Cornett [Wed, 30 Mar 2016 18:59:33 +0000 (14:59 -0400)]
added preemptive cleanup action
Joel Cornett [Wed, 30 Mar 2016 18:36:18 +0000 (14:36 -0400)]
added threshold config and hooks
Russ Combs (rucombs) [Tue, 5 Apr 2016 19:21:15 +0000 (15:21 -0400)]
Merge pull request #396 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ to master
* commit '
c56eb87bc2081c7de49a7ef164d0ad494f03df66 ':
snort2lua: Fix memory leaks in datatype destructors
Michael Altizer [Tue, 5 Apr 2016 19:06:44 +0000 (15:06 -0400)]
snort2lua: Fix memory leaks in datatype destructors
Carter Waxman [Tue, 5 Apr 2016 19:10:24 +0000 (15:10 -0400)]
added support for OSX thread timekeeping. fixed accuracy errors in perfmon cpu
Russ Combs (rucombs) [Tue, 5 Apr 2016 17:20:41 +0000 (13:20 -0400)]
Merge pull request #395 in SNORT/snort3 from crc/sow to master
* commit '
2b6f1360ab146636b199e02d36d9c32c07de17e3 ':
fix decompression
Russ Combs [Tue, 5 Apr 2016 15:49:06 +0000 (11:49 -0400)]
fix decompression
Carter Waxman [Tue, 5 Apr 2016 14:15:19 +0000 (10:15 -0400)]
fixed mac issues
Russ Combs [Tue, 5 Apr 2016 11:44:10 +0000 (07:44 -0400)]
Merge branch 'master' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3
Russ Combs [Tue, 5 Apr 2016 11:43:40 +0000 (07:43 -0400)]
patch around os x issues
Russ Combs (rucombs) [Tue, 5 Apr 2016 11:19:05 +0000 (07:19 -0400)]
Merge pull request #394 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ to master
* commit '
eb3cf1d9199a30d0a842b67fe50900129aa1aa88 ':
Clean up HyperScan pkg-config and CMake logic.
projects / thirdparty / snort3.git / log
