Merge pull request #186 in SNORT/snort3 from crc/182 to master

Squashed commit of the following:

commit 4fef179595970ea0d7d7969c8880610b476d72a0
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Dec 10 13:14:02 2015 -0500

    add missing lowmem translation

commit a028b180c1c1a9d4a5b5a2ad3b5a18d49c45ae8a
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Dec 10 11:02:42 2015 -0500

    build 182 - a3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b8a052b9d7ec1ba81864eaf06fd9280ebac99a0..a3452ce95cff91c96da0c09693de17123ea21166 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (SNORT_VERSION_MAJOR 3)
 set (SNORT_VERSION_MINOR 0)
-set (SNORT_VERSION_BUILD 0-a2)
+set (SNORT_VERSION_BUILD 0-a3)
 set (VERSION "${SNORT_VERSION_MAJOR}.${SNORT_VERSION_MINOR}.${SNORT_VERSION_BUILD}")
 
 # ensure cmake will look in the cmake directory for configuration files

diff --git a/ChangeLog b/ChangeLog
index c92c7e81f993a38f035ebe0df3603774c46390c7..263f9f7f200ad970b7ae18884d9162a52f3ccbca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+15/12/11 - build 182 - Alpha 3
+
+-- added memory profiling feature
+-- added regex fast pattern support
+-- ported reputation preprocessor from 2X
+-- synced to 297-262
+-- removed '_q' search method flavors - all are now queued
+-- removed PPM_TEST
+-- build and memory leak fixes
+
 15/12/04 - build 181
 
 -- perf profiling enhancements

diff --git a/configure.ac b/configure.ac
index ea7a81c276a2a416813440768932756723db4da3..a857545a33cda7c0439b1f3a048249a77021650c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # initialization
 #--------------------------------------------------------------------------
 
-AC_INIT([snort], [3.0.0-a2], [snort-team@sourcefire.com])
+AC_INIT([snort], [3.0.0-a3], [snort-team@sourcefire.com])
 AC_PREREQ([2.69])
 
 AC_CONFIG_SRCDIR([src/main.h])

diff --git a/doc/bugs.txt b/doc/bugs.txt
index 7ac00d070ed17f9fba02404c6b1a97434da07eed..ca09d5a9de60b4e64bf49e6eacb0af1de392e01b 100644 (file)
--- a/doc/bugs.txt
+++ b/doc/bugs.txt
@@ -1,15 +1,5 @@
 ==== Build
 
-* configure will use clang++ by default if it is installed. 
-  To compile with g++ instead:
-
-      export CXX=g++
-
-* clang coughs up these warnings:
-
-    Wunused-but-set-variable is not understood by clang
-    clang: warning: argument unused during compilation: '-pthread'
-
 * With cmake, make install will rebuild the docs even though when already
   built.
 
@@ -19,18 +9,6 @@
 * Enabling debug messages may erroneously affect the number of packets
   processed from pcaps
 
-* It is not possible to build unit tests w/o static plugins.
-
-* If you build with hyperscan on OS X and see:
-
-    dyld: Library not loaded: @rpath/libhs.4.0.dylib
-
-  when you try to run src/snort, export DYLD_LIBRARY_PATH with the path to
-  libhs.  You can also do:
-
-    install_name_tool -change @rpath/libhs.4.0.dylib \
-        /path-to/libhs.4.0.dylib src/snort
-
 * g++ 4.9.2 with -O3 reports:
 
     src/service_inspectors/back_orifice/back_orifice.cc:231:25: warning:
@@ -92,15 +70,16 @@
 * Won't convert packet rules (alert tcp etc.) to service rules (alert http
   etc.).
 
-* alert_fast and alert_full: output configuration includes "file = 'foo.bar'", but file is a bool
-  and you cannot specify an output file name in the configuration.
+* alert_fast and alert_full: output configuration includes "file =
+  'foo.bar'", but file is a bool and you cannot specify an output file name
+  in the configuration.
 
 * preprocessor ports option: ports <number> not supported.
 
 ==== Runtime
 
-* -B <mask> feature does not work. It does ordinary IP address obfuscation instead of using the
-  mask.
+* -B <mask> feature does not work. It does ordinary IP address obfuscation
+  instead of using the mask.
 
 * Obfuscation does not work for csv format.
 
@@ -109,5 +88,6 @@
 * The hext DAQ does not support embedded quotes in text lines (use hex
   lines as a workaround).
 
-* Stream TCP alert squash mechanism incorrectly squashes alerts for different TCP packets.
+* Stream TCP alert squash mechanism incorrectly squashes alerts for
+  different TCP packets.
 

diff --git a/doc/start.txt b/doc/start.txt
index b01cc9a6b72eb3b7981db2a7687e292329d685b6..98e01f6c91357910374ecb909123c1de86f7dc09 100644 (file)
--- a/doc/start.txt
+++ b/doc/start.txt
@@ -282,13 +282,28 @@ include::errors.txt[]
   string concatenation to ensure Snort doesn't try to use a variable before
   it is defined (even when it is defined ahead of use in the file):
 
-  -- this may fail:
-  MY_SERVERS = [[ 172.20.0.0/16 172.21.0.0/16 ]]
-  EXTERNAL_NET = '!$MY_SERVERS'
+    -- this may fail:
+    MY_SERVERS = [[ 172.20.0.0/16 172.21.0.0/16 ]]
+    EXTERNAL_NET = '!$MY_SERVERS'
 
-  -- this will work:
-  MY_SERVERS = [[ 172.20.0.0/16 172.21.0.0/16 ]]
-  EXTERNAL_NET = '!' .. MY_SERVERS
+    -- this will work:
+    MY_SERVERS = [[ 172.20.0.0/16 172.21.0.0/16 ]]
+    EXTERNAL_NET = '!' .. MY_SERVERS
+
+* configure will use clang++ by default if it is installed.  To compile
+  with g++ instead:
+
+    export CXX=g++
+
+* If you build with hyperscan on OS X and see:
+
+    dyld: Library not loaded: @rpath/libhs.4.0.dylib
+
+  when you try to run src/snort, export DYLD_LIBRARY_PATH with the path to
+  libhs.  You can also do:
+
+    install_name_tool -change @rpath/libhs.4.0.dylib \
+        /path-to/libhs.4.0.dylib src/snort
 
 
 === Bugs

diff --git a/src/flow/flow.h b/src/flow/flow.h
index 06aff8905d996fd6bf14984806eca8f268c5273a..bbf6ef98515289d06c463bd360da1138cbd2e6f3 100644 (file)
--- a/src/flow/flow.h
+++ b/src/flow/flow.h
@@ -328,10 +328,6 @@ public:  // FIXIT-M privatize if possible
 
 public:
     LwState ssn_state;
-
-private:
-    bool is_two_way_traffic;
-
 };
 
 #endif

diff --git a/src/main/build.h b/src/main/build.h
index f06b918d473cfb7e6e365d723d2976ff9b52665a..2b28f2f128205efe7661e32b64b069807cae064d 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "181"
+#define BUILD "182"
 
 #endif
 

diff --git a/src/service_inspectors/dnp3/dnp3_reassembly.cc b/src/service_inspectors/dnp3/dnp3_reassembly.cc
index 680d5aa14be1a88dba2575d01b8ec5b3ce76ea8f..d718b8cd69b08b35a8a39bad98515b72ded70483 100644 (file)
--- a/src/service_inspectors/dnp3/dnp3_reassembly.cc
+++ b/src/service_inspectors/dnp3/dnp3_reassembly.cc
@@ -321,8 +321,6 @@ static bool dnp3_check_remove_crc(dnp3ProtoConf& config, uint8_t* pdu_start,
 
         memcpy((buf + curlen), cursor, (bytes_left - DNP3_CRC_SIZE));
         curlen += (bytes_left - DNP3_CRC_SIZE);
-        cursor += bytes_left;
-        bytes_left = 0;
     }
 
     *buflen = curlen;

diff --git a/tools/snort2lua/config_states/config_detection.cc b/tools/snort2lua/config_states/config_detection.cc
index 3fd7d8c0768961c744ae23499b552c4f2c5f675b..70f99a9927a1b86b9744e5dd8987a74dd2641b4a 100644 (file)
--- a/tools/snort2lua/config_states/config_detection.cc
+++ b/tools/snort2lua/config_states/config_detection.cc
@@ -213,6 +213,10 @@ bool Detection::convert(std::istringstream& data_stream)
                 table_api.add_diff_option_comment("ac-sparsebands", "ac_sparse_bands");
                 tmpval = table_api.add_option("search_method", "ac_sparse_bands");
             }
+            else if (!method.compare("lowmem"))
+            {
+                tmpval = table_api.add_option("search_method", "lowmem");
+            }
             else if (!method.compare("lowmem-q"))
             {
                 table_api.add_diff_option_comment("lowmem-q", "lowmem");