]>
git.ipfire.org Git - thirdparty/snort3.git/log
Grant [Tue, 13 Oct 2015 22:14:10 +0000 (15:14 -0700)]
Convert README to markdown
Russ Combs (rucombs) [Fri, 9 Oct 2015 17:38:39 +0000 (13:38 -0400)]
Merge pull request #70 in SNORT/snort3 from crc/cleanup to master
Squashed commit of the following:
commit
5b3501d68c43a3fcccd456986ff8a462dc18dec4
Author: russ <russ@localhost.localdomain>
Date: Fri Oct 9 11:34:22 2015 -0400
-- build 173
-- update change log
-- added pkt_num rule option to extras
-- fix final -> finalize changes for extras
-- moved alert_unixsock and log_null to extras
-- removed duplicate pat_stats source from extras
-- prevent tcp session restart on rebuilt packets
thanks to rmkml for reporting the issue
update change log
Russ Combs (rucombs) [Thu, 8 Oct 2015 22:00:45 +0000 (18:00 -0400)]
Merge pull request #67 in SNORT/snort3 from ~MIALTIZE/snort3:master to master
Squashed commit of the following:
commit
5b1ab4749ded466c91abd47f2f3928859d415461
Author: Michael Altizer <mialtize@cisco.com>
Date: Thu Oct 8 17:41:53 2015 -0400
Reorganize profiler sorting defines to match config enum.
Russ Combs (rucombs) [Thu, 8 Oct 2015 20:38:28 +0000 (16:38 -0400)]
Merge pull request #66 in SNORT/snort3 from crc/alerts to master
Squashed commit of the following:
commit
550e843ba917bdb67a1e0696b1952f51434194f0
Author: russ <russ@localhost.localdomain>
Date: Thu Oct 8 16:29:44 2015 -0400
moved event logging to after final ppm checks
Russ Combs (rucombs) [Thu, 8 Oct 2015 17:49:03 +0000 (13:49 -0400)]
Merge pull request #62 in SNORT/snort3 from crc/target to master
Squashed commit of the following:
commit
87a44d762639d80b7076a6cbaf97beb0db2f2a15
Author: Russ Combs <rucombs@cisco.com>
Date: Tue Sep 29 14:03:14 2015 -0400
define commands with parameters
add file name to reload commands
Russ Combs (rucombs) [Thu, 8 Oct 2015 17:48:45 +0000 (13:48 -0400)]
Merge pull request #65 in SNORT/snort3 from rename_final_macro to master
Squashed commit of the following:
commit
47540090256b355700ca69e9666c28d75e22abed
Author: Joel Cornett <joel.cornett@gmail.com>
Date: Thu Oct 8 12:12:04 2015 -0400
fixed signature for TcpNormalizerProxy::handle_paws()
commit
265560eaeea3ddf032a5fccefb74c92cdf1134ce
Author: Joel Cornett <joel.cornett@gmail.com>
Date: Thu Oct 8 11:19:54 2015 -0400
updated virtual... overrides to match the style guide
commit
61899b8eeec2406a9a97dc08a3995c6c35703360
Author: Joel Cornett <joel.cornett@gmail.com>
Date: Tue Oct 6 14:31:04 2015 -0400
added virtual... override keywords to silence warnings
commit
61cb1418e387eaa859369939dfd349aba3c620b2
Author: Joel Cornett <joel.cornett@gmail.com>
Date: Tue Oct 6 14:13:08 2015 -0400
renamed hash macro final -> finalize everywhere it is used
Russ Combs (rucombs) [Mon, 5 Oct 2015 20:42:04 +0000 (16:42 -0400)]
Merge pull request #63 in SNORT/snort3 from obfuscation1 to master
Squashed commit of the following:
commit
7eeb7325b1d300680f8502263a497464179572aa
Author: Tom Peters <thopeter@cisco.com>
Date: Thu Oct 1 13:20:35 2015 -0400
-B switch fixed
Russ Combs (rucombs) [Mon, 5 Oct 2015 14:40:53 +0000 (10:40 -0400)]
Merge pull request #61 in SNORT/snort3 from syn_only_patch to master
Squashed commit of the following:
commit
b85ad601c48d44aa1ec43e9c087e5a864452e81a
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Mon Oct 5 10:22:47 2015 -0400
remove unused params, fix for var refs changed in refactoring
commit
f7a0982727157bb34cd1b0433727bb9a79d844d6
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Fri Oct 2 17:37:23 2015 -0400
add FIXIT comment to track need to investigate if syn only function should include checking for RST & FIN flags
fix var refs in DEBUG_* statements missed in normalization refactor
fix var ref to work with refactored normalization code when daq address space id is enabled
remove unused parameter from function prototype
fix var refs in #ifdef'ed code
ignore all flags except SYN & ACK when determining if packet is SYN only
Russ Combs (rucombs) [Fri, 2 Oct 2015 19:49:23 +0000 (15:49 -0400)]
Merge pull request #59 in SNORT/snort3 from debug_enable to master
Squashed commit of the following:
commit
66fb7a0267c89b2d8227cadb7f45f09ea3b9ddf3
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Fri Oct 2 14:45:45 2015 -0400
remove unused parameter from function prototype
commit
654f2c777e9d754e68bb6fdb5497298249dda66f
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Fri Oct 2 14:38:36 2015 -0400
fix var ref to work with refactored normalization code when daq address space id is enabled
commit
48c1eb68e4c7140451b9fe2738158618187c5f3c
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Fri Oct 2 14:22:53 2015 -0400
fix var refs in DEBUG_* statements missed in normalization refactor
Russ Combs (rucombs) [Fri, 2 Oct 2015 19:48:34 +0000 (15:48 -0400)]
Merge pull request #60 in SNORT/snort3 from crc/ip6 to master
Squashed commit of the following:
commit
6c44b4f00ffcd92cc0254660a9efad49798f1066
Author: Russ Combs <rucombs@cisco.com>
Date: Fri Oct 2 15:10:46 2015 -0400
ensure ip6 extension decoder state is reset for ip4 too since ip4 packets
may have ip6 next proto
also update default manuals
Russ Combs (rucombs) [Fri, 2 Oct 2015 18:28:44 +0000 (14:28 -0400)]
Merge pull request #58 in SNORT/snort3 from debug_enable to master
Squashed commit of the following:
commit
48c1eb68e4c7140451b9fe2738158618187c5f3c
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Fri Oct 2 14:22:53 2015 -0400
fix var refs in DEBUG_* statements missed in normalization refactor
Russ Combs (rucombs) [Fri, 2 Oct 2015 17:11:43 +0000 (13:11 -0400)]
Merge pull request #34 in SNORT/snort3 from stream_dev to master
Squashed commit of the following:
commit
0029a412c7434f5a32c8ebf06e688695241057e2
Merge:
1d6c94b e662907
Author: davis mcpherson <davmcphe@cisco.com>
Date: Wed Sep 23 17:05:47 2015 +0000
Merge branch 'stream_dev' of https://stash-eng-rtp1.cisco.com/stash/scm/snort/snort3 into stream_dev
commit
1d6c94baecd2f800144c46d90aa54662502ba1ce
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Wed Sep 23 12:55:01 2015 -0400
code cleanup from review comments, add c/s trackers, session to tcp norm class, use tcp flags helper functions
commit
b2b73179b98333fd22d9cd9f2dfdc5da718b8d71
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Tue Sep 22 09:22:30 2015 -0400
fix merge issue after rebase with master
commit
6a18d85328ea868fddccab5e9a2804a35808e4dc
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Tue Sep 15 12:50:24 2015 -0400
merge of latest tcp normalization refactoring
commit
e662907c2639d9d2459158624538da7fc03565e6
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Wed Sep 23 12:55:01 2015 -0400
code cleanup from review comments, add c/s trackers, session to tcp norm class, use tcp flags helper functions
commit
2c349a9753993ce2d60cb119ac0d8e29a6d10d8e
Merge:
b97bed9 3a88b13
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Tue Sep 22 10:14:51 2015 -0400
fix merge issue pulling latest from origin
commit
b97bed97696dc55b79961c3b154594bfb78fe029
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Tue Sep 22 09:22:30 2015 -0400
fix merge issue after rebase with master
commit
797672c0dd77a424b4fa0480ce30767726a6cac0
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Tue Sep 15 12:50:24 2015 -0400
merge of latest tcp normalization refactoring
commit
3a88b134a557fc33cd30095588dd82d6c1d58fa1
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date: Tue Sep 15 12:50:24 2015 -0400
merge of latest tcp normalization refactoring
Russ Combs (rucombs) [Thu, 1 Oct 2015 22:34:36 +0000 (18:34 -0400)]
Merge pull request #56 in SNORT/snort3 from buglist to master
Squashed commit of the following:
commit
57a1f2df554985993960e15d0ecb700a178e05fb
Author: Tom Peters <thopeter@cisco.com>
Date: Thu Oct 1 12:32:04 2015 -0400
added bug to list
Russ Combs [Thu, 1 Oct 2015 22:33:37 +0000 (18:33 -0400)]
Squashed commit of the following:
commit
98c6d57679103634ed8f31c692a6f1d7a695537f
Author: Russ Combs <rucombs@cisco.com>
Date: Thu Oct 1 13:40:54 2015 -0400
build 172; xcode cleanup
fix visibility and align auto and cmake libs
Russ Combs (rucombs) [Thu, 1 Oct 2015 16:18:02 +0000 (12:18 -0400)]
Merge pull request #55 in SNORT/snort3 from cwaxman_buildfixes to master
Squashed commit of the following:
commit
4f8cb46048f9b04cb8105f3e45d210e13bdd1c4f
Merge:
5174c6f 451c895
Author: Carter Waxman <cwaxman@cisco.com>
Date: Thu Oct 1 12:12:25 2015 -0400
Merge branch 'cwaxman_buildfixes' of ssh://stash-eng-rtp1.cisco.com:7999/snort/snort3 into cwaxman_buildfixes
commit
5174c6ff549664afb9d99e62a9b0544a8125a05e
Author: Carter Waxman <cwaxman@cisco.com>
Date: Thu Oct 1 12:10:55 2015 -0400
update bugs.txt
commit
ddeea25429840cf1ae048d5134de5fe73f6b031e
Merge:
299a5fa 1f8e2d1
Author: Carter Waxman <cwaxman@cisco.com>
Date: Thu Oct 1 12:07:09 2015 -0400
Merge branch 'master' of ssh://stash-eng-rtp1.cisco.com:7999/snort/snort3 into cwaxman_buildfixes
commit
299a5faeec396f9563b9e06c6a3484f8937bd7ec
Author: Carter Waxman <uberrootgh@gmail.com>
Date: Wed Sep 23 14:12:50 2015 -0400
moved fragtracker counting to ip session setup / clear
commit
1faab0a80b0d50bf03b8b1104d5d0d16238d6333
Author: Carter Waxman <uberrootgh@gmail.com>
Date: Mon Sep 21 16:08:04 2015 -0400
Fixed perfmon config error with LINUX_SMP enabled. Fixed frag tracker accounting.
commit
451c8956b28bc00d5fd851c9fde25f33d77361cc
Author: Carter Waxman <uberrootgh@gmail.com>
Date: Wed Sep 23 14:12:50 2015 -0400
moved fragtracker counting to ip session setup / clear
commit
a6b99476e467b47516ec4f1ea123af7df10b552b
Merge:
fc8041c 7de2eb2
Author: Carter Waxman <uberrootgh@gmail.com>
Date: Wed Sep 23 14:12:17 2015 -0400
Merge branch 'master' of ssh://stash-eng-rtp1.cisco.com:7999/snort/snort3 into cwaxman_buildfixes
commit
fc8041c33c2831f05248e49c4ff917510fad9d79
Author: Carter Waxman <uberrootgh@gmail.com>
Date: Mon Sep 21 16:08:04 2015 -0400
Fixed perfmon config error with LINUX_SMP enabled. Fixed frag tracker accounting.
Russ Combs (rucombs) [Wed, 30 Sep 2015 21:09:40 +0000 (17:09 -0400)]
Merge pull request #52 in SNORT/snort3 from nhttp19 to master
Squashed commit of the following:
commit
f9451d42bc6ad29c895b55180550f49ddbe48081
Author: Tom Peters <thopeter@cisco.com>
Date: Tue Sep 29 10:51:52 2015 -0400
File processing fix
Russ Combs (rucombs) [Wed, 30 Sep 2015 21:08:38 +0000 (17:08 -0400)]
Merge pull request #54 in SNORT/snort3 from ppm_fix to master
Squashed commit of the following:
commit
f1beb4505cdb4a928b2282e468638f1feb7f1bcd
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date: Wed Sep 30 17:04:40 2015 -0400
Check for bool value before setting fastpath config option in PPM
Russ Combs [Mon, 28 Sep 2015 21:06:22 +0000 (17:06 -0400)]
update manual re liblzma
Russ Combs (rucombs) [Mon, 28 Sep 2015 20:58:29 +0000 (16:58 -0400)]
Merge pull request #50 in SNORT/snort3 from crc/nonprod to master
Squashed commit of the following:
commit
d2aea5a72d4931c531bf85ee57ff5a30b2b1dc90
Author: Russ Combs <rucombs@cisco.com>
Date: Mon Sep 28 14:47:36 2015 -0400
update cmake for non-ether refactoring
commit
56d247864ff821c55f268d21d6a610111fb5a583
Author: Russ Combs <rucombs@cisco.com>
Date: Mon Sep 28 13:46:25 2015 -0400
additional refactoring cleanup
commit
c5d410acf122065cf71d798fff5f7e58228f60e5
Author: Russ Combs <rucombs@cisco.com>
Date: Mon Sep 28 13:13:04 2015 -0400
add dags dir to extras make
commit
a2ac74bd63bce6e47b484947a7dee4c752637a5d
Author: Russ Combs <rucombs@cisco.com>
Date: Mon Sep 28 13:11:28 2015 -0400
move non-ether plugins to extras
Russ Combs (rucombs) [Mon, 28 Sep 2015 18:54:17 +0000 (14:54 -0400)]
Merge pull request #49 in SNORT/snort3 from nhttp18 to master
Squashed commit of the following:
commit
a9632f2204ace227f73960724844fb4592ff7055
Author: Tom Peters <thopeter@cisco.com>
Date: Mon Sep 28 11:37:09 2015 -0400
minor NHI changes
Russ Combs (rucombs) [Mon, 28 Sep 2015 18:52:32 +0000 (14:52 -0400)]
Merge pull request #48 in SNORT/snort3 from hi to master
Squashed commit of the following:
commit
79a20c2c168e7020bca828e5a7c3e86dbeb068b2
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date: Mon Sep 28 12:55:47 2015 -0400
Correction to file_decomp error logic.
russ [Sat, 26 Sep 2015 11:27:21 +0000 (07:27 -0400)]
enable active response w/o flow
russ [Fri, 25 Sep 2015 23:35:01 +0000 (19:35 -0400)]
tweak dev guide build to exclude .dirs
Russ Combs [Fri, 25 Sep 2015 20:48:12 +0000 (16:48 -0400)]
build 171
Russ Combs (rucombs) [Fri, 25 Sep 2015 11:55:05 +0000 (07:55 -0400)]
Merge pull request #47 in SNORT/snort3 from nhttp17 to master
Squashed commit of the following:
commit
fd3a359b9351d82994151148e9d801983f1e0177
Author: Tom Peters <thopeter@cisco.com>
Date: Wed Sep 23 17:48:32 2015 -0400
updates
Russ Combs (rucombs) [Fri, 25 Sep 2015 09:39:04 +0000 (05:39 -0400)]
Merge pull request #43 in SNORT/snort3 from crc/service to master
Squashed commit of the following:
commit
72ed17cb586e438acb057d9a6fb991630f68405d
Author: Russ Combs <rucombs@cisco.com>
Date: Wed Sep 23 09:48:31 2015 -0400
fix metadata:service to work like 2x
-- ignore ports when service is known and service group is found
-- use ports if service is unknown or there are no service rules
Russ Combs (rucombs) [Thu, 24 Sep 2015 14:59:07 +0000 (10:59 -0400)]
Merge pull request #46 in SNORT/snort3 from crc/periodic2 to master
Squashed commit of the following:
commit
b969ca5fb254cc6766c7fe63e2f1f48d8b048856
Author: russ <russ@localhost.localdomain>
Date: Wed Sep 23 15:16:31 2015 -0400
add unit tests for periodic and idle callbacks
refactor periodic and idle callbacks to use stl containers
Russ Combs (rucombs) [Wed, 23 Sep 2015 19:02:43 +0000 (15:02 -0400)]
Merge pull request #44 in SNORT/snort3 from cwaxman_buildfixes2 to master
* commit '
da74d9b2d79fca663184b1e52f1a4b0ae4733146 ':
fixed issues when building with LINUX_SMP. fixed frag tracker accounting.
Carter Waxman [Wed, 23 Sep 2015 18:45:18 +0000 (14:45 -0400)]
fixed issues when building with LINUX_SMP. fixed frag tracker accounting.
Russ Combs (rucombs) [Tue, 22 Sep 2015 17:27:53 +0000 (13:27 -0400)]
Merge pull request #35 in SNORT/snort3 from ~VIROEMER/snort3:icmpv4-in-ipv6 to master
* commit '
39818a51f33ecff40e6b0038affbf349f00a0bf2 ':
Invert logic, test for valid next IPv6 headers.
IPv6 bad next header check moved into ipv6.h
Implement DECODE_IPV6_BAD_NEXT_HEADER decoder rule
Victor Roemer [Tue, 22 Sep 2015 17:08:28 +0000 (13:08 -0400)]
Invert logic, test for valid next IPv6 headers.
Russ Combs (rucombs) [Tue, 22 Sep 2015 16:55:54 +0000 (12:55 -0400)]
Merge pull request #39 in SNORT/snort3 from cmake to master
* commit '
aa2a89f44ac2c7b53e2d32dfe73ca3d6c0f3b5fd ':
fix xcode builds fix unused warning
Russ Combs (rucombs) [Tue, 22 Sep 2015 16:55:20 +0000 (12:55 -0400)]
Merge pull request #42 in SNORT/snort3 from snort2luafix to master
* commit '
b6a5200735f699e43fc1a7e22a157eca3f23ec4e ':
snort2lua tool wasn't taking into account some changed/deleted configuration and hence producing incorrect output which failed validation when supplied to snort. This was one of the reasons for the test in tests/snort2lua/large_conf/one_file failing. Needs a counterpart fix in test repo to get the test to run successfully
rrp [Tue, 22 Sep 2015 16:35:01 +0000 (12:35 -0400)]
snort2lua tool wasn't taking into account some changed/deleted configuration and hence producing incorrect output which failed validation when supplied to snort. This was one of the reasons for the test in tests/snort2lua/large_conf/one_file failing. Needs a counterpart fix in test repo to get the test to run successfully
Victor Roemer [Tue, 22 Sep 2015 16:44:39 +0000 (12:44 -0400)]
IPv6 bad next header check moved into ipv6.h
Russ Combs (rucombs) [Tue, 22 Sep 2015 16:40:13 +0000 (12:40 -0400)]
Merge pull request #41 in SNORT/snort3 from fileclass3 to master
* commit '
2893cd760be782c6d3fb767aa35db728062e7ff1 ':
Clear warnings and clean interfaces
huica [Tue, 22 Sep 2015 16:20:07 +0000 (12:20 -0400)]
Clear warnings and clean interfaces
Russ Combs (rucombs) [Tue, 22 Sep 2015 15:18:51 +0000 (11:18 -0400)]
Merge pull request #40 in SNORT/snort3 from check2 to master
* commit '
90b143557aae71d95d74e351403373ff1aa1bb26 ':
add cpputest create trivial make check example for util_math
Russ Combs [Sat, 19 Sep 2015 14:29:43 +0000 (10:29 -0400)]
add cpputest
Russ Combs [Tue, 22 Sep 2015 13:40:45 +0000 (09:40 -0400)]
fix xcode builds
Russ Combs (rucombs) [Mon, 21 Sep 2015 20:48:56 +0000 (16:48 -0400)]
Merge pull request #20 in SNORT/snort3 from fileclass2 to master
* commit '
6926f210c4eb4fb229b92ccf8e7cf5acaeae01a8 ': (54 commits)
reorder the header files
fix compiler warning and regressions
Remove mime state: STATE_DATA_UNKNOWN
Check file processing for response
fix nhttp checks
update interfaces based on comments
add devnotes
fixed comments and spaces
add unit tests for file magic
update decode configurations
File API removed
fixed compiling errors
add file flows
remove unused functions
File service class
file api update
remove service config
minor name change
file name changed
decode buffer update
...
huica [Mon, 21 Sep 2015 18:21:52 +0000 (14:21 -0400)]
reorder the header files
huica [Mon, 21 Sep 2015 17:40:43 +0000 (13:40 -0400)]
fix compiler warning and regressions
huica [Fri, 18 Sep 2015 20:27:10 +0000 (16:27 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
Russ Combs (rucombs) [Fri, 18 Sep 2015 15:29:23 +0000 (11:29 -0400)]
Merge pull request #37 in SNORT/snort3 from crc/cant_block to master
* commit '
bf6de3db4d5250b58dc92123416dffe1c0f376da ':
cooked verdicts do not apply to raw packets
russ [Fri, 18 Sep 2015 15:16:36 +0000 (11:16 -0400)]
cooked verdicts do not apply to raw packets
huica [Fri, 18 Sep 2015 13:40:37 +0000 (09:40 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
Russ Combs (rucombs) [Fri, 18 Sep 2015 13:20:33 +0000 (09:20 -0400)]
Merge pull request #36 in SNORT/snort3 from crc/weekly to master
* commit '
42b0a90419085f89ac20f92ebb2ea494f02f4fb2 ':
build 170 updates
huica [Thu, 17 Sep 2015 20:28:29 +0000 (16:28 -0400)]
Remove mime state: STATE_DATA_UNKNOWN
huica [Thu, 17 Sep 2015 19:34:06 +0000 (15:34 -0400)]
Check file processing for response
huica [Thu, 17 Sep 2015 18:55:57 +0000 (14:55 -0400)]
fix nhttp checks
Russ Combs [Thu, 17 Sep 2015 15:41:21 +0000 (11:41 -0400)]
build 170 updates
huica [Wed, 16 Sep 2015 18:42:23 +0000 (14:42 -0400)]
update interfaces based on comments
Victor Roemer [Wed, 16 Sep 2015 17:04:27 +0000 (13:04 -0400)]
Implement DECODE_IPV6_BAD_NEXT_HEADER decoder rule
huica [Tue, 15 Sep 2015 16:59:28 +0000 (12:59 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
russ [Mon, 14 Sep 2015 18:39:19 +0000 (14:39 -0400)]
fix linux builds
huica [Mon, 14 Sep 2015 15:25:31 +0000 (11:25 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
Russ Combs (rucombs) [Mon, 14 Sep 2015 15:08:21 +0000 (11:08 -0400)]
Merge pull request #32 in SNORT/snort3 from crc/grind to master
* commit '
9ce8928bcccef95a1d3edf5b7067b9539b167e7a ':
return innermost proto for type of broken packets capture id of grinder upon init to support above
Russ Combs (rucombs) [Mon, 14 Sep 2015 12:05:49 +0000 (08:05 -0400)]
Merge pull request #31 in SNORT/snort3 from crc/files to master
* commit '
46ce915bd21db62f4e7b63cdf6eeba48e6b576da ':
fix plain file processing update location of dnet fix breakloop in file daq update usage and bug list move hext logger from extra to main source tree fix detection of stream_user and stream_file data
Russ Combs [Mon, 14 Sep 2015 11:49:03 +0000 (07:49 -0400)]
return innermost proto for type of broken packets
Russ Combs (rucombs) [Mon, 14 Sep 2015 11:40:41 +0000 (07:40 -0400)]
Merge pull request #29 in SNORT/snort3 from pkttypename2 to master
* commit '
62f446406b573bcc1b40830aae89ec4ac0eb32d6 ':
fixed get_type
Russ Combs [Sat, 12 Sep 2015 14:03:47 +0000 (10:03 -0400)]
fix plain file processing
Russ Combs (rucombs) [Fri, 11 Sep 2015 18:06:58 +0000 (14:06 -0400)]
Merge pull request #30 in SNORT/snort3 from user_file to master
* commit '
e68ea07a37fd2909e1c6991ea1968a611d2d7908 ':
move daqs from extra to main build cleanup *FLAGS use in configure.ac
Russ Combs [Fri, 11 Sep 2015 17:06:55 +0000 (13:06 -0400)]
move daqs from extra to main build
huica [Fri, 11 Sep 2015 14:48:49 +0000 (10:48 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
huica [Fri, 11 Sep 2015 14:45:23 +0000 (10:45 -0400)]
add devnotes
Russ Combs (rucombs) [Thu, 10 Sep 2015 21:54:03 +0000 (17:54 -0400)]
Merge pull request #23 in SNORT/snort3 from ~VIROEMER/snort3:victor to master
* commit '
a487ff1a8e974c1aea6c3dddd7452f27a1fc1a0e ':
Remove semicolon
Fix configure.ac compiler search order for OSX. Add Piglet tests for codecs and loggers. Fix segfault in tcp codec.
Fix configure.ac compiler search order for OSX. Add Piglet tests for codecs and loggers. Fix segfault in tcp codec.
Victor Roemer [Thu, 10 Sep 2015 21:37:39 +0000 (17:37 -0400)]
Remove semicolon
Russ Combs (rucombs) [Thu, 10 Sep 2015 21:25:41 +0000 (17:25 -0400)]
Merge pull request #27 in SNORT/snort3 from cwaxman_buildfixes to master
* commit '
a4344c1a6dc04325e2ae57ad84903d882acd8c1a ':
removed control socket defines from cmake. fixed build error with valgrind build option
Russ Combs [Thu, 10 Sep 2015 21:24:28 +0000 (17:24 -0400)]
resolve merge conflict
Victor Roemer [Thu, 10 Sep 2015 19:55:19 +0000 (15:55 -0400)]
Merge branch 'victor' of ssh://stash-eng-rtp1.cisco.com:7999/~viroemer/snort3 into victor
Victor Roemer [Tue, 8 Sep 2015 22:46:58 +0000 (18:46 -0400)]
Fix configure.ac compiler search order for OSX. Add Piglet tests for codecs and loggers. Fix segfault in tcp codec.
Tom Peters [Thu, 3 Sep 2015 20:34:33 +0000 (16:34 -0400)]
fixed get_type
huica [Thu, 10 Sep 2015 17:17:33 +0000 (13:17 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
Hui Cao (huica) [Thu, 10 Sep 2015 15:19:27 +0000 (11:19 -0400)]
Merge pull request #28 in SNORT/snort3 from build_169 to master
* commit '
7a894688fea550660dfe660f8ab7a383f28d6ab5 ':
build 169
Russ Combs [Thu, 10 Sep 2015 15:17:45 +0000 (11:17 -0400)]
build 169
Carter Waxman [Thu, 10 Sep 2015 15:02:24 +0000 (11:02 -0400)]
removed control socket defines from cmake. fixed build error with valgrind build option
huica [Thu, 10 Sep 2015 14:45:26 +0000 (10:45 -0400)]
fixed comments and spaces
Hui Cao (huica) [Thu, 10 Sep 2015 14:44:28 +0000 (10:44 -0400)]
Merge pull request #26 in SNORT/snort3 from weekly to master
* commit '
2c60d089b4e3c9f9c4b9309721ba5f823cf1d70a ':
remove cruft
fix chunked manual install
Russ Combs [Thu, 10 Sep 2015 12:21:21 +0000 (08:21 -0400)]
remove cruft
Russ Combs [Thu, 10 Sep 2015 10:44:43 +0000 (06:44 -0400)]
fix chunked manual install
Russ Combs (rucombs) [Wed, 9 Sep 2015 20:20:26 +0000 (16:20 -0400)]
Merge pull request #24 in SNORT/snort3 from utils to master
* commit '
e8b30cb17c9654dc7dc527029193aff1b750be8b ':
add event direction bug
fix OpenBSD build of extras
fix build on openbsd
remove unused code
Russ Combs [Wed, 9 Sep 2015 20:15:26 +0000 (16:15 -0400)]
get all builds (auto, cmake) x (unit, non-unit) working again
huica [Wed, 9 Sep 2015 20:02:18 +0000 (16:02 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
huica [Wed, 9 Sep 2015 20:01:59 +0000 (16:01 -0400)]
add unit tests for file magic
Russ Combs [Wed, 9 Sep 2015 19:37:21 +0000 (15:37 -0400)]
fix unit-test builds
Russ Combs [Wed, 9 Sep 2015 19:11:26 +0000 (15:11 -0400)]
fix non-unit-test builds
Russ Combs [Wed, 9 Sep 2015 17:41:29 +0000 (13:41 -0400)]
add event direction bug
Russ Combs (rucombs) [Wed, 9 Sep 2015 17:36:59 +0000 (13:36 -0400)]
Merge pull request #25 in SNORT/snort3 from check to master
* commit '
f9d96d90ee3028b3c3257221e850dc9f00f88cec ':
remove check from doc
add missing files; these were moved not deleted
convert lua unit tests to catch
remove check related build foo and code
convert check tests to catch
huica [Wed, 9 Sep 2015 14:43:07 +0000 (10:43 -0400)]
Merge branch 'master' of https://huica@stash-eng-rtp1.cisco.com/stash/scm/snort/snort3.git into fileclass2
Russ Combs [Wed, 9 Sep 2015 14:38:38 +0000 (10:38 -0400)]
fix OpenBSD build of extras
russ [Wed, 9 Sep 2015 12:22:50 +0000 (08:22 -0400)]
remove check from doc
Russ Combs [Wed, 9 Sep 2015 11:13:49 +0000 (07:13 -0400)]
fix build on openbsd
Russ Combs [Wed, 9 Sep 2015 10:35:13 +0000 (06:35 -0400)]
remove unused code
russ [Wed, 9 Sep 2015 09:47:05 +0000 (05:47 -0400)]
add missing files; these were moved not deleted
russ [Wed, 9 Sep 2015 04:05:02 +0000 (00:05 -0400)]
convert lua unit tests to catch
Victor Roemer [Tue, 8 Sep 2015 22:46:58 +0000 (18:46 -0400)]
Fix configure.ac compiler search order for OSX. Add Piglet tests for codecs and loggers. Fix segfault in tcp codec.
russ [Tue, 8 Sep 2015 22:46:43 +0000 (18:46 -0400)]
remove check related build foo and code
russ [Tue, 8 Sep 2015 22:27:04 +0000 (18:27 -0400)]
convert check tests to catch
Russ Combs (rucombs) [Tue, 8 Sep 2015 19:01:23 +0000 (15:01 -0400)]
Merge pull request #22 in SNORT/snort3 from stream_dev to master
* commit '
83b78545aecf72e9c16c98760fd33555bb9974c6 ':
fix segfault due to uninitialized DAQ header in unit tests scenarios
disable unit-test, mock class required
projects / thirdparty / snort3.git / log
