]>
git.ipfire.org Git - thirdparty/snort3.git/log
Russ Combs (rucombs) [Wed, 27 Apr 2016 19:34:49 +0000 (15:34 -0400)]
Merge pull request #435 in SNORT/snort3 from ~JOCORNET/snort3:refactor_extras to master
* commit '
783a2f028723b9a7b5f5c58f35d1d50e5c922adc ':
fixed merge conflicts
fix merge conflicts in extra
rename examples -> src
rename examples -> src
re-added extra/COPYING
updated snort email address in configure.ac
updated LICENSE + README
merged in changes
fixed make distcheck, cmake & make install
imported refactored extras
rebased from master
Joel Cornett [Tue, 26 Apr 2016 17:52:33 +0000 (13:52 -0400)]
fixed merge conflicts
Joel Cornett [Tue, 26 Apr 2016 17:48:33 +0000 (13:48 -0400)]
fix merge conflicts in extra
Joel Cornett [Tue, 26 Apr 2016 14:43:26 +0000 (10:43 -0400)]
rename examples -> src
Joel Cornett [Tue, 26 Apr 2016 14:43:15 +0000 (10:43 -0400)]
rename examples -> src
Joel Cornett [Mon, 25 Apr 2016 19:02:57 +0000 (15:02 -0400)]
re-added extra/COPYING
Joel Cornett [Mon, 25 Apr 2016 17:06:48 +0000 (13:06 -0400)]
updated snort email address in configure.ac
Joel Cornett [Mon, 25 Apr 2016 17:02:57 +0000 (13:02 -0400)]
updated LICENSE + README
Joel Cornett [Mon, 25 Apr 2016 16:43:18 +0000 (12:43 -0400)]
merged in changes
Joel Cornett [Wed, 20 Apr 2016 20:38:39 +0000 (16:38 -0400)]
fixed make distcheck, cmake & make install
Joel Cornett [Tue, 19 Apr 2016 21:10:38 +0000 (17:10 -0400)]
imported refactored extras
Joel Cornett [Tue, 26 Apr 2016 17:32:15 +0000 (13:32 -0400)]
rebased from master
Russ Combs (rucombs) [Tue, 26 Apr 2016 17:42:34 +0000 (13:42 -0400)]
Merge pull request #458 in SNORT/snort3 from protocol_warnings to master
* commit '
94de721b0862e68517deb01d52b899586c1c36ad ':
Fixed warnings due to protocol update.
Steve Chew [Tue, 26 Apr 2016 17:36:03 +0000 (13:36 -0400)]
Fixed warnings due to protocol update.
Russ Combs (rucombs) [Tue, 26 Apr 2016 16:13:51 +0000 (12:13 -0400)]
Merge pull request #456 in SNORT/snort3 from protocol1 to master
* commit '
eed6be9d525c7aa3a2d4f262e0b52241a5f476d9 ':
Updated protocol types in extra sub-dir.
Updates based on review. Updated dev_notes.txt.
Fix some bugs found during testing and uncrustify.
Removed perf_flow.h which had been removed from master.
ProtocolId and IpProtocol updates.
Add IpProtocol and ProtocolId enums.
Russ Combs (rucombs) [Tue, 26 Apr 2016 15:58:36 +0000 (11:58 -0400)]
Merge pull request #457 in SNORT/snort3 from cap_build2 to master
* commit '
3531ba4d015229c8dc404d762d0b8b75bdade775 ':
fixed crossed static / dynamic inclusion for packet capture
Carter Waxman [Tue, 26 Apr 2016 13:56:25 +0000 (09:56 -0400)]
fixed crossed static / dynamic inclusion for packet capture
Russ Combs (rucombs) [Tue, 26 Apr 2016 13:03:21 +0000 (09:03 -0400)]
Merge pull request #454 in SNORT/snort3 from stream_tcp_state_handling to master
* commit '
12a43bb4e01c86831bcba4fefc4a33ea73e14662 ':
fix copyright, uncrustify, alpha order file lists in Makefile.am
make state machine allocation thread safe
more changes to support tcp sm as flyweight/singleton, delete redundant typecasts of tracker objects
davis mcpherson [Tue, 26 Apr 2016 12:51:48 +0000 (08:51 -0400)]
fix copyright, uncrustify, alpha order file lists in Makefile.am
Steve Chew [Mon, 25 Apr 2016 22:34:12 +0000 (18:34 -0400)]
Updated protocol types in extra sub-dir.
Russ Combs (rucombs) [Mon, 25 Apr 2016 20:39:53 +0000 (16:39 -0400)]
Merge pull request #455 in SNORT/snort3 from ~JOCORNET/snort3:fix_error_message_for_memcap to master
* commit '
de01fb42408cd1b92ae6c2bb585d469b58b32764 ':
foo
Joel Cornett [Mon, 25 Apr 2016 20:37:28 +0000 (16:37 -0400)]
foo
Russ Combs (rucombs) [Mon, 25 Apr 2016 20:30:04 +0000 (16:30 -0400)]
Merge pull request #453 in SNORT/snort3 from ~JOCORNET/snort3:fix_daqs_cmake_build to master
* commit '
c67f769d947b7201aa7d77044095f92eeec63e0c ':
build daq modules as .so (instead of .dylib)
Joel Cornett [Mon, 25 Apr 2016 19:58:56 +0000 (15:58 -0400)]
build daq modules as .so (instead of .dylib)
davis mcpherson [Mon, 25 Apr 2016 19:24:30 +0000 (15:24 -0400)]
make state machine allocation thread safe
davis mcpherson [Fri, 1 Apr 2016 19:58:39 +0000 (15:58 -0400)]
more changes to support tcp sm as flyweight/singleton, delete redundant typecasts of tracker objects
Russ Combs (rucombs) [Mon, 25 Apr 2016 17:34:02 +0000 (13:34 -0400)]
Merge pull request #448 in SNORT/snort3 from dce_smb to master
* commit '
d0526e8cc127e06790ccd2e8151ca29a6356568c ':
Code review comments
Fix build warning
Port of dce request tracking infrastructure, SmbInspect function
Russ Combs (rucombs) [Mon, 25 Apr 2016 14:49:15 +0000 (10:49 -0400)]
Merge pull request #452 in SNORT/snort3 from stream_tcp_cleanup_tweak to master
* commit '
76bd441402ad3a9c2e867fd281c980bdfd5d2fa1 ':
flush queued segments first when cleaning up a session
davis mcpherson [Mon, 25 Apr 2016 14:03:06 +0000 (10:03 -0400)]
flush queued segments first when cleaning up a session
Russ Combs (rucombs) [Mon, 25 Apr 2016 12:20:42 +0000 (08:20 -0400)]
Merge pull request #451 in SNORT/snort3 from stream_tcp_cleanup_fix to master
* commit '
11085f3ece10fc5beac307a01991099564bc7e38 ':
delete splitter on session restart, origanize cleanup sequence a little more logical
simplify session cleanup/restart handling on timeout/reset/prune, rename paremeters to following coding standard, fix out of order tcp stat
davis mcpherson [Fri, 22 Apr 2016 21:39:41 +0000 (17:39 -0400)]
delete splitter on session restart, origanize cleanup sequence a little more logical
Russ Combs (rucombs) [Fri, 22 Apr 2016 20:42:37 +0000 (16:42 -0400)]
fix packet_capture module ctor
Russ Combs [Fri, 22 Apr 2016 20:16:39 +0000 (16:16 -0400)]
build 195; fix packet_capture build
Russ Combs (rucombs) [Fri, 22 Apr 2016 20:05:26 +0000 (16:05 -0400)]
Merge pull request #450 in SNORT/snort3 from cap_build to master
* commit '
d70dd309fe7910be005401525cd7ad61604b1412 ':
fixed broken build
davis mcpherson [Fri, 22 Apr 2016 19:36:02 +0000 (15:36 -0400)]
simplify session cleanup/restart handling on timeout/reset/prune, rename paremeters to following coding standard, fix out of order tcp stat
Carter Waxman [Fri, 22 Apr 2016 19:33:35 +0000 (15:33 -0400)]
fixed broken build
Russ Combs (rucombs) [Fri, 22 Apr 2016 19:03:16 +0000 (15:03 -0400)]
Merge pull request #445 in SNORT/snort3 from session_capture to master
* commit '
76d3a46109a09326dc8e66d3fa66863f97e4287c ':
fixed lua default in packet capture
added lua config option to start capture at startup
added early bail to failed capture init. minor refactoring.
removed old declarations
stubbed pcap file handling. updated error handling in capture_init.
fixed copyrights. removed useless code.
fixed sigabrt. fixed command naming.
fixed header guard. moved commands to CaptureModule. added option to build dynamically.
added peg counts
fixed output formatting for shell command
fixed compiler warning
added console interface for packet capture
completed PacketCapture code with exception of shell interface
bpf filter added.
added bpf code. still need to fix segfault.
added bpf code. still need to fix segfault.
added bpf code. still need to fix segfault.
packet capture works internally. no external interface. bpf under dev
Carter Waxman [Fri, 22 Apr 2016 18:51:45 +0000 (14:51 -0400)]
fixed lua default in packet capture
Russ Combs (rucombs) [Fri, 22 Apr 2016 18:26:30 +0000 (14:26 -0400)]
Merge pull request #449 in SNORT/snort3 from ha-sc to master
* commit '
043ff988caed8f785a000401c5ccd45b3f2e17e7 ':
Fix two memory leaks, a few build warnings, and removed a remnant #include.
Ed Borgoyn [Fri, 22 Apr 2016 18:01:15 +0000 (14:01 -0400)]
Fix two memory leaks, a few build warnings, and removed a remnant #include.
Carter Waxman [Fri, 22 Apr 2016 17:23:43 +0000 (13:23 -0400)]
added lua config option to start capture at startup
Carter Waxman [Fri, 22 Apr 2016 15:42:24 +0000 (11:42 -0400)]
added early bail to failed capture init. minor refactoring.
Carter Waxman [Fri, 22 Apr 2016 14:57:25 +0000 (10:57 -0400)]
removed old declarations
mdagon [Fri, 22 Apr 2016 14:34:27 +0000 (10:34 -0400)]
Code review comments
Carter Waxman [Fri, 22 Apr 2016 14:28:17 +0000 (10:28 -0400)]
stubbed pcap file handling. updated error handling in capture_init.
Carter Waxman [Fri, 22 Apr 2016 12:12:24 +0000 (08:12 -0400)]
fixed copyrights. removed useless code.
Russ Combs (rucombs) [Thu, 21 Apr 2016 21:22:54 +0000 (17:22 -0400)]
Merge pull request #420 in SNORT/snort3 from ha-sc to master
* commit '
f805a510ec3a17a14f632c5af0004bbcfc078516 ':
Forgot one fix..
Code review fixes.
Additional code review patches.
Merge and review fixes.
Code review fixes.
Remove ha.h as an include in flow.h as it caused a build error for 'extra'
Update CMake scripts and dev_notes.
HA-SC effort.
Interim ha commit
Initial UDP HA.
Review comment fixes.
Fix some HA-SC memory leaks.
Remove ha.h as an include in flow.h as it caused a build error for 'extra'
Update CMake scripts and dev_notes.
HA-SC effort.
Interim ha commit
Initial UDP HA.
Russ Combs (rucombs) [Thu, 21 Apr 2016 21:18:46 +0000 (17:18 -0400)]
Merge pull request #447 in SNORT/snort3 from unit_test to master
* commit '
de27ee8dd80f9dadd933bf2236a3f007c029cfa3 ':
NHI unit testing
Ed Borgoyn [Thu, 21 Apr 2016 19:48:25 +0000 (15:48 -0400)]
Forgot one fix..
Ed Borgoyn [Thu, 21 Apr 2016 19:05:02 +0000 (15:05 -0400)]
Code review fixes.
mdagon [Thu, 21 Apr 2016 18:49:17 +0000 (14:49 -0400)]
Fix build warning
Carter Waxman [Thu, 21 Apr 2016 18:41:04 +0000 (14:41 -0400)]
fixed sigabrt. fixed command naming.
Carter Waxman [Thu, 21 Apr 2016 18:35:51 +0000 (14:35 -0400)]
fixed header guard. moved commands to CaptureModule. added option to build dynamically.
mdagon [Thu, 21 Apr 2016 17:37:13 +0000 (13:37 -0400)]
Port of dce request tracking infrastructure, SmbInspect function
Russ Combs (rucombs) [Thu, 21 Apr 2016 17:14:18 +0000 (13:14 -0400)]
Merge pull request #446 in SNORT/snort3 from ~JOCORNET/snort3:memory_absolute_cap to master
* commit '
3de1963ba5dd2af590f8ec7546671a142aa81475 ':
changed memory to use absolute instead of relative cap
Carter Waxman [Thu, 21 Apr 2016 17:05:46 +0000 (13:05 -0400)]
added peg counts
Joel Cornett [Thu, 21 Apr 2016 17:03:46 +0000 (13:03 -0400)]
changed memory to use absolute instead of relative cap
Carter Waxman [Thu, 21 Apr 2016 16:30:36 +0000 (12:30 -0400)]
fixed output formatting for shell command
Tom Peters [Tue, 19 Apr 2016 18:37:51 +0000 (14:37 -0400)]
NHI unit testing
Carter Waxman [Thu, 21 Apr 2016 16:18:46 +0000 (12:18 -0400)]
fixed compiler warning
Carter Waxman [Thu, 21 Apr 2016 15:57:02 +0000 (11:57 -0400)]
added console interface for packet capture
Carter Waxman [Thu, 21 Apr 2016 15:22:12 +0000 (11:22 -0400)]
completed PacketCapture code with exception of shell interface
Carter Waxman [Thu, 21 Apr 2016 14:52:27 +0000 (10:52 -0400)]
bpf filter added.
Carter Waxman [Thu, 21 Apr 2016 14:37:34 +0000 (10:37 -0400)]
added bpf code. still need to fix segfault.
Carter Waxman [Thu, 21 Apr 2016 14:24:52 +0000 (10:24 -0400)]
added bpf code. still need to fix segfault.
Carter Waxman [Thu, 21 Apr 2016 14:03:23 +0000 (10:03 -0400)]
added bpf code. still need to fix segfault.
Russ Combs (rucombs) [Wed, 20 Apr 2016 21:29:13 +0000 (17:29 -0400)]
Merge pull request #443 in SNORT/snort3 from stream_tcp_unused_params_fix to master
* commit '
189fe504e9419acd3884df499613fee22444975b ':
fix for unused parameter warnings
Steve Chew [Wed, 20 Apr 2016 21:11:47 +0000 (17:11 -0400)]
Updates based on review. Updated dev_notes.txt.
davis mcpherson [Wed, 20 Apr 2016 20:35:56 +0000 (16:35 -0400)]
fix for unused parameter warnings
Ed Borgoyn [Wed, 20 Apr 2016 19:58:35 +0000 (15:58 -0400)]
Additional code review patches.
Ed Borgoyn [Tue, 19 Apr 2016 17:15:17 +0000 (13:15 -0400)]
Merge and review fixes.
Ed Borgoyn [Tue, 19 Apr 2016 15:49:14 +0000 (11:49 -0400)]
Code review fixes.
Ed Borgoyn [Wed, 13 Apr 2016 13:26:39 +0000 (09:26 -0400)]
Remove ha.h as an include in flow.h as it caused a build error for 'extra'
Ed Borgoyn [Wed, 13 Apr 2016 11:39:39 +0000 (07:39 -0400)]
Update CMake scripts and dev_notes.
Ed Borgoyn [Tue, 12 Apr 2016 19:58:55 +0000 (15:58 -0400)]
HA-SC effort.
Ed Borgoyn [Wed, 30 Mar 2016 17:04:52 +0000 (13:04 -0400)]
Interim ha commit
Ed Borgoyn [Mon, 21 Mar 2016 11:20:47 +0000 (07:20 -0400)]
Initial UDP HA.
Ed Borgoyn [Mon, 18 Apr 2016 17:48:36 +0000 (13:48 -0400)]
Review comment fixes.
Ed Borgoyn [Mon, 18 Apr 2016 13:04:35 +0000 (09:04 -0400)]
Fix some HA-SC memory leaks.
Ed Borgoyn [Wed, 13 Apr 2016 13:26:39 +0000 (09:26 -0400)]
Remove ha.h as an include in flow.h as it caused a build error for 'extra'
Ed Borgoyn [Wed, 13 Apr 2016 11:39:39 +0000 (07:39 -0400)]
Update CMake scripts and dev_notes.
Ed Borgoyn [Tue, 12 Apr 2016 19:58:55 +0000 (15:58 -0400)]
HA-SC effort.
Ed Borgoyn [Wed, 30 Mar 2016 17:04:52 +0000 (13:04 -0400)]
Interim ha commit
Ed Borgoyn [Mon, 21 Mar 2016 11:20:47 +0000 (07:20 -0400)]
Initial UDP HA.
Russ Combs (rucombs) [Wed, 20 Apr 2016 19:45:02 +0000 (15:45 -0400)]
Merge pull request #442 in SNORT/snort3 from ~JOCORNET/snort3:remove_lua_dependency_from_module_h to master
* commit '
40511acf8424f2d6c11b5b9e32ac2320a2cc0ee0 ':
remove lua dependency from module.h
Joel Cornett [Wed, 20 Apr 2016 19:39:08 +0000 (15:39 -0400)]
remove lua dependency from module.h
Russ Combs (rucombs) [Wed, 20 Apr 2016 19:07:01 +0000 (15:07 -0400)]
Merge pull request #434 in SNORT/snort3 from ~JOCORNET/snort3:pkgconfig_fix to master
* commit '
1ca64c5e7aebc8a79c87f54692ded4cff107c922 ':
removed comment
more corrections for pkg-config/removed defines altogether
normalized pkgconfig output
Russ Combs (rucombs) [Wed, 20 Apr 2016 19:06:03 +0000 (15:06 -0400)]
Merge pull request #439 in SNORT/snort3 from perf_units to master
* commit '
21b0127fa8e9c482befdffed7b8daffb72e223fc ':
fixed perfmon unit test
Russ Combs (rucombs) [Wed, 20 Apr 2016 19:04:36 +0000 (15:04 -0400)]
Merge pull request #411 in SNORT/snort3 from gitignore-update-for-build-scripts to master
* commit '
1fa4620767cf3a830fd8c612b2554690f7d4f9f8 ':
Additional gitignores for the build scripts
Ignore files generated by the build-scripts
Russ Combs (rucombs) [Wed, 20 Apr 2016 19:04:19 +0000 (15:04 -0400)]
Merge pull request #440 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to master
* commit '
a2c9c06742b2d1d8b02ae6186926f907cad3b7ef ':
tcp_tracker: Add explicit override specifier to init_toolbox
Russ Combs (rucombs) [Wed, 20 Apr 2016 19:03:54 +0000 (15:03 -0400)]
Merge pull request #441 in SNORT/snort3 from ~MIALTIZE/snort3:Catch-1.4.0 to master
* commit '
839005f3ac034bf3bee18246477aee7885066094 ':
catch: Update to Catch v1.4.0
Carter Waxman [Wed, 20 Apr 2016 18:44:45 +0000 (14:44 -0400)]
packet capture works internally. no external interface. bpf under dev
Michael Altizer [Wed, 20 Apr 2016 16:30:01 +0000 (12:30 -0400)]
tcp_tracker: Add explicit override specifier to init_toolbox
Michael Altizer [Wed, 20 Apr 2016 16:27:53 +0000 (12:27 -0400)]
catch: Update to Catch v1.4.0
Victor Roemer [Wed, 20 Apr 2016 16:20:21 +0000 (12:20 -0400)]
Additional gitignores for the build scripts
Carter Waxman [Wed, 20 Apr 2016 15:55:09 +0000 (11:55 -0400)]
fixed perfmon unit test
Joel Cornett [Wed, 20 Apr 2016 14:56:46 +0000 (10:56 -0400)]
removed comment
Joel Cornett [Wed, 20 Apr 2016 14:55:51 +0000 (10:55 -0400)]
more corrections for pkg-config/removed defines altogether
Russ Combs (rucombs) [Wed, 20 Apr 2016 14:48:15 +0000 (10:48 -0400)]
Merge pull request #438 in SNORT/snort3 from ~JOCORNET/snort3:fix_utils_cpputest to master
* commit '
c9be47d83eba353a7e121b78ea339041102ff96e ':
added utils cpputest to cmake
Russ Combs (rucombs) [Wed, 20 Apr 2016 14:44:53 +0000 (10:44 -0400)]
Merge pull request #424 in SNORT/snort3 from crc/s5c to master
* commit '
cf2177004aadfd81f503b009543abfef7809ce21 ':
on session cleanup always release all allocated resources (e.g. splitter, reassembler...)
reset paf when we cleanup a session and reset the splitters
don't delete splitters in session cleanup unless we are doing a full session reset
fix stream tcp config leak
projects / thirdparty / snort3.git / log
