]> git.ipfire.org Git - thirdparty/snort3.git/log
thirdparty/snort3.git
11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Thu, 30 Oct 2014 18:28:50 +0000 (13:28 -0500)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Thu, 30 Oct 2014 18:22:21 +0000 (14:22 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agotcp options logging for reg test disabled
rcombs [Thu, 30 Oct 2014 17:39:40 +0000 (13:39 -0400)] 
tcp options logging for reg test disabled

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
rcombs [Thu, 30 Oct 2014 13:45:59 +0000 (09:45 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years ago126
Russ Combs [Thu, 30 Oct 2014 13:44:46 +0000 (09:44 -0400)] 
126

11 years agomerge from russ desktop
Russ Combs [Thu, 30 Oct 2014 13:37:49 +0000 (09:37 -0400)] 
merge from russ desktop

11 years agosee changelog
Russ Combs [Thu, 30 Oct 2014 13:36:49 +0000 (09:36 -0400)] 
see changelog

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
rcombs [Thu, 30 Oct 2014 04:25:38 +0000 (00:25 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agofixed bogus 120:3 alerts
rcombs [Thu, 30 Oct 2014 04:23:23 +0000 (00:23 -0400)] 
fixed bogus 120:3 alerts

11 years agotweak 3
Josh [Wed, 29 Oct 2014 22:44:20 +0000 (15:44 -0700)] 
tweak 3

11 years agoanother tweak
Josh [Wed, 29 Oct 2014 22:41:51 +0000 (15:41 -0700)] 
another tweak

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Wed, 29 Oct 2014 22:41:43 +0000 (17:41 -0500)] 
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

11 years agotweak
Josh [Wed, 29 Oct 2014 22:39:33 +0000 (15:39 -0700)] 
tweak

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Wed, 29 Oct 2014 22:39:14 +0000 (17:39 -0500)] 
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

11 years agoSnort2Lua: create tcp/ipv4 tables if no arguments provided
Josh [Wed, 29 Oct 2014 22:38:22 +0000 (15:38 -0700)] 
Snort2Lua: create tcp/ipv4 tables if no arguments provided

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Wed, 29 Oct 2014 22:36:51 +0000 (17:36 -0500)] 
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Wed, 29 Oct 2014 22:35:53 +0000 (17:35 -0500)] 
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

11 years agofixing minor typo in Snort2Lua
Josh [Wed, 29 Oct 2014 22:01:21 +0000 (15:01 -0700)] 
fixing minor typo in Snort2Lua

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Wed, 29 Oct 2014 21:58:44 +0000 (16:58 -0500)] 
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

11 years agoupdating snort2lua frag3 errors
Josh [Wed, 29 Oct 2014 21:38:30 +0000 (14:38 -0700)] 
updating snort2lua frag3 errors

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Wed, 29 Oct 2014 21:36:00 +0000 (16:36 -0500)] 
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/jrosenba/codecs...
Josh [Wed, 29 Oct 2014 20:47:00 +0000 (15:47 -0500)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Wed, 29 Oct 2014 20:39:24 +0000 (16:39 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Wed, 29 Oct 2014 20:36:30 +0000 (15:36 -0500)] 
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 [Wed, 29 Oct 2014 19:45:31 +0000 (12:45 -0700)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

Conflicts:
src/log/log_text.cc

11 years agoupdating TCP option output format. Now reflects Snort's format
Josh [Wed, 29 Oct 2014 19:29:05 +0000 (12:29 -0700)] 
updating TCP option output format.  Now reflects Snort's format

11 years agomerge from josh
rcombs [Wed, 29 Oct 2014 19:23:43 +0000 (15:23 -0400)] 
merge from josh

11 years agofixed tcp options log format
rcombs [Wed, 29 Oct 2014 19:20:55 +0000 (15:20 -0400)] 
fixed tcp options log format

11 years agovarious logging patches
Josh [Wed, 29 Oct 2014 19:19:06 +0000 (12:19 -0700)] 
various logging patches

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Wed, 29 Oct 2014 18:06:22 +0000 (14:06 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agoalert_fast fix
rcombs [Wed, 29 Oct 2014 17:44:22 +0000 (13:44 -0400)] 
alert_fast fix

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Wed, 29 Oct 2014 14:59:06 +0000 (10:59 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agotweaked S5_TRACE output
rcombs [Wed, 29 Oct 2014 12:41:48 +0000 (08:41 -0400)] 
tweaked S5_TRACE output

11 years agostream policy fixes
rcombs [Wed, 29 Oct 2014 12:29:55 +0000 (08:29 -0400)] 
stream policy fixes

11 years agoset default id and priority based on rule class
rcombs [Wed, 29 Oct 2014 11:42:25 +0000 (07:42 -0400)] 
set default id and priority based on rule class

11 years agoalert_fast new lines and stream is-paf? tweaks
rcombs [Wed, 29 Oct 2014 11:16:57 +0000 (07:16 -0400)] 
alert_fast new lines and stream is-paf? tweaks

11 years agoreg test -N and -A console
rcombs [Wed, 29 Oct 2014 09:17:15 +0000 (05:17 -0400)] 
reg test -N and -A console

11 years agochange log
Russ Combs [Wed, 29 Oct 2014 02:01:40 +0000 (22:01 -0400)] 
change log

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Tue, 28 Oct 2014 21:49:28 +0000 (14:49 -0700)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

Conflicts:
src/flow/flow_control.cc

11 years agofixing decode error 116:9 bug
Josh [Tue, 28 Oct 2014 21:47:56 +0000 (14:47 -0700)] 
fixing decode error 116:9 bug

11 years agoadded rev:1; priority:3; to generated builtin rules
Russ Combs [Tue, 28 Oct 2014 21:41:26 +0000 (17:41 -0400)] 
added rev:1; priority:3; to generated builtin rules

11 years ago219 change, consolidated name definition, includes with path
Tom Peters [Tue, 28 Oct 2014 18:34:16 +0000 (14:34 -0400)] 
219 change, consolidated name definition, includes with path

11 years agopatched around pkt type vs ipproto issue
rcombs [Tue, 28 Oct 2014 18:08:49 +0000 (14:08 -0400)] 
patched around pkt type vs ipproto issue

11 years agomoved normal_mask out of flow
Russ Combs [Tue, 28 Oct 2014 17:55:37 +0000 (13:55 -0400)] 
moved normal_mask out of flow

11 years agorefactored inspector groups
Russ Combs [Tue, 28 Oct 2014 12:03:49 +0000 (08:03 -0400)] 
refactored inspector groups

11 years agohi defaults from B
rcombs [Mon, 27 Oct 2014 20:56:58 +0000 (16:56 -0400)] 
hi defaults from B

11 years agochangelog
Russ Combs [Mon, 27 Oct 2014 20:33:29 +0000 (16:33 -0400)] 
changelog

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Russ Combs [Mon, 27 Oct 2014 20:23:24 +0000 (16:23 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agoSnort2Lua: catch extra errors
Josh [Mon, 27 Oct 2014 19:10:26 +0000 (12:10 -0700)] 
Snort2Lua:  catch extra errors

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Mon, 27 Oct 2014 19:07:55 +0000 (14:07 -0500)] 
Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

11 years agoMerge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...
Josh [Mon, 27 Oct 2014 18:59:50 +0000 (13:59 -0500)] 
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 [Mon, 27 Oct 2014 18:59:09 +0000 (13:59 -0500)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

11 years agoFixing Plugins
Josh [Mon, 27 Oct 2014 18:20:25 +0000 (11:20 -0700)] 
Fixing Plugins

11 years agoSnort2lua: fixing bindings
Josh [Mon, 27 Oct 2014 17:52:57 +0000 (10:52 -0700)] 
Snort2lua: fixing bindings

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Mon, 27 Oct 2014 17:11:27 +0000 (10:11 -0700)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Russ Combs [Mon, 27 Oct 2014 17:10:29 +0000 (13:10 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agoSnort2Lua. pushing missed cases
Josh [Mon, 27 Oct 2014 17:09:18 +0000 (10:09 -0700)] 
Snort2Lua.  pushing missed cases

11 years agoadded missing checksum_drop/eval options
Russ Combs [Mon, 27 Oct 2014 17:02:14 +0000 (13:02 -0400)] 
added missing checksum_drop/eval options

11 years agoremoved temp http_server
Russ Combs [Mon, 27 Oct 2014 16:57:58 +0000 (12:57 -0400)] 
removed temp http_server

11 years agochanging names in Snort2Lua
Josh [Mon, 27 Oct 2014 16:31:23 +0000 (09:31 -0700)] 
changing names in Snort2Lua

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Mon, 27 Oct 2014 16:17:39 +0000 (09:17 -0700)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

11 years agoSnort2Lua: printing bindings for ftp and http_inspect
Josh [Mon, 27 Oct 2014 15:46:40 +0000 (10:46 -0500)] 
Snort2Lua: printing bindings for ftp and http_inspect

11 years agoFIXIT-H-J segfaults
rcombs [Mon, 27 Oct 2014 15:16:25 +0000 (11:16 -0400)] 
FIXIT-H-J segfaults

11 years agoREG_TEST changes to make -A cmg look like Snort
rcombs [Mon, 27 Oct 2014 12:57:56 +0000 (08:57 -0400)] 
REG_TEST changes to make -A cmg look like Snort

11 years agochanged inspector names for consistency and readability
Russ Combs [Sun, 26 Oct 2014 16:34:19 +0000 (12:34 -0400)] 
changed inspector names for consistency and readability

11 years agodelete cruft
Russ Combs [Sun, 26 Oct 2014 16:11:56 +0000 (12:11 -0400)] 
delete cruft

11 years agobinder updates
Russ Combs [Sun, 26 Oct 2014 16:04:46 +0000 (12:04 -0400)] 
binder updates

11 years agominor tweak
Josh [Fri, 24 Oct 2014 20:04:03 +0000 (15:04 -0500)] 
minor tweak

11 years agoupdating config: paf_max
Josh [Fri, 24 Oct 2014 19:58:04 +0000 (14:58 -0500)] 
updating config: paf_max

11 years agoRemoving default bindings from Snort2Lua
Josh [Fri, 24 Oct 2014 19:54:34 +0000 (14:54 -0500)] 
Removing default bindings from Snort2Lua

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Fri, 24 Oct 2014 19:44:36 +0000 (14:44 -0500)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

11 years agoupdating documentation errors
Josh [Fri, 24 Oct 2014 19:44:31 +0000 (14:44 -0500)] 
updating documentation errors

11 years agoremove force on session clear
Russ Combs [Fri, 24 Oct 2014 19:00:08 +0000 (15:00 -0400)] 
remove force on session clear

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++
Russ Combs [Fri, 24 Oct 2014 18:45:54 +0000 (14:45 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++

11 years agoreinitialize section_type
Tom Peters [Fri, 24 Oct 2014 18:31:47 +0000 (14:31 -0400)] 
reinitialize section_type

11 years agoanother take on flow normalizations
Russ Combs [Fri, 24 Oct 2014 18:06:10 +0000 (14:06 -0400)] 
another take on flow normalizations

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++
Russ Combs [Fri, 24 Oct 2014 15:31:05 +0000 (11:31 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++

11 years agofixed normalizer flow init
Russ Combs [Fri, 24 Oct 2014 15:16:05 +0000 (11:16 -0400)] 
fixed normalizer flow init

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Fri, 24 Oct 2014 14:35:19 +0000 (10:35 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agostream integration fixes
Tom Peters [Fri, 24 Oct 2014 14:33:19 +0000 (10:33 -0400)] 
stream integration fixes

11 years agofixup --dump-defaults
Russ Combs [Fri, 24 Oct 2014 13:53:43 +0000 (09:53 -0400)] 
fixup --dump-defaults

11 years agomore stream_tcp fixes
Russ Combs [Fri, 24 Oct 2014 03:05:41 +0000 (23:05 -0400)] 
more stream_tcp fixes

11 years agoadditional more ntohs and htons to protocol header files
Josh [Thu, 23 Oct 2014 23:56:45 +0000 (18:56 -0500)] 
additional more ntohs and htons to protocol header files

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Thu, 23 Oct 2014 18:45:51 +0000 (14:45 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agotiny fix
Tom Peters [Thu, 23 Oct 2014 18:45:36 +0000 (14:45 -0400)] 
tiny fix

11 years agofixed partial flushes
Russ Combs [Thu, 23 Oct 2014 18:41:22 +0000 (14:41 -0400)] 
fixed partial flushes

11 years agoMerge branch 'master' of /nfs/home/rucombs/Snort++
Tom Peters [Thu, 23 Oct 2014 17:16:04 +0000 (13:16 -0400)] 
Merge branch 'master' of /nfs/home/rucombs/Snort++

11 years agodebug interaction with stream
Tom Peters [Thu, 23 Oct 2014 17:15:18 +0000 (13:15 -0400)] 
debug interaction with stream

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Russ Combs [Thu, 23 Oct 2014 17:00:25 +0000 (13:00 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agostream flushing tweaks
Russ Combs [Thu, 23 Oct 2014 16:58:48 +0000 (12:58 -0400)] 
stream flushing tweaks

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Thu, 23 Oct 2014 15:50:02 +0000 (10:50 -0500)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

11 years agoplacing ntohs command into ipv4/ipv6/tcp structs
Josh [Thu, 23 Oct 2014 15:43:15 +0000 (10:43 -0500)] 
placing ntohs command into ipv4/ipv6/tcp structs

11 years agofixed rebuilt buffers count
Russ Combs [Thu, 23 Oct 2014 12:48:52 +0000 (08:48 -0400)] 
fixed rebuilt buffers count

11 years agono rebuilt packets for internal reassembles
Russ Combs [Thu, 23 Oct 2014 11:18:57 +0000 (07:18 -0400)] 
no rebuilt packets for internal reassembles

11 years agodoc tweaks; flow fix
Russ Combs [Wed, 22 Oct 2014 21:01:59 +0000 (17:01 -0400)] 
doc tweaks; flow fix

11 years agoMerge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...
Josh [Wed, 22 Oct 2014 20:13:02 +0000 (15:13 -0500)] 
Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into codecs

11 years agopulled in latest from tom and josh
Russ Combs [Wed, 22 Oct 2014 19:35:18 +0000 (15:35 -0400)] 
pulled in latest from tom and josh

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++
Russ Combs [Wed, 22 Oct 2014 19:26:56 +0000 (15:26 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/thopeter/Pub/Snort++

11 years agoMerge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
Russ Combs [Wed, 22 Oct 2014 19:26:38 +0000 (15:26 -0400)] 
Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs

11 years agorefactored flow state
Russ Combs [Wed, 22 Oct 2014 19:25:02 +0000 (15:25 -0400)] 
refactored flow state