]> git.ipfire.org Git - thirdparty/snort3.git/log
thirdparty/snort3.git
11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/rucombs/Snort++
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++

11 years agosquelch bogus o3 warning
rcombs [Mon, 24 Nov 2014 21:31:34 +0000 (16:31 -0500)] 
squelch bogus o3 warning

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agoupdating installation directories
Josh [Mon, 24 Nov 2014 21:27:27 +0000 (15:27 -0600)] 
updating installation directories

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
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

11 years agofixing installed files and directories
Josh [Mon, 24 Nov 2014 20:58:24 +0000 (14:58 -0600)] 
fixing installed files and directories

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
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

11 years agopatched around daq verdict ambiguity
rcombs [Mon, 24 Nov 2014 20:42:05 +0000 (15:42 -0500)] 
patched around daq verdict ambiguity

11 years agotest tool improvements
Tom Peters [Mon, 24 Nov 2014 19:16:57 +0000 (14:16 -0500)] 
test tool improvements

11 years agofixing Codec license problems
Josh [Mon, 24 Nov 2014 18:52:49 +0000 (12:52 -0600)] 
fixing Codec license problems

11 years agofixed internal *list counts - again :(
rcombs [Mon, 24 Nov 2014 18:28:51 +0000 (13:28 -0500)] 
fixed internal *list counts - again :(

11 years agofixing Victor's CMake problem -- local directories included before External Libraries
Josh [Mon, 24 Nov 2014 17:52:50 +0000 (11:52 -0600)] 
fixing Victor's CMake problem -- local directories included before External Libraries

11 years agomoved internal *lists back to aux
Russ Combs [Mon, 24 Nov 2014 17:36:05 +0000 (12:36 -0500)] 
moved internal *lists back to aux

11 years agoupdate from josh for gtp and tunnel verdicts
Russ Combs [Mon, 24 Nov 2014 17:24:04 +0000 (12:24 -0500)] 
update from josh for gtp and tunnel verdicts

11 years agomerging with russ. fixing segfault
Josh [Mon, 24 Nov 2014 17:10:50 +0000 (11:10 -0600)] 
merging with russ.  fixing segfault

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agoadded missing ip pegs sentinel
rcombs [Mon, 24 Nov 2014 16:08:15 +0000 (11:08 -0500)] 
added missing ip pegs sentinel

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
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

11 years agoadded help for peg counts
Russ Combs [Mon, 24 Nov 2014 15:37:56 +0000 (10:37 -0500)] 
added help for peg counts

11 years agofixed flowbits init
Russ Combs [Sun, 23 Nov 2014 11:59:20 +0000 (06:59 -0500)] 
fixed flowbits init

11 years agoFixing GTP Ports. ips_reassemble bug. teredo ActiveTunnel bug
Josh [Sat, 22 Nov 2014 03:56:09 +0000 (21:56 -0600)] 
Fixing GTP Ports. ips_reassemble bug.  teredo ActiveTunnel bug

11 years agoupdated quick start
Russ Combs [Fri, 21 Nov 2014 22:42:12 +0000 (17:42 -0500)] 
updated quick start

11 years agofixing GTP tunneling. Fixing a couple of DAQ output statistics bugs
Josh [Fri, 21 Nov 2014 02:30:38 +0000 (20:30 -0600)] 
fixing GTP tunneling.  Fixing a couple of DAQ output statistics bugs

11 years agosimplify default conf
Russ Combs [Fri, 21 Nov 2014 01:22:03 +0000 (20:22 -0500)] 
simplify default conf

11 years agofixed copyrights, added -R <rules file>
Russ Combs [Fri, 21 Nov 2014 01:16:57 +0000 (20:16 -0500)] 
fixed copyrights, added -R <rules file>

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
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

11 years agofixed mac builds
Russ Combs [Thu, 20 Nov 2014 21:54:03 +0000 (16:54 -0500)] 
fixed mac builds

11 years agofixing distribution and documentation problems
Josh [Thu, 20 Nov 2014 21:15:51 +0000 (15:15 -0600)] 
fixing distribution and documentation problems

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agofixed ordering of block handling
rcombs [Thu, 20 Nov 2014 20:37:45 +0000 (15:37 -0500)] 
fixed ordering of block handling

11 years agotightened up lua includes
Russ Combs [Thu, 20 Nov 2014 20:35:54 +0000 (15:35 -0500)] 
tightened up lua includes

11 years agotightened up lua includes and libs
Russ Combs [Thu, 20 Nov 2014 20:35:11 +0000 (15:35 -0500)] 
tightened up lua includes and libs

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/rucombs/Snort++
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++

11 years agochanging DropPacket back to DropSession()
Josh [Thu, 20 Nov 2014 20:05:34 +0000 (14:05 -0600)] 
changing DropPacket back to DropSession()

11 years agomore verdict count fixes
Josh [Thu, 20 Nov 2014 19:46:05 +0000 (13:46 -0600)] 
more verdict count fixes

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
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

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/mialtize/Snort++
rcombs [Thu, 20 Nov 2014 19:01:14 +0000 (14:01 -0500)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/mialtize/Snort++

11 years agoExport dynamic symbols from Snort binary for lua.
Michael Altizer [Thu, 20 Nov 2014 18:38:07 +0000 (13:38 -0500)] 
Export dynamic symbols from Snort binary for lua.

11 years agoOnly try to link against libluajit-5.1.
Michael Altizer [Thu, 20 Nov 2014 18:37:48 +0000 (13:37 -0500)] 
Only try to link against libluajit-5.1.

11 years agoRevert "back out luajit foo causing segfault"
Michael Altizer [Thu, 20 Nov 2014 18:36:24 +0000 (13:36 -0500)] 
Revert "back out luajit foo causing segfault"

This reverts commit d195fea2479c90ff95aa6e4a0bc51b02b02bda40.

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
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

11 years agochecksum will not return false on rebuilt packets
Josh [Thu, 20 Nov 2014 18:39:10 +0000 (12:39 -0600)] 
checksum will not return false on rebuilt packets

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++
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++

11 years agofixing implicit conversions ina few locations
Josh [Thu, 20 Nov 2014 18:13:37 +0000 (12:13 -0600)] 
fixing implicit conversions ina  few locations

11 years agoadded PacketManager::decode(... cooked ...)
rcombs [Thu, 20 Nov 2014 18:12:54 +0000 (13:12 -0500)] 
added PacketManager::decode(... cooked ...)

11 years agoinitial tunnel byppass commit
Josh [Thu, 20 Nov 2014 17:35:23 +0000 (11:35 -0600)] 
initial tunnel byppass commit

11 years agonew snort2lua rules
rcombs [Thu, 20 Nov 2014 16:30:17 +0000 (11:30 -0500)] 
new snort2lua rules

11 years ago1/2 default cache sizes
rcombs [Thu, 20 Nov 2014 16:26:31 +0000 (11:26 -0500)] 
1/2 default cache sizes

11 years agolazy flow init
rcombs [Thu, 20 Nov 2014 15:41:38 +0000 (10:41 -0500)] 
lazy flow init

11 years agofixed multi-outputs
rcombs [Thu, 20 Nov 2014 14:39:46 +0000 (09:39 -0500)] 
fixed multi-outputs

11 years agoback out luajit foo causing segfault
Russ Combs [Thu, 20 Nov 2014 11:31:02 +0000 (06:31 -0500)] 
back out luajit foo causing segfault

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Thu, 20 Nov 2014 04:47:30 +0000 (23:47 -0500)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agoSnort2Lua fix: content parser can now handle a comman inside of whitespace
Josh [Thu, 20 Nov 2014 04:36:56 +0000 (22:36 -0600)] 
Snort2Lua fix:  content parser can now handle a comman inside of whitespace

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Thu, 20 Nov 2014 02:00:17 +0000 (21:00 -0500)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agofixed glaring missing array dereference; make daq init failures non-fatal
rcombs [Thu, 20 Nov 2014 01:58:35 +0000 (20:58 -0500)] 
fixed glaring missing array dereference; make daq init failures non-fatal

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
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

11 years agofixing CMake DNET problem and 'checksum_drop' bug
Josh [Thu, 20 Nov 2014 01:19:00 +0000 (19:19 -0600)] 
fixing CMake DNET problem and 'checksum_drop' bug

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
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

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/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

11 years agofixing DEBUG_WRAP segfault
Josh [Thu, 20 Nov 2014 00:30:55 +0000 (18:30 -0600)] 
fixing DEBUG_WRAP segfault

11 years agodeleted broken rule
rcombs [Thu, 20 Nov 2014 00:17:32 +0000 (19:17 -0500)] 
deleted broken rule

11 years agopulling in Russ's changes
Josh [Thu, 20 Nov 2014 00:12:07 +0000 (18:12 -0600)] 
pulling in Russ's changes

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agoanother cpack commit
Josh [Thu, 20 Nov 2014 00:10:31 +0000 (18:10 -0600)] 
another cpack commit

11 years agoanother CPack commit
Josh [Thu, 20 Nov 2014 00:07:09 +0000 (18:07 -0600)] 
another CPack commit

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
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

11 years agoadditinoal CPack updates
Josh [Wed, 19 Nov 2014 23:43:59 +0000 (17:43 -0600)] 
additinoal CPack updates

11 years agoadding CPack build variables
Josh [Wed, 19 Nov 2014 23:30:35 +0000 (17:30 -0600)] 
adding CPack build variables

11 years agoadding CPack build variables
Josh [Wed, 19 Nov 2014 23:30:35 +0000 (17:30 -0600)] 
adding CPack build variables

11 years agoRe-fix FindDNET.cmake
Michael Altizer [Wed, 19 Nov 2014 22:28:02 +0000 (22:28 +0000)] 
Re-fix FindDNET.cmake

11 years agoremoved dev change log
Russ Combs [Wed, 19 Nov 2014 23:16:15 +0000 (18:16 -0500)] 
removed dev change log

11 years agoupdated default conf
Russ Combs [Wed, 19 Nov 2014 23:12:43 +0000 (18:12 -0500)] 
updated default conf

11 years agoadding FindDNET.cmake back, less michaels changes
Russ Combs [Wed, 19 Nov 2014 22:57:35 +0000 (17:57 -0500)] 
adding FindDNET.cmake back, less michaels changes

11 years agofuck this file
Russ Combs [Wed, 19 Nov 2014 22:51:12 +0000 (17:51 -0500)] 
fuck this file

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
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

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++
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++

11 years agoFix autoconf handling for luajit and pthreads.
Michael Altizer [Wed, 19 Nov 2014 21:55:57 +0000 (16:55 -0500)] 
Fix autoconf handling for luajit and pthreads.

11 years agoFix build on Ubuntu 14.10.
Michael Altizer [Tue, 18 Nov 2014 19:20:42 +0000 (14:20 -0500)] 
Fix build on Ubuntu 14.10.

11 years agonhttp doc for Russ
Tom Peters [Wed, 19 Nov 2014 21:59:19 +0000 (16:59 -0500)] 
nhttp doc for Russ

11 years agogak
Russ Combs [Wed, 19 Nov 2014 21:57:14 +0000 (16:57 -0500)] 
gak

11 years agofixing default checksum_drop value. Also fixes XCode's Snort2Lua warnings regarding...
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

11 years agomerge
Russ Combs [Wed, 19 Nov 2014 21:39:30 +0000 (16:39 -0500)] 
merge

11 years agofixed conf slots
Russ Combs [Wed, 19 Nov 2014 21:36:46 +0000 (16:36 -0500)] 
fixed conf slots

11 years agoadding maltheizers patch. Setting minimum cmake version to 2.8.12.1
Josh [Wed, 19 Nov 2014 21:36:36 +0000 (15:36 -0600)] 
adding maltheizers patch.  Setting minimum cmake version to 2.8.12.1

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Wed, 19 Nov 2014 18:38:06 +0000 (13:38 -0500)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agoadded a couple of FIXIT comments
Tom Peters [Wed, 19 Nov 2014 18:37:31 +0000 (13:37 -0500)] 
added a couple of FIXIT comments

11 years agotweaked build doc foo
rcombs [Wed, 19 Nov 2014 17:57:06 +0000 (12:57 -0500)] 
tweaked build doc foo

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Wed, 19 Nov 2014 17:12:11 +0000 (12:12 -0500)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/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

11 years agoadding empty profile = { module/rules } table when 'config profile_* seen without...
Josh [Wed, 19 Nov 2014 17:04:06 +0000 (11:04 -0600)] 
adding empty profile = { module/rules } table when 'config profile_* seen without options

11 years agofix copyrights
Russ Combs [Wed, 19 Nov 2014 14:36:26 +0000 (09:36 -0500)] 
fix copyrights

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
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

11 years agofixed pm backtracking
rcombs [Wed, 19 Nov 2014 12:52:02 +0000 (07:52 -0500)] 
fixed pm backtracking

11 years agofinishing touches to configurable number of layers
Josh [Tue, 18 Nov 2014 23:54:31 +0000 (17:54 -0600)] 
finishing touches to configurable number of layers

11 years agofinalizing maximum IP and IP6 extension support
Josh [Tue, 18 Nov 2014 23:43:34 +0000 (17:43 -0600)] 
finalizing maximum IP and IP6 extension support

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
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

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/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