]>
git.ipfire.org Git - thirdparty/snort3.git/log
Russ Combs [Mon, 24 Nov 2014 21:32:16 +0000 (16:32 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/rucombs/Snort++
rcombs [Mon, 24 Nov 2014 21:31:34 +0000 (16:31 -0500)]
squelch bogus o3 warning
Josh [Mon, 24 Nov 2014 21:28:16 +0000 (15:28 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
Josh [Mon, 24 Nov 2014 21:27:27 +0000 (15:27 -0600)]
updating installation directories
Russ Combs [Mon, 24 Nov 2014 21:03:16 +0000 (16:03 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Josh [Mon, 24 Nov 2014 20:58:24 +0000 (14:58 -0600)]
fixing installed files and directories
Russ Combs [Mon, 24 Nov 2014 20:43:09 +0000 (15:43 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Mon, 24 Nov 2014 20:42:05 +0000 (15:42 -0500)]
patched around daq verdict ambiguity
Tom Peters [Mon, 24 Nov 2014 19:16:57 +0000 (14:16 -0500)]
test tool improvements
Josh [Mon, 24 Nov 2014 18:52:49 +0000 (12:52 -0600)]
fixing Codec license problems
rcombs [Mon, 24 Nov 2014 18:28:51 +0000 (13:28 -0500)]
fixed internal *list counts - again :(
Josh [Mon, 24 Nov 2014 17:52:50 +0000 (11:52 -0600)]
fixing Victor's CMake problem -- local directories included before External Libraries
Russ Combs [Mon, 24 Nov 2014 17:36:05 +0000 (12:36 -0500)]
moved internal *lists back to aux
Russ Combs [Mon, 24 Nov 2014 17:24:04 +0000 (12:24 -0500)]
update from josh for gtp and tunnel verdicts
Josh [Mon, 24 Nov 2014 17:10:50 +0000 (11:10 -0600)]
merging with russ. fixing segfault
Josh [Mon, 24 Nov 2014 16:46:44 +0000 (10:46 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
Conflicts:
src/utils/stats.cc
rcombs [Mon, 24 Nov 2014 16:08:15 +0000 (11:08 -0500)]
added missing ip pegs sentinel
Josh [Mon, 24 Nov 2014 15:58:31 +0000 (09:58 -0600)]
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs
Russ Combs [Mon, 24 Nov 2014 15:37:56 +0000 (10:37 -0500)]
added help for peg counts
Russ Combs [Sun, 23 Nov 2014 11:59:20 +0000 (06:59 -0500)]
fixed flowbits init
Josh [Sat, 22 Nov 2014 03:56:09 +0000 (21:56 -0600)]
Fixing GTP Ports. ips_reassemble bug. teredo ActiveTunnel bug
Russ Combs [Fri, 21 Nov 2014 22:42:12 +0000 (17:42 -0500)]
updated quick start
Josh [Fri, 21 Nov 2014 02:30:38 +0000 (20:30 -0600)]
fixing GTP tunneling. Fixing a couple of DAQ output statistics bugs
Russ Combs [Fri, 21 Nov 2014 01:22:03 +0000 (20:22 -0500)]
simplify default conf
Russ Combs [Fri, 21 Nov 2014 01:16:57 +0000 (20:16 -0500)]
fixed copyrights, added -R <rules file>
Russ Combs [Thu, 20 Nov 2014 21:54:40 +0000 (16:54 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Russ Combs [Thu, 20 Nov 2014 21:54:03 +0000 (16:54 -0500)]
fixed mac builds
Josh [Thu, 20 Nov 2014 21:15:51 +0000 (15:15 -0600)]
fixing distribution and documentation problems
Josh [Thu, 20 Nov 2014 20:51:00 +0000 (14:51 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
Josh [Thu, 20 Nov 2014 20:49:56 +0000 (14:49 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
rcombs [Thu, 20 Nov 2014 20:37:45 +0000 (15:37 -0500)]
fixed ordering of block handling
Russ Combs [Thu, 20 Nov 2014 20:35:54 +0000 (15:35 -0500)]
tightened up lua includes
Russ Combs [Thu, 20 Nov 2014 20:35:11 +0000 (15:35 -0500)]
tightened up lua includes and libs
Russ Combs [Thu, 20 Nov 2014 20:12:04 +0000 (15:12 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/rucombs/Snort++
Josh [Thu, 20 Nov 2014 20:05:34 +0000 (14:05 -0600)]
changing DropPacket back to DropSession()
Josh [Thu, 20 Nov 2014 19:46:05 +0000 (13:46 -0600)]
more verdict count fixes
Russ Combs [Thu, 20 Nov 2014 19:02:53 +0000 (14:02 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Thu, 20 Nov 2014 19:01:14 +0000 (14:01 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/mialtize/Snort++
Michael Altizer [Thu, 20 Nov 2014 18:38:07 +0000 (13:38 -0500)]
Export dynamic symbols from Snort binary for lua.
Michael Altizer [Thu, 20 Nov 2014 18:37:48 +0000 (13:37 -0500)]
Only try to link against libluajit-5.1.
Michael Altizer [Thu, 20 Nov 2014 18:36:24 +0000 (13:36 -0500)]
Revert "back out luajit foo causing segfault"
This reverts commit
d195fea2479c90ff95aa6e4a0bc51b02b02bda40.
Josh [Thu, 20 Nov 2014 18:53:19 +0000 (12:53 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs
Josh [Thu, 20 Nov 2014 18:39:10 +0000 (12:39 -0600)]
checksum will not return false on rebuilt packets
Josh [Thu, 20 Nov 2014 18:16:21 +0000 (12:16 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++
Josh [Thu, 20 Nov 2014 18:13:37 +0000 (12:13 -0600)]
fixing implicit conversions ina few locations
rcombs [Thu, 20 Nov 2014 18:12:54 +0000 (13:12 -0500)]
added PacketManager::decode(... cooked ...)
Josh [Thu, 20 Nov 2014 17:35:23 +0000 (11:35 -0600)]
initial tunnel byppass commit
rcombs [Thu, 20 Nov 2014 16:30:17 +0000 (11:30 -0500)]
new snort2lua rules
rcombs [Thu, 20 Nov 2014 16:26:31 +0000 (11:26 -0500)]
1/2 default cache sizes
rcombs [Thu, 20 Nov 2014 15:41:38 +0000 (10:41 -0500)]
lazy flow init
rcombs [Thu, 20 Nov 2014 14:39:46 +0000 (09:39 -0500)]
fixed multi-outputs
Russ Combs [Thu, 20 Nov 2014 11:31:02 +0000 (06:31 -0500)]
back out luajit foo causing segfault
rcombs [Thu, 20 Nov 2014 04:47:30 +0000 (23:47 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Josh [Thu, 20 Nov 2014 04:36:56 +0000 (22:36 -0600)]
Snort2Lua fix: content parser can now handle a comman inside of whitespace
rcombs [Thu, 20 Nov 2014 02:00:17 +0000 (21:00 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Thu, 20 Nov 2014 01:58:35 +0000 (20:58 -0500)]
fixed glaring missing array dereference; make daq init failures non-fatal
Josh [Thu, 20 Nov 2014 01:19:20 +0000 (19:19 -0600)]
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs
Josh [Thu, 20 Nov 2014 01:19:00 +0000 (19:19 -0600)]
fixing CMake DNET problem and 'checksum_drop' bug
Josh [Thu, 20 Nov 2014 00:32:14 +0000 (18:32 -0600)]
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs
Josh [Thu, 20 Nov 2014 00:32:02 +0000 (18:32 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
Josh [Thu, 20 Nov 2014 00:31:58 +0000 (18:31 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs
Josh [Thu, 20 Nov 2014 00:30:55 +0000 (18:30 -0600)]
fixing DEBUG_WRAP segfault
rcombs [Thu, 20 Nov 2014 00:17:32 +0000 (19:17 -0500)]
deleted broken rule
Josh [Thu, 20 Nov 2014 00:12:07 +0000 (18:12 -0600)]
pulling in Russ's changes
Josh [Thu, 20 Nov 2014 00:10:54 +0000 (18:10 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
Josh [Thu, 20 Nov 2014 00:10:31 +0000 (18:10 -0600)]
another cpack commit
Josh [Thu, 20 Nov 2014 00:07:09 +0000 (18:07 -0600)]
another CPack commit
Josh [Wed, 19 Nov 2014 23:44:58 +0000 (17:44 -0600)]
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs
Josh [Wed, 19 Nov 2014 23:43:59 +0000 (17:43 -0600)]
additinoal CPack updates
Josh [Wed, 19 Nov 2014 23:30:35 +0000 (17:30 -0600)]
adding CPack build variables
Josh [Wed, 19 Nov 2014 23:30:35 +0000 (17:30 -0600)]
adding CPack build variables
Michael Altizer [Wed, 19 Nov 2014 22:28:02 +0000 (22:28 +0000)]
Re-fix FindDNET.cmake
Russ Combs [Wed, 19 Nov 2014 23:16:15 +0000 (18:16 -0500)]
removed dev change log
Russ Combs [Wed, 19 Nov 2014 23:12:43 +0000 (18:12 -0500)]
updated default conf
Russ Combs [Wed, 19 Nov 2014 22:57:35 +0000 (17:57 -0500)]
adding FindDNET.cmake back, less michaels changes
Russ Combs [Wed, 19 Nov 2014 22:51:12 +0000 (17:51 -0500)]
fuck this file
Russ Combs [Wed, 19 Nov 2014 22:30:48 +0000 (17:30 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Russ Combs [Wed, 19 Nov 2014 22:29:16 +0000 (17:29 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++
Michael Altizer [Wed, 19 Nov 2014 21:55:57 +0000 (16:55 -0500)]
Fix autoconf handling for luajit and pthreads.
Michael Altizer [Tue, 18 Nov 2014 19:20:42 +0000 (14:20 -0500)]
Fix build on Ubuntu 14.10.
Tom Peters [Wed, 19 Nov 2014 21:59:19 +0000 (16:59 -0500)]
nhttp doc for Russ
Russ Combs [Wed, 19 Nov 2014 21:57:14 +0000 (16:57 -0500)]
gak
Josh [Wed, 19 Nov 2014 21:50:22 +0000 (15:50 -0600)]
fixing default checksum_drop value. Also fixes XCode's Snort2Lua warnings regarding shadowed variables
Russ Combs [Wed, 19 Nov 2014 21:39:30 +0000 (16:39 -0500)]
merge
Russ Combs [Wed, 19 Nov 2014 21:36:46 +0000 (16:36 -0500)]
fixed conf slots
Josh [Wed, 19 Nov 2014 21:36:36 +0000 (15:36 -0600)]
adding maltheizers patch. Setting minimum cmake version to 2.8.12.1
Tom Peters [Wed, 19 Nov 2014 18:38:06 +0000 (13:38 -0500)]
Merge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Wed, 19 Nov 2014 18:37:31 +0000 (13:37 -0500)]
added a couple of FIXIT comments
rcombs [Wed, 19 Nov 2014 17:57:06 +0000 (12:57 -0500)]
tweaked build doc foo
rcombs [Wed, 19 Nov 2014 17:12:11 +0000 (12:12 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Josh [Wed, 19 Nov 2014 17:06:23 +0000 (11:06 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs
Josh [Wed, 19 Nov 2014 17:04:06 +0000 (11:04 -0600)]
adding empty profile = { module/rules } table when 'config profile_* seen without options
Russ Combs [Wed, 19 Nov 2014 14:36:26 +0000 (09:36 -0500)]
fix copyrights
Russ Combs [Wed, 19 Nov 2014 12:58:13 +0000 (07:58 -0500)]
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Wed, 19 Nov 2014 12:52:02 +0000 (07:52 -0500)]
fixed pm backtracking
Josh [Tue, 18 Nov 2014 23:54:31 +0000 (17:54 -0600)]
finishing touches to configurable number of layers
Josh [Tue, 18 Nov 2014 23:43:34 +0000 (17:43 -0600)]
finalizing maximum IP and IP6 extension support
Josh [Tue, 18 Nov 2014 22:33:51 +0000 (16:33 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
Josh [Tue, 18 Nov 2014 21:40:37 +0000 (15:40 -0600)]
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs
Josh [Tue, 18 Nov 2014 21:40:32 +0000 (15:40 -0600)]
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs