initial sync with 297

diff --git a/src/actions/act_react.cc b/src/actions/act_react.cc
index 785c45a629db2714376b873a1cf5184fc104eb0c..ba07ae698b69131d84c7be73f56f817db2a482ca 100644 (file)
--- a/src/actions/act_react.cc
+++ b/src/actions/act_react.cc
@@ -160,7 +160,9 @@ void ReactAction::send (Packet* p)
 
     Active_IgnoreSession(p);
 
-    Active_SendData(p, df, (uint8_t*)config->resp_buf, config->buf_len);
+    if ( p->packet_flags & PKT_STREAM_EST )
+        Active_SendData(p, df, (uint8_t*)config->resp_buf, config->buf_len);
+
     Active_SendReset(p, rf);
     Active_SendReset(p, ENC_FLAG_FWD);
 }

diff --git a/src/detection/fpcreate.cc b/src/detection/fpcreate.cc
index 4f7a40649e333c6306ed263d93843020cfacc00b..bc311e8f38035563a84e46370c587ada6bd6146f 100644 (file)
--- a/src/detection/fpcreate.cc
+++ b/src/detection/fpcreate.cc
@@ -308,7 +308,7 @@ static int ServiceMapAddOtn(srmm_table_t *srmm, int proto, char *servicename, Op
     }
     else if( proto ==  ETHERNET_TYPE_IP )
     {
-        to_srv = srmm->tcp_to_srv;
+        to_srv = srmm->ip_to_srv;
         to_cli = srmm->ip_to_cli;
     }
     else

diff --git a/src/file_api/file_api.h b/src/file_api/file_api.h
index c7621868eb450d0475b80f196050d5a967d5cf7d..ca1f38baf89b4c788f222a2a1bfc9d53e7a88fba 100644 (file)
--- a/src/file_api/file_api.h
+++ b/src/file_api/file_api.h
@@ -203,7 +203,7 @@ typedef struct _file_api
     Render_block_verdict_func render_block_verdict;
 } FileAPI;
 
-/* To be set by Stream5 */
+/* To be set by Stream */
 SO_PUBLIC extern FileAPI *file_api;
 extern File_type_done_func file_type_done;
 extern File_signature_done_func file_signature_done;

diff --git a/src/flow/expect_cache.cc b/src/flow/expect_cache.cc
index c6261009bbf80826a06439f281cfb11e22cce0b1..338c97d74f85c07f0bca71b7c142e99f0f8b8381 100644 (file)
--- a/src/flow/expect_cache.cc
+++ b/src/flow/expect_cache.cc
@@ -433,8 +433,8 @@ bool ExpectCache::is_expected(Packet* p)
     {
         case SSN_DIR_BOTH:
             break;
-        case SSN_DIR_CLIENT:
-        case SSN_DIR_SERVER:
+        case SSN_DIR_FROM_CLIENT:
+        case SSN_DIR_FROM_SERVER:
             if (node->reversed_key != reversed_key)
                 return false;
             break;

diff --git a/src/flow/flow.cc b/src/flow/flow.cc
index 40bdfd086d942ebfc583cedae5965afe52bf3cec..fe0cd292d09b1ca8461a5fb92f790f4b09078f7a 100644 (file)
--- a/src/flow/flow.cc
+++ b/src/flow/flow.cc
@@ -136,7 +136,7 @@ void Flow::restart(bool freeAppData)
     s5_state.ignore_direction = 0;
     s5_state.session_flags = SSNFLAG_NONE;
 
-    session_state = STREAM5_STATE_NONE;
+    session_state = STREAM_STATE_NONE;
     expire_time = 0;
 }
 

diff --git a/src/flow/flow.h b/src/flow/flow.h
index 6c55ab96f769139be3e72e03bf85cb9658c7f053..726beb053242970bc574735d7c0727d1822d9922 100644 (file)
--- a/src/flow/flow.h
+++ b/src/flow/flow.h
@@ -69,19 +69,19 @@
 
 #define SSNFLAG_BLOCK (SSNFLAG_DROP_CLIENT|SSNFLAG_DROP_SERVER)
 
-#define STREAM5_STATE_NONE              0x0000
-#define STREAM5_STATE_SYN               0x0001
-#define STREAM5_STATE_SYN_ACK           0x0002
-#define STREAM5_STATE_ACK               0x0004
-#define STREAM5_STATE_ESTABLISHED       0x0008
-#define STREAM5_STATE_DROP_CLIENT       0x0010
-#define STREAM5_STATE_DROP_SERVER       0x0020
-#define STREAM5_STATE_MIDSTREAM         0x0040
-#define STREAM5_STATE_TIMEDOUT          0x0080
-#define STREAM5_STATE_UNREACH           0x0100
-#define STREAM5_STATE_CLOSED            0x0800
-#define STREAM5_STATE_IGNORE            0x1000
-#define STREAM5_STATE_NO_PICKUP         0x2000
+#define STREAM_STATE_NONE              0x0000
+#define STREAM_STATE_SYN               0x0001
+#define STREAM_STATE_SYN_ACK           0x0002
+#define STREAM_STATE_ACK               0x0004
+#define STREAM_STATE_ESTABLISHED       0x0008
+#define STREAM_STATE_DROP_CLIENT       0x0010
+#define STREAM_STATE_DROP_SERVER       0x0020
+#define STREAM_STATE_MIDSTREAM         0x0040
+#define STREAM_STATE_TIMEDOUT          0x0080
+#define STREAM_STATE_UNREACH           0x0100
+#define STREAM_STATE_CLOSED            0x0800
+#define STREAM_STATE_IGNORE            0x1000
+#define STREAM_STATE_NO_PICKUP         0x2000
 
 struct Packet;
 

diff --git a/src/flow/flow_control.cc b/src/flow/flow_control.cc
index 82179d62d2393f8d172fb07b400a8385b13990ff..4a7219ec00a1c773dc6c361b97a19aae855e81c8 100644 (file)
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@ -614,7 +614,7 @@ char FlowControl::expected_flow (Flow* flow, Packet* p)
     if ( ignore )
     {
         DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-            "Stream5: Ignoring packet from %d. Marking flow marked as ignore.\n",
+            "Stream: Ignoring packet from %d. Marking flow marked as ignore.\n",
             p->packet_flags & PKT_FROM_CLIENT? "sender" : "responder"););
 
         flow->s5_state.ignore_direction = ignore;

diff --git a/src/framework/cursor.h b/src/framework/cursor.h
index ce673d1cf044c1944866bff8ee27bd3c49090571..c2ab6eaada807d45cd507970b9fb0ac00093869b 100644 (file)
--- a/src/framework/cursor.h
+++ b/src/framework/cursor.h
@@ -52,6 +52,11 @@ public:
     unsigned size() const
     { return sz; };
 
+    // the NEXT octect after last in buffer
+    // (this pointer is out of bounds)
+    const uint8_t* endo() const
+    { return data + sz; };
+
     const uint8_t* start() const
     { return data + pos; };
 

diff --git a/src/helpers/process.cc b/src/helpers/process.cc
index 7c6d23bd381980535dc80aeefa03584015c63173..6707e45d1270c546ca4513b8ef7dee95ff4d408a 100644 (file)
--- a/src/helpers/process.cc
+++ b/src/helpers/process.cc
@@ -37,6 +37,7 @@ using namespace std;
 #include "main/snort.h"
 #include "utils/util.h"
 #include "utils/ring.h"
+#include "utils/stats.h"
 #include "helpers/markup.h"
 #include "parser/parser.h"
 
@@ -419,3 +420,29 @@ void daemonize()
     signal_waiting_parent();
 }
 
+//-------------------------------------------------------------------------
+// heap stats
+//-------------------------------------------------------------------------
+
+void log_malloc_info()
+{
+#ifdef HAVE_MALLINFO
+    mi = mallinfo();
+
+    LogLabel("heap usage");
+    LogCount("total non-mmapped bytes (arena)", mi.arena);
+    LogCount("bytes in mapped regions (hblkhd)", mi.hblkhd);
+    LogCount("total allocated space (uordblks)", mi.uordblks);
+    LogCount("total free space (fordblks)", mi.fordblks);
+    LogCount("topmost releasable block (keepcost)", mi.keepcost);
+
+#ifdef DEBUG
+    LogCount("number of free chunks (ordblks)", mi.ordblks);
+    LogCount("number of free fastbin blocks (smblks)", mi.smblks);
+    LogCount("number of mapped regions (hblks)", mi.hblks);
+    LogCount("max total allocated space (usmblks)", mi.usmblks);
+    LogCount("free bytes held in fastbins (fsmblks)", mi.fsmblks);
+#endif
+#endif
+}
+

diff --git a/src/helpers/process.h b/src/helpers/process.h
index 719d5115606d96db9d82faedde8da5a7a3547b82..6e4b6b4d54227e122869ba0f575f5a45def4e431 100644 (file)
--- a/src/helpers/process.h
+++ b/src/helpers/process.h
@@ -49,6 +49,7 @@ void help_signals();
 void daemonize();
 void set_quick_exit(bool);
 void init_main_thread_sig();
+void log_malloc_info();
 
 #endif
 

diff --git a/src/ips_options/ips_base64.cc b/src/ips_options/ips_base64.cc
index 264a25ec023f171c9ba8384cf44610011b0c2c0d..f23656e46d6ca16e9b91d974847ba9cf5b5a8041 100644 (file)
--- a/src/ips_options/ips_base64.cc
+++ b/src/ips_options/ips_base64.cc
@@ -18,9 +18,7 @@
  ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-/* sp_base64_decode
- *
- */
+/* ips_base64.cc */
 
 #include <sys/types.h>
 
@@ -154,7 +152,7 @@ int Base64DecodeOption::eval(Cursor& c, Packet*)
         size = c.size();
     }
 
-    if ( idx->offset > size )
+    if ( idx->offset >= size )
     {
         MODULE_PROFILE_END(base64PerfStats);
         return rval;

diff --git a/src/ips_options/ips_byte_extract.h b/src/ips_options/ips_byte_extract.h
index 2688a607cd7ad177daacaece7d7752248ffdc2ce..bc13c18ef736a73ae9c3ced4f8478fa649d9d682 100644 (file)
--- a/src/ips_options/ips_byte_extract.h
+++ b/src/ips_options/ips_byte_extract.h
@@ -28,7 +28,7 @@
 
 #define NUM_BYTE_EXTRACT_VARS 2
 #define BYTE_EXTRACT_NO_VAR -1
-#define BYTE_EXTRACT_INVALID_ERR_STR "Rule option uses an undefined byte_extract variable name."
+#define BYTE_EXTRACT_INVALID_ERR_STR "%s uses an undefined byte_extract variable (%s)"
 
 SO_PUBLIC int8_t GetVarByName(const char *name);
 

diff --git a/src/ips_options/ips_byte_jump.cc b/src/ips_options/ips_byte_jump.cc
index 2bef9d5202f7df8d2586a4ca81e3f3c1482110c7..2a6bd293f27df83ad77db914f12e73c2eb070c99 100644 (file)
--- a/src/ips_options/ips_byte_jump.cc
+++ b/src/ips_options/ips_byte_jump.cc
@@ -392,7 +392,7 @@ bool ByteJumpModule::end(const char*, int, SnortConfig*)
 
         if (data.offset_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError("%s", BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "byte_jump", var.c_str());
             return false;
         }
     }
@@ -401,7 +401,7 @@ bool ByteJumpModule::end(const char*, int, SnortConfig*)
     
     if ( e1 && e2 )
     {
-        ParseError("byte_extract rule option has multiple arguments "
+        ParseError("byte_jump has multiple arguments "
             "specifying the type of string conversion. Use only "
             "one of 'dec', 'hex', or 'oct'.");
         return false;

diff --git a/src/ips_options/ips_byte_test.cc b/src/ips_options/ips_byte_test.cc
index ed3b229219ef294e6bb44db8f49c8423382e74b4..b81a71a33205c793412294928ae593fe9e0d45e3 100644 (file)
--- a/src/ips_options/ips_byte_test.cc
+++ b/src/ips_options/ips_byte_test.cc
@@ -241,7 +241,7 @@ int ByteTestOption::eval(Cursor& c, Packet*)
     int rval = DETECTION_OPTION_NO_MATCH;
     uint32_t value = 0;
     int success = 0;
-    const uint8_t *base_ptr, *end_ptr, *start_ptr;
+    const uint8_t* start_ptr;
     int payload_bytes_grabbed;
     int offset;
     uint32_t cmp_value;
@@ -269,16 +269,11 @@ int ByteTestOption::eval(Cursor& c, Packet*)
         offset = btd->offset;
 
     if ( btd->relative_flag )
-    {
         start_ptr = c.start();
-        end_ptr = start_ptr + c.length();
-    }
     else
-    {
         start_ptr = c.buffer();
-        end_ptr = start_ptr + c.size();
-    }
-    base_ptr = start_ptr + offset;
+
+    start_ptr += offset;
 
     /* both of these functions below perform their own bounds checking within
      * byte_extract.c
@@ -288,10 +283,7 @@ int ByteTestOption::eval(Cursor& c, Packet*)
     {
         if ( byte_extract(
             btd->endianess, btd->bytes_to_compare,
-            (const uint8_t *)base_ptr,
-            (const uint8_t *)start_ptr,
-            (const uint8_t *)end_ptr,
-            &value))
+            start_ptr, c.buffer(), c.endo(), &value))
         {
             MODULE_PROFILE_END(byteTestPerfStats);
             return rval;
@@ -302,10 +294,7 @@ int ByteTestOption::eval(Cursor& c, Packet*)
     {
         payload_bytes_grabbed = string_extract(
             btd->bytes_to_compare, btd->base,
-            (const uint8_t *)base_ptr,
-            (const uint8_t *)start_ptr,
-            (const uint8_t *)end_ptr,
-            &value);
+            start_ptr, c.buffer(), c.endo(), &value);
 
         if ( payload_bytes_grabbed < 0 )
         {
@@ -520,7 +509,7 @@ bool ByteTestModule::end(const char*, int, SnortConfig*)
 
         if (data.offset_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError("%s", BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "byte_test", off_var.c_str());
             return false;
         }
     }
@@ -532,7 +521,7 @@ bool ByteTestModule::end(const char*, int, SnortConfig*)
 
         if (data.cmp_value_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError("%s", BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "byte_test", cmp_var.c_str());
             return false;
         }
     }
@@ -541,7 +530,7 @@ bool ByteTestModule::end(const char*, int, SnortConfig*)
     
     if ( e1 && e2 )
     {
-        ParseError("byte_extract rule option has multiple arguments "
+        ParseError("byte_test has multiple arguments "
             "specifying the type of string conversion. Use only "
             "one of 'dec', 'hex', or 'oct'.");
         return false;

diff --git a/src/ips_options/ips_content.cc b/src/ips_options/ips_content.cc
index 81d0e7318baaa6c960f32d522186fc0f1a1162b8..51621ac5d28de17814a4247bbf31bfa68b6ec725 100644 (file)
--- a/src/ips_options/ips_content.cc
+++ b/src/ips_options/ips_content.cc
@@ -556,7 +556,7 @@ static void parse_offset(PatternMatchData* pmd, const char *data)
         pmd->offset_var = GetVarByName(data);
         if (pmd->offset_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError(BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "content offset", data);
             return;
         }
     }
@@ -597,7 +597,7 @@ static void parse_depth(PatternMatchData* pmd, const char *data)
         pmd->depth_var = GetVarByName(data);
         if (pmd->depth_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError(BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "content depth", data);
             return;
         }
     }
@@ -630,7 +630,7 @@ static void parse_distance(PatternMatchData* pmd, const char *data)
         pmd->offset_var = GetVarByName(data);
         if (pmd->offset_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError(BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "content distance", data);
             return;
         }
     }
@@ -668,7 +668,7 @@ static void parse_within(PatternMatchData* pmd, const char *data)
         pmd->depth_var = GetVarByName(data);
         if (pmd->depth_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError(BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "content within", data);
             return;
         }
     }

diff --git a/src/ips_options/ips_isdataat.cc b/src/ips_options/ips_isdataat.cc
index d6f23d0c69e09ffc50b6de1f9bfd7ae2e1b50343..acb4c33441ba55c552ce2eaf71f240a7629f09bd 100644 (file)
--- a/src/ips_options/ips_isdataat.cc
+++ b/src/ips_options/ips_isdataat.cc
@@ -142,7 +142,7 @@ int IsDataAtOption::eval(Cursor& c, Packet*)
 {
     IsDataAtData *isdata = &config;
     int rval = DETECTION_OPTION_NO_MATCH;
-    const uint8_t *base_ptr, *end_ptr, *start_ptr;
+    const uint8_t* start_ptr;
     int offset;
 
     PROFILE_VARS;
@@ -161,16 +161,14 @@ int IsDataAtOption::eval(Cursor& c, Packet*)
     if ( isdata->flags & ISDATAAT_RELATIVE_FLAG )
     {
         start_ptr = c.start();
-        end_ptr = start_ptr + c.length();
     }
     else
     {
         start_ptr = c.buffer();
-        end_ptr = start_ptr + c.size();
     }
-    base_ptr = start_ptr + offset;
+    start_ptr += offset;
 
-    if(inBounds(start_ptr, end_ptr, base_ptr))
+    if(inBounds(c.buffer(), c.endo(), start_ptr))
     {
         DEBUG_WRAP(DebugMessage(DEBUG_PATTERN_MATCH,
                     "[*] IsDataAt succeeded!  there is data...\n"););
@@ -232,7 +230,7 @@ static void isdataat_parse(const char *data, IsDataAtData *idx)
         idx->offset_var = GetVarByName(offset);
         if (idx->offset_var == BYTE_EXTRACT_NO_VAR)
         {
-            ParseError("%s", BYTE_EXTRACT_INVALID_ERR_STR);
+            ParseError(BYTE_EXTRACT_INVALID_ERR_STR, "isdataat offset", offset);
             return;
         }
     }

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index a3e9126d544584213ca1a386fe3f88ee88f843f7..ce10599c11df29fe3c40ec2a9180ab59357ca4fe 100644 (file)
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -206,7 +206,7 @@ static void set_session(Flow* flow)
 
 static Inspector* get_gadget(Flow* flow, const HostAttributeEntry* host)
 {
-    stream.set_application_protocol_id_from_host_entry(flow, host, SSN_DIR_SERVER);
+    stream.set_application_protocol_id_from_host_entry(flow, host, SSN_DIR_FROM_SERVER);
 
     if ( !flow->s5_state.application_protocol )
         return nullptr;

diff --git a/src/network_inspectors/perf_monitor/perf.cc b/src/network_inspectors/perf_monitor/perf.cc
index bebbad816c620b6a7a86fc6e32155296e3b5e8ab..9b7ba326deb7e9aefac247fadf3ceb9f4bffe86c 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf.cc
+++ b/src/network_inspectors/perf_monitor/perf.cc
@@ -464,7 +464,7 @@ static inline int sfRotateFlowIPStatsFile(SFPERF *sfPerf)
 
 void sfPerformanceStats(SFPERF *sfPerf, Packet *p)
 {
-    // Update stats first since other stats from various places like frag3 and
+    // Update stats first since other stats from various places like frag and
     // stream have been added.
     UpdatePerfStats(sfPerf, p);
 

diff --git a/src/network_inspectors/perf_monitor/perf_base.cc b/src/network_inspectors/perf_monitor/perf_base.cc
index 2de0dea9fa315b50be1801b1ea3f81cab2b3fbcb..647b609cdf648e9806ce9b1f6ee42e01bd7f3c8e 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_base.cc
+++ b/src/network_inspectors/perf_monitor/perf_base.cc
@@ -192,8 +192,8 @@ int InitBaseStats(SFBASE *sfBase)
     sfBase->total_tcp_filtered_packets = 0;
     sfBase->total_udp_filtered_packets = 0;
 
-    sfBase->frag3_mem_in_use = 0;
-    sfBase->stream5_mem_in_use = 0;
+    sfBase->frag_mem_in_use = 0;
+    sfBase->stream_mem_in_use = 0;
     sfBase->total_iAlerts = 0;
 
     return 0;
@@ -1079,8 +1079,8 @@ static int CalculateBasePerfStats(SFBASE *sfBase, SFBASE_STATS *sfBaseStats, int
     sfBaseStats->current_attribute_hosts = sfBase->iAttributeHosts;
     sfBaseStats->attribute_table_reloads = sfBase->iAttributeReloads;
 
-    sfBaseStats->frag3_mem_in_use = sfBase->frag3_mem_in_use;
-    sfBaseStats->stream5_mem_in_use = sfBase->stream5_mem_in_use;
+    sfBaseStats->frag_mem_in_use = sfBase->frag_mem_in_use;
+    sfBaseStats->stream_mem_in_use = sfBase->stream_mem_in_use;
 
     /*
     **  Set the date string for print out
@@ -1391,9 +1391,9 @@ static void LogBasePerfStats(SFBASE_STATS *sfBaseStats,  FILE * fh )
     size += SafeSnprintf(buff + size, sizeof(buff) - size, 
         CSVu64, sfBaseStats->total_injected_packets);
     size += SafeSnprintf(buff + size, sizeof(buff) - size, 
-        CSVu64, sfBaseStats->frag3_mem_in_use);
+        CSVu64, sfBaseStats->frag_mem_in_use);
     size += SafeSnprintf(buff + size, sizeof(buff) - size, 
-        CSVu64, sfBaseStats->stream5_mem_in_use);
+        CSVu64, sfBaseStats->stream_mem_in_use);
 
     size += SafeSnprintf(buff + size, sizeof(buff) - size, 
         "%.3f", sfBaseStats->total_alerts_per_second);
@@ -1579,8 +1579,8 @@ void LogBasePerfHeader (FILE* fh)
     fprintf(fh,
         ",%s,%s,%s",
         "total_injected_packets",
-        "frag3_mem_in_use",
-        "stream5_mem_in_use");
+        "frag_mem_in_use",
+        "stream_mem_in_use");
 
     fprintf(fh, ",%s",
         "total_alerts_per_second");

diff --git a/src/network_inspectors/perf_monitor/perf_base.h b/src/network_inspectors/perf_monitor/perf_base.h
index 3841e4f644e919a92ac49fa37d7459700c0e070c..220bd1fdfa20b149a8b774177be8d7ed464e2807 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_base.h
+++ b/src/network_inspectors/perf_monitor/perf_base.h
@@ -117,12 +117,12 @@ typedef struct _SFBASE
     uint64_t   iStreamFaults;  /* # of times we run out of memory */
     uint64_t   iStreamTimeouts; /* # of timeouts we get in this quanta */
 
-    uint64_t   iFragCreates;    /* # of times we call Frag3NewTracker() */
+    uint64_t   iFragCreates;    /* # of times we call FragNewTracker() */
     uint64_t   iFragCompletes;  /* # of times we call FragIsComplete() */
     uint64_t   iFragInserts;    /* # of fraginserts */
-    uint64_t   iFragDeletes;    /* # of times we call Frag3RemoveTracker() */
+    uint64_t   iFragDeletes;    /* # of times we call FragRemoveTracker() */
     uint64_t   iFragAutoFrees;  /* # of times we auto free a FragTracker */
-    uint64_t   iFragFlushes;    /* # of times we call Frag3Rebuild() */
+    uint64_t   iFragFlushes;    /* # of times we call FragRebuild() */
     uint64_t   iMaxFrags;
     uint64_t   iCurrentFrags;
     uint64_t   iFragTimeouts;   /* # of times we've reached timeout */
@@ -161,8 +161,8 @@ typedef struct _SFBASE
     /**UDP packets ignored due to port/service filtering.*/
     uint64_t   total_udp_filtered_packets;
 
-    uint64_t   frag3_mem_in_use;
-    uint64_t   stream5_mem_in_use;
+    uint64_t   frag_mem_in_use;
+    uint64_t   stream_mem_in_use;
     uint64_t   total_iAlerts;
 }  SFBASE;
 
@@ -265,8 +265,8 @@ typedef struct _SFBASE_STATS {
     /**UDP packets ignored due to port/service filtering.*/
     uint64_t   total_udp_filtered_packets;
 
-    uint64_t   frag3_mem_in_use;
-    uint64_t   stream5_mem_in_use;
+    uint64_t   frag_mem_in_use;
+    uint64_t   stream_mem_in_use;
     double     total_alerts_per_second;
 }  SFBASE_STATS;
 

diff --git a/src/network_inspectors/port_scan/ps_detect.cc b/src/network_inspectors/port_scan/ps_detect.cc
index aacb2effa2e4dfdb761c8a83d4174973571742b5..3d1263cd4b2dee978fadd016c8e6edcd200ef91c 100644 (file)
--- a/src/network_inspectors/port_scan/ps_detect.cc
+++ b/src/network_inspectors/port_scan/ps_detect.cc
@@ -841,8 +841,8 @@ int PortScan::ps_tracker_update_tcp(PS_PKT *ps_pkt, PS_TRACKER *scanner,
     **  we will use the available stream4 information.  Otherwise, we
     **  can just revert to flow and look for initiators and responders.
     **
-    **  For Stream5, depending on the configuration, there might not
-    **  be a session created only based on the SYN packet.  Stream5
+    **  For Stream, depending on the configuration, there might not
+    **  be a session created only based on the SYN packet.  Stream
     **  by default has code that helps deal with SYN flood attacks,
     **  and may simply ignore the SYN.  In this case, we fall through
     **  to the checks for specific TCP header files (SYN, SYN-ACK, RST).

diff --git a/src/protocols/packet_manager.cc b/src/protocols/packet_manager.cc
index a7d5b6c10a236ff199f9b6a4673fdc3cb4ca9e6f..8e00c7349d14c2ab0cafbe4a8269e8ff8cfc815c 100644 (file)
--- a/src/protocols/packet_manager.cc
+++ b/src/protocols/packet_manager.cc
@@ -352,9 +352,9 @@ static inline uint8_t GetTTL(const Packet* const p, EncodeFlags flags)
         return 0;
 
     if ( p->packet_flags & PKT_FROM_CLIENT )
-        dir = forward(flags) ? SSN_DIR_CLIENT : SSN_DIR_SERVER;
+        dir = forward(flags) ? SSN_DIR_FROM_CLIENT : SSN_DIR_FROM_SERVER;
     else
-        dir = forward(flags) ? SSN_DIR_SERVER : SSN_DIR_CLIENT;
+        dir = forward(flags) ? SSN_DIR_FROM_SERVER : SSN_DIR_FROM_CLIENT;
 
     // outermost ip is considered to be outer here,
     // even if it is the only ip layer ...
@@ -626,8 +626,8 @@ const uint8_t* PacketManager::encode_reject( UnreachResponse type,
 //-------------------------------------------------------------------------
 // formatters:
 // - these packets undergo detection
-// - need to set Packet stuff except for frag3 which calls grinder
-// - include original options except for frag3 inner ip
+// - need to set Packet stuff except for frag which calls grinder
+// - include original options except for frag inner ip
 // - inner layer header is very similar but payload differs
 // - original ttl is always used
 //-------------------------------------------------------------------------

diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index fa8887cd89bd867da48c5e14855f963adb5a952b..37b0e4848e3ccfd755342c112ab3f9b81a81dbb9 100644 (file)
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -1023,9 +1023,9 @@ void RpcDecode::eval(Packet *p)
     // preconditions - what we registered for
     assert(p->is_tcp() && p->dsize);
 
-    /* If we're stateful that means stream5 has been configured.
+    /* If we're stateful that means stream has been configured.
      * In this case we don't look at server packets.
-     * There is the case were stream5 configuration requires a 3 way handshake.
+     * There is the case were stream configuration requires a 3 way handshake.
      * If no 3 way, then the packet flags won't be set, so don't look at it
      * since we won't be able to determeine who's the client and who's the server. */
     if ( !(p->packet_flags & PKT_FROM_CLIENT) )

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 6bb72dcc9351d6c5dd6293e3b05a72dd1d6bc558..b4af730e61122dca3942fe777ef4a942b9529db5 100644 (file)
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -130,7 +130,7 @@ static inline bool is_eligible(Packet* p)
     return true;
 }
 
-Stream5GlobalConfig::Stream5GlobalConfig()
+StreamGlobalConfig::StreamGlobalConfig()
 {
     flags = 0;
     prune_log_max = 1048576;
@@ -143,7 +143,7 @@ Stream5GlobalConfig::Stream5GlobalConfig()
 class StreamBase : public Inspector
 {
 public:
-    StreamBase(const StreamConfig*);
+    StreamBase(const StreamModuleConfig*);
 
     void show(SnortConfig*) override;
 
@@ -153,10 +153,10 @@ public:
     void eval(Packet*) override;
 
 public:
-    const StreamConfig* config;
+    const StreamModuleConfig* config;
 };
 
-StreamBase::StreamBase(const StreamConfig* c)
+StreamBase::StreamBase(const StreamModuleConfig* c)
 {
     config = c;
 }
@@ -204,7 +204,7 @@ void StreamBase::tterm()
 void StreamBase::show(SnortConfig*)
 {
     // FIXIT-L SSN print 
-    //Stream5PrintGlobalConfig(&config);
+    //StreamPrintGlobalConfig(&config);
 }
 
 void StreamBase::eval(Packet *p)

diff --git a/src/stream/base/stream_module.cc b/src/stream/base/stream_module.cc
index 02810e99e2e72b0aef4a0973777718dd94ea2e7b..4f371a7a4804731d7fa3f947196b3913cf4ae1d9 100644 (file)
--- a/src/stream/base/stream_module.cc
+++ b/src/stream/base/stream_module.cc
@@ -29,7 +29,7 @@ using namespace std;
 
 static constexpr unsigned K = 1024;
 
-static StreamConfig stream_cfg = 
+static StreamModuleConfig stream_cfg = 
 {
     // bytes, #, sec, sec
     { 8*K,  16*K, 30, 180 },  // ip
@@ -88,7 +88,7 @@ const PegInfo* StreamModule::get_pegs() const
 ProfileStats* StreamModule::get_profile() const
 { return &s5PerfStats; }
 
-const StreamConfig* StreamModule::get_data()
+const StreamModuleConfig* StreamModule::get_data()
 {
     return &stream_cfg;
 }

diff --git a/src/stream/base/stream_module.h b/src/stream/base/stream_module.h
index f3f675f00cac3aab211f3cd1ca45968385685333..8f143adcc582160a62b1519e2844c4e095284a45 100644 (file)
--- a/src/stream/base/stream_module.h
+++ b/src/stream/base/stream_module.h
@@ -36,7 +36,7 @@ struct SnortConfig;
 #define MOD_NAME "stream"
 #define MOD_HELP "common flow tracking"
 
-struct StreamConfig
+struct StreamModuleConfig
 {
     FlowConfig ip_cfg;
     FlowConfig icmp_cfg;
@@ -54,7 +54,7 @@ public:
 
     const PegInfo* get_pegs() const override;
     ProfileStats* get_profile() const override;
-    const StreamConfig* get_data();
+    const StreamModuleConfig* get_data();
 
     void sum_stats() override;
     void show_stats() override;

diff --git a/src/stream/icmp/icmp_session.cc b/src/stream/icmp/icmp_session.cc
index 0b9a2edb6490c474c6355cc7c8d06fd078babc05..8f3ff55f0caee6f73571566986cfd62acc8c8a6f 100644 (file)
--- a/src/stream/icmp/icmp_session.cc
+++ b/src/stream/icmp/icmp_session.cc
@@ -196,7 +196,7 @@ static int ProcessIcmpUnreach(Packet *p)
             "Marking session as dead, per ICMP Unreachable!\n"););
         ssn->s5_state.session_flags |= SSNFLAG_DROP_CLIENT;
         ssn->s5_state.session_flags |= SSNFLAG_DROP_SERVER;
-        ssn->session_state |= STREAM5_STATE_UNREACH;
+        ssn->session_state |= STREAM_STATE_UNREACH;
     }
 
     return 0;
@@ -251,7 +251,7 @@ void IcmpSession::update_direction(char dir, const sfip_t *ip, uint16_t)
 {
     if (sfip_equals(&icmp_sender_ip, ip))
     {
-        if ((dir == SSN_DIR_SENDER) && (flow->s5_state.direction == SSN_DIR_SENDER))
+        if ((dir == SSN_DIR_FROM_SENDER) && (flow->s5_state.direction == SSN_DIR_FROM_SENDER))
         {
             /* Direction already set as SENDER */
             return;
@@ -259,7 +259,8 @@ void IcmpSession::update_direction(char dir, const sfip_t *ip, uint16_t)
     }
     else if (sfip_equals(&icmp_responder_ip, ip))
     {
-        if ((dir == SSN_DIR_RESPONDER) && (flow->s5_state.direction == SSN_DIR_RESPONDER))
+        if ((dir == SSN_DIR_FROM_RESPONDER) && 
+            (flow->s5_state.direction == SSN_DIR_FROM_RESPONDER))
         {
             /* Direction already set as RESPONDER */
             return;

diff --git a/src/stream/icmp/stream_icmp.cc b/src/stream/icmp/stream_icmp.cc
index fc380af90625ff1d2fda996d5dd306c0776c5fbb..489b699aef0efa6df12f9c60a1bfb8d5759980c2 100644 (file)
--- a/src/stream/icmp/stream_icmp.cc
+++ b/src/stream/icmp/stream_icmp.cc
@@ -44,7 +44,7 @@ StreamIcmpConfig::StreamIcmpConfig()
 
 static void icmp_show(StreamIcmpConfig* pc)
 {
-    LogMessage("Stream5 ICMP config:\n");
+    LogMessage("Stream ICMP config:\n");
     LogMessage("    Timeout: %d seconds\n", pc->session_timeout);
 }
 

diff --git a/src/stream/icmp/stream_icmp.h b/src/stream/icmp/stream_icmp.h
index 470f12026ebeebdaae1c6469777a7780e80fa48e..95db48f918a89ab2669cf27047f80f24bc3a83aa 100644 (file)
--- a/src/stream/icmp/stream_icmp.h
+++ b/src/stream/icmp/stream_icmp.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
  
-#ifndef STREAM5_ICMP_H
-#define STREAM5_ICMP_H
+#ifndef STREAM_ICMP_H
+#define STREAM_ICMP_H
 
 #include "main/snort_types.h"
 

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index ec1c77a11f5f218cfe3c7b625a65054bd7e2f641..14bcabb2075535a5d1694f1cbb81c36a5b669431 100644 (file)
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -702,7 +702,7 @@ static inline int checkTinyFragments(
             if (p->dsize <= engine->min_fragment_length)
             {
                 DEBUG_WRAP(DebugMessage(DEBUG_FRAG,
-                            "Frag3: Received fragment size(%d) is not more than configured min_fragment_length (%d)\n",
+                            "Frag: Received fragment size(%d) is not more than configured min_fragment_length (%d)\n",
                             p->dsize, engine->min_fragment_length););
                 EventTinyFragments(engine);
                 return 1;
@@ -712,7 +712,7 @@ static inline int checkTinyFragments(
             if (trimmedLength <= engine->min_fragment_length)
             {
                 DEBUG_WRAP(DebugMessage(DEBUG_FRAG,
-                            "Frag3: # of New octets in Received fragment(%d) is not more than configured min_fragment_length (%d)\n",
+                            "Frag: # of New octets in Received fragment(%d) is not more than configured min_fragment_length (%d)\n",
                             trimmedLength, engine->min_fragment_length););
                 EventTinyFragments(engine);
                 return 1;
@@ -736,7 +736,7 @@ int drop_all_fragments(
     if (ft && !(ft->frag_flags & FRAG_DROP_FRAGMENTS))
     {
         DEBUG_WRAP(DebugMessage(DEBUG_FRAG,
-                        "Frag3: Will drop all fragments on this packet\n"););
+                        "Frag: Will drop all fragments on this packet\n"););
         ft->frag_flags |= FRAG_DROP_FRAGMENTS;
     }
 
@@ -985,13 +985,13 @@ static void FragRebuild(FragTracker *ft, Packet *p)
 
     UpdateIPReassStats(&sfBase, dpkt->pkth->caplen);
 
-#if defined(DEBUG_FRAG3) && defined(DEBUG)
+#if defined(DEBUG_FRAG_EX) && defined(DEBUG)
     /*
      * Note, that this won't print out the IP Options or any other
      * data that is established when the packet is decoded.
      */
     if (DEBUG_FRAG & GetDebugLevel())
-        LogIPPkt(&dpkt);
+        LogIPPkt(dpkt);
 
 #endif
 
@@ -1064,7 +1064,7 @@ static void delete_frag(Fragment *frag)
         free(frag);
         mem_in_use -= sizeof(Fragment);
 
-        sfBase.frag3_mem_in_use = mem_in_use;
+        sfBase.frag_mem_in_use = mem_in_use;
     }
 
     ip_stats.nodes_released++;
@@ -1249,7 +1249,7 @@ void Defrag::process(Packet* p, FragTracker* ft)
         if ( p->is_ip4() )
         {
             DEBUG_WRAP(DebugMessage(DEBUG_FRAG,
-                    "[FRAG3] Fragment discarded due to low TTL "
+                    "[FRAG] Fragment discarded due to low TTL "
                     "[0x%X->0x%X], TTL: %d  " "Offset: %d Length: %d\n",
                     ntohl(p->ptrs.ip_api.get_ip4h()->get_src()),
                     ntohl(p->ptrs.ip_api.get_ip4h()->get_dst()),
@@ -1326,7 +1326,7 @@ void Defrag::process(Packet* p, FragTracker* ft)
                 if ( p->is_ip4() )
                 {
                     DEBUG_WRAP(DebugMessage(DEBUG_FRAG,
-                            "[FRAG3] Fragment discarded due to large TTL Delta "
+                            "[FRAG] Fragment discarded due to large TTL Delta "
                             "[0x%X->0x%X], TTL: %d  orig TTL: %d "
                             "Offset: %d Length: %d\n",
                             ntohl(p->ptrs.ip_api.get_ip4h()->get_src()),
@@ -2236,7 +2236,7 @@ int Defrag::new_tracker(Packet *p, FragTracker* ft)
         f->fptr = (uint8_t *) SnortAlloc(fragLength);
         mem_in_use += fragLength;
 
-        sfBase.frag3_mem_in_use = mem_in_use;
+        sfBase.frag_mem_in_use = mem_in_use;
     }
 
     ip_stats.nodes_created++;
@@ -2392,7 +2392,7 @@ int Defrag::add_frag_node(FragTracker *ft,
         newfrag->fptr = (uint8_t*)SnortAlloc(fragLength);
         mem_in_use += fragLength;
 
-        sfBase.frag3_mem_in_use = mem_in_use;
+        sfBase.frag_mem_in_use = mem_in_use;
     }
 
     ip_stats.nodes_created++;
@@ -2479,7 +2479,7 @@ int Defrag::dup_frag_node(
         newfrag->fptr = (uint8_t*)SnortAlloc(left->flen);
         mem_in_use += left->flen;
 
-        sfBase.frag3_mem_in_use = mem_in_use;
+        sfBase.frag_mem_in_use = mem_in_use;
     }
 
     ip_stats.nodes_created++;

diff --git a/src/stream/ip/stream_ip.cc b/src/stream/ip/stream_ip.cc
index 1468197206c62c71f93772c8dc3da3a14f795063..5548334f84e041f74c530092b3b0996f634f4726 100644 (file)
--- a/src/stream/ip/stream_ip.cc
+++ b/src/stream/ip/stream_ip.cc
@@ -42,7 +42,7 @@
 #define FRAG_PRUNE_QUANTA  60
 
 /* min acceptable ttl */
-#define FRAG3_MIN_TTL       1
+#define FRAG_MIN_TTL       1
 
 //-------------------------------------------------------------------------
 // helpers
@@ -55,7 +55,7 @@ StreamIpConfig::StreamIpConfig()
     frag_engine.frag_policy = FRAG_POLICY_DEFAULT;
     frag_engine.max_frags = DEFAULT_MAX_FRAGS;
     frag_engine.frag_timeout = FRAG_PRUNE_QUANTA;
-    frag_engine.min_ttl = FRAG3_MIN_TTL;
+    frag_engine.min_ttl = FRAG_MIN_TTL;
 
     frag_engine.max_overlaps = 0;
     frag_engine.min_fragment_length = 0;

diff --git a/src/stream/ip/stream_ip.h b/src/stream/ip/stream_ip.h
index a07eced14e2a2ce19774e80efe959522487c181e..b935dbaffb555c707f03beea29d4761d949dd5ee 100644 (file)
--- a/src/stream/ip/stream_ip.h
+++ b/src/stream/ip/stream_ip.h
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef STREAM5_IP_H
-#define STREAM5_IP_H
+#ifndef STREAM_IP_H
+#define STREAM_IP_H
 
 #include "flow/flow.h"
 

diff --git a/src/stream/stream.h b/src/stream/stream.h
index 639af384c75ce7a7250a556199e1c6320e5f5154..a025b1c487b2499031f9cc0fbb9efbed4f11ce69 100644 (file)
--- a/src/stream/stream.h
+++ b/src/stream/stream.h
@@ -39,27 +39,27 @@
 #include "stream/stream_api.h"
 #include "target_based/sftarget_protocol_reference.h"
 
-//#define DEBUG_STREAM5 DEBUG
+//#define DEBUG_STREAM DEBUG
 
-#define S5_DEFAULT_SSN_TIMEOUT  30        /* seconds to timeout a session */
-#define S5_MAX_SSN_TIMEOUT      3600*24   /* max timeout (approx 1 day) */
-#define S5_MIN_SSN_TIMEOUT      1         /* min timeout (1 second) */
+#define STREAM_DEFAULT_SSN_TIMEOUT  30        /* seconds to timeout a session */
+#define STREAM_MAX_SSN_TIMEOUT      3600*24   /* max timeout (approx 1 day) */
+#define STREAM_MIN_SSN_TIMEOUT      1         /* min timeout (1 second) */
 
-#define S5_TRACK_YES            1
-#define S5_TRACK_NO             0
+#define STREAM_TRACK_YES            1
+#define STREAM_TRACK_NO             0
 
 // FIXIT-L move to proto specific where possible
-#define STREAM5_CONFIG_STATEFUL_INSPECTION      0x00000001
-#define STREAM5_CONFIG_LOG_STREAMS              0x00000004
-#define STREAM5_CONFIG_REASS_CLIENT             0x00000008
-#define STREAM5_CONFIG_REASS_SERVER             0x00000010
-#define STREAM5_CONFIG_ASYNC                    0x00000020
-#define STREAM5_CONFIG_SHOW_PACKETS             0x00000040
-#define STREAM5_CONFIG_MIDSTREAM_DROP_NOALERT   0x00000080
-#define STREAM5_CONFIG_IGNORE_ANY               0x00000100
-#define STREAM5_CONFIG_STATIC_FLUSHPOINTS       0x00000200
-#define STREAM5_CONFIG_IPS                      0x00000400
-#define STREAM5_CONFIG_NO_ASYNC_REASSEMBLY      0x00000800
+#define STREAM_CONFIG_STATEFUL_INSPECTION      0x00000001
+#define STREAM_CONFIG_LOG_STREAMS              0x00000004
+#define STREAM_CONFIG_REASS_CLIENT             0x00000008
+#define STREAM_CONFIG_REASS_SERVER             0x00000010
+#define STREAM_CONFIG_ASYNC                    0x00000020
+#define STREAM_CONFIG_SHOW_PACKETS             0x00000040
+#define STREAM_CONFIG_MIDSTREAM_DROP_NOALERT   0x00000080
+#define STREAM_CONFIG_IGNORE_ANY               0x00000100
+#define STREAM_CONFIG_STATIC_FLUSHPOINTS       0x00000200
+#define STREAM_CONFIG_IPS                      0x00000400
+#define STREAM_CONFIG_NO_ASYNC_REASSEMBLY      0x00000800
 
 /* traffic direction identification */
 #define FROM_SERVER     0
@@ -86,20 +86,20 @@ private:
 /*  D A T A   S T R U C T U R E S  **********************************/
 // FIXIT-L some of this stuff can be better encapsulated
 
-struct Stream5GlobalConfig
+struct StreamGlobalConfig
 {
     uint32_t prune_log_max;
     uint32_t flags;
 
-    Stream5GlobalConfig();
+    StreamGlobalConfig();
 };
 
-struct Stream5Config
+struct StreamConfig
 {
     class FlowControl* fc;
     class Stream* stream;
 
-    struct Stream5GlobalConfig *global_config;
+    struct StreamGlobalConfig *global_config;
     uint8_t service_filter[MAX_PROTOCOL_ORDINAL];
 };
 

diff --git a/src/stream/stream_api.cc b/src/stream/stream_api.cc
index bdbd6dcf6468223d98ab21b868608b7efc76a827..0bfdae0cc52f2e39c9080cab4bdf852ae3a9a3c6 100644 (file)
--- a/src/stream/stream_api.cc
+++ b/src/stream/stream_api.cc
@@ -170,7 +170,7 @@ void Stream::check_session_closed(Packet* p)
     if (!p || !flow)
         return;
 
-    if (flow->session_state & STREAM5_STATE_CLOSED)
+    if (flow->session_state & STREAM_STATE_CLOSED)
     {
         assert(flow_con);
         flow_con->delete_flow(flow, "closed");
@@ -202,8 +202,8 @@ void Stream::stop_inspection(
     switch (dir)
     {
         case SSN_DIR_BOTH:
-        case SSN_DIR_CLIENT:
-        case SSN_DIR_SERVER:
+        case SSN_DIR_FROM_CLIENT:
+        case SSN_DIR_FROM_SERVER:
             if (flow->s5_state.ignore_direction != dir)
             {
                 flow->s5_state.ignore_direction = dir;
@@ -214,14 +214,14 @@ void Stream::stop_inspection(
     /* Flush any queued data on the client and/or server */
     if (flow->protocol == PktType::TCP)
     {
-        if (flow->s5_state.ignore_direction & SSN_DIR_CLIENT)
+        if (flow->s5_state.ignore_direction & SSN_DIR_FROM_CLIENT)
         {
-            Stream5FlushClient(p, flow);
+            StreamFlushClient(p, flow);
         }
 
-        if (flow->s5_state.ignore_direction & SSN_DIR_SERVER)
+        if (flow->s5_state.ignore_direction & SSN_DIR_FROM_SERVER)
         {
-            Stream5FlushServer(p, flow);
+            StreamFlushServer(p, flow);
         }
     }
 
@@ -239,8 +239,8 @@ void Stream::resume_inspection(Flow* flow, char dir)
     switch (dir)
     {
         case SSN_DIR_BOTH:
-        case SSN_DIR_CLIENT:
-        case SSN_DIR_SERVER:
+        case SSN_DIR_FROM_CLIENT:
+        case SSN_DIR_FROM_SERVER:
             if (flow->s5_state.ignore_direction & dir)
             {
                 flow->s5_state.ignore_direction &= ~dir;
@@ -274,14 +274,14 @@ void Stream::drop_traffic(Flow* flow, char dir)
     if (!flow)
         return;
 
-    if ((dir & SSN_DIR_CLIENT) && !(flow->s5_state.session_flags & SSNFLAG_DROP_CLIENT))
+    if ((dir & SSN_DIR_FROM_CLIENT) && !(flow->s5_state.session_flags & SSNFLAG_DROP_CLIENT))
     {
         flow->s5_state.session_flags |= SSNFLAG_DROP_CLIENT;
         if ( Active_PacketForceDropped() )
             flow->s5_state.session_flags |= SSNFLAG_FORCE_BLOCK;
     }
 
-    if ((dir & SSN_DIR_SERVER) && !(flow->s5_state.session_flags & SSNFLAG_DROP_SERVER))
+    if ((dir & SSN_DIR_FROM_SERVER) && !(flow->s5_state.session_flags & SSNFLAG_DROP_SERVER))
     {
         flow->s5_state.session_flags |= SSNFLAG_DROP_SERVER;
         if ( Active_PacketForceDropped() )
@@ -401,7 +401,7 @@ void Stream::set_application_protocol_id_from_host_entry(
         set_ip_protocol(flow);
     }
 
-    if (direction == SSN_DIR_SERVER)
+    if (direction == SSN_DIR_FROM_SERVER)
     {
         application_protocol = getApplicationProtocolId(
             host_entry, flow->s5_state.ipprotocol,
@@ -449,7 +449,7 @@ int16_t Stream::get_application_protocol_id(Flow* flow)
     host_entry = SFAT_LookupHostEntryByIP(&flow->server_ip);
     if (host_entry)
     {
-        set_application_protocol_id_from_host_entry(flow, host_entry, SSN_DIR_SERVER);
+        set_application_protocol_id_from_host_entry(flow, host_entry, SSN_DIR_FROM_SERVER);
 
         if (flow->s5_state.application_protocol != 0)
         {
@@ -461,7 +461,7 @@ int16_t Stream::get_application_protocol_id(Flow* flow)
 
     if (host_entry)
     {
-        set_application_protocol_id_from_host_entry(flow, host_entry, SSN_DIR_CLIENT);
+        set_application_protocol_id_from_host_entry(flow, host_entry, SSN_DIR_FROM_CLIENT);
 
         if (flow->s5_state.application_protocol != 0)
         {
@@ -500,17 +500,17 @@ int16_t Stream::set_application_protocol_id(Flow* flow, int16_t id)
 
 bool Stream::is_paf_active(Flow* flow, bool to_server)
 {
-    return Stream5IsPafActiveTcp(flow, to_server);
+    return StreamIsPafActiveTcp(flow, to_server);
 }
 
 void Stream::set_splitter(Flow* flow, bool to_server, StreamSplitter* ss)
 {
-    return Stream5SetSplitterTcp(flow, to_server, ss);
+    return StreamSetSplitterTcp(flow, to_server, ss);
 }
 
 StreamSplitter* Stream::get_splitter(Flow* flow, bool to_server)
 {
-    return Stream5GetSplitterTcp(flow, to_server);
+    return StreamGetSplitterTcp(flow, to_server);
 }
 
 //-------------------------------------------------------------------------
@@ -608,7 +608,7 @@ uint8_t Stream::get_session_ttl(Flow* flow, char dir, bool outer)
     if ( !flow )
         return 0;
 
-    if ( SSN_DIR_CLIENT == dir )
+    if ( SSN_DIR_FROM_CLIENT == dir )
         return outer ? flow->outer_client_ttl : flow->inner_client_ttl;
 
     return outer ? flow->outer_server_ttl : flow->inner_server_ttl;
@@ -626,23 +626,23 @@ static void active_response(Packet* p, Flow *lwssn)
     uint8_t max = snort_conf->max_responses;
 
     if ( p->packet_flags & PKT_FROM_CLIENT )
-        lwssn->session_state |= STREAM5_STATE_DROP_CLIENT;
+        lwssn->session_state |= STREAM_STATE_DROP_CLIENT;
     else
-        lwssn->session_state |= STREAM5_STATE_DROP_SERVER;
+        lwssn->session_state |= STREAM_STATE_DROP_SERVER;
 
     if ( (lwssn->response_count < max) && lwssn->get_expire(p) )
     {
         uint32_t delay = snort_conf->min_interval;
         EncodeFlags flags =
-            ( (lwssn->session_state & STREAM5_STATE_DROP_CLIENT) &&
-              (lwssn->session_state & STREAM5_STATE_DROP_SERVER) ) ?
+            ( (lwssn->session_state & STREAM_STATE_DROP_CLIENT) &&
+              (lwssn->session_state & STREAM_STATE_DROP_SERVER) ) ?
             ENC_FLAG_FWD : 0;  // reverse dir is always true
 
         Active_KillSession(p, &flags);
         ++lwssn->response_count;
         lwssn->set_expire(p, delay);
 
-        lwssn->session_state &= ~(STREAM5_STATE_DROP_CLIENT|STREAM5_STATE_DROP_SERVER);
+        lwssn->session_state &= ~(STREAM_STATE_DROP_CLIENT|STREAM_STATE_DROP_SERVER);
     }
 }
 
@@ -674,13 +674,13 @@ bool Stream::ignored_session (Flow* flow, Packet* p)
 {
     if (
         ((p->packet_flags & PKT_FROM_SERVER) &&
-            (flow->s5_state.ignore_direction & SSN_DIR_CLIENT)) ||
+            (flow->s5_state.ignore_direction & SSN_DIR_FROM_CLIENT)) ||
 
         ((p->packet_flags & PKT_FROM_CLIENT) &&
-            (flow->s5_state.ignore_direction & SSN_DIR_SERVER)) )
+            (flow->s5_state.ignore_direction & SSN_DIR_FROM_SERVER)) )
     {
         DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-            "Stream5 Ignoring packet from %d. Session marked as ignore\n",
+            "Stream Ignoring packet from %d. Session marked as ignore\n",
             p->packet_flags & PKT_FROM_CLIENT? "sender" : "responder"););
 
         DisableInspection(p);
@@ -690,21 +690,21 @@ bool Stream::ignored_session (Flow* flow, Packet* p)
     return false;
 }
 
-static int Stream5ExpireSession(Flow *lwssn)
+static int StreamExpireSession(Flow *lwssn)
 {
     sfBase.iStreamTimeouts++;
     lwssn->s5_state.session_flags |= SSNFLAG_TIMEDOUT;
-    lwssn->session_state |= STREAM5_STATE_TIMEDOUT;
+    lwssn->session_state |= STREAM_STATE_TIMEDOUT;
 
     return 1;
 }
 
-static int Stream5Expire(Packet *p, Flow *lwssn)
+static int StreamExpire(Packet *p, Flow *lwssn)
 {
     if ( lwssn->expired(p) )
     {
         /* Expiration time has passed. */
-        return Stream5ExpireSession(lwssn);
+        return StreamExpireSession(lwssn);
     }
 
     return 0;
@@ -712,10 +712,10 @@ static int Stream5Expire(Packet *p, Flow *lwssn)
 
 bool Stream::expired_session (Flow* flow, Packet* p)
 {
-    if ( (flow->session_state & STREAM5_STATE_TIMEDOUT)
-        || Stream5Expire(p, flow) )
+    if ( (flow->session_state & STREAM_STATE_TIMEDOUT)
+        || StreamExpire(p, flow) )
     {
-        DEBUG_WRAP(DebugMessage(DEBUG_STREAM, "Stream5 IP session timeout!\n"););
+        DEBUG_WRAP(DebugMessage(DEBUG_STREAM, "Stream IP session timeout!\n"););
         flow->s5_state.session_flags |= SSNFLAG_TIMEDOUT;
         return true;
     }
@@ -775,7 +775,7 @@ int Stream::response_flush_stream(Packet *p)
 
     /* Flush the talker queue -- this is the opposite side that
      * the packet gets inserted into */
-    Stream5FlushTalker(p, flow);
+    StreamFlushTalker(p, flow);
 
     return 0;
 }
@@ -813,7 +813,7 @@ int Stream::update_session_alert(
     if ( p->type() != PktType::TCP )
         return 0;
 
-    return Stream5UpdateSessionAlertTcp(flow, p, gid, sid, event_id, event_second);
+    return StreamUpdateSessionAlertTcp(flow, p, gid, sid, event_id, event_second);
 }
 
 void Stream::set_extra_data(
@@ -824,7 +824,7 @@ void Stream::set_extra_data(
     if ( !flow )
         return;
 
-    Stream5SetExtraDataTcp(flow, p, flag);
+    StreamSetExtraDataTcp(flow, p, flag);
 }
 
 // FIXIT-L get pv/flow from packet directly?
@@ -836,7 +836,7 @@ void Stream::clear_extra_data(
     if ( !flow )
         return;
 
-    Stream5ClearExtraDataTcp(flow, p, flag);
+    StreamClearExtraDataTcp(flow, p, flag);
 }
 
 int Stream::traverse_reassembled(
@@ -874,7 +874,7 @@ char Stream::get_reassembly_direction(Flow* flow)
     if (!flow || flow->protocol != PktType::TCP)
         return SSN_DIR_NONE;
 
-    return Stream5GetReassemblyDirectionTcp(flow);
+    return StreamGetReassemblyDirectionTcp(flow);
 }
 
 char Stream::is_stream_sequenced(Flow* flow, char dir)
@@ -882,7 +882,7 @@ char Stream::is_stream_sequenced(Flow* flow, char dir)
     if (!flow || flow->protocol != PktType::TCP)
         return 1;
 
-    return Stream5IsStreamSequencedTcp(flow, dir);
+    return StreamIsStreamSequencedTcp(flow, dir);
 }
 
 int Stream::missing_in_reassembled(Flow* flow, char dir)
@@ -890,7 +890,7 @@ int Stream::missing_in_reassembled(Flow* flow, char dir)
     if (!flow || flow->protocol != PktType::TCP)
         return SSN_MISSING_NONE;
 
-    return Stream5MissingInReassembledTcp(flow, dir);
+    return StreamMissingInReassembledTcp(flow, dir);
 }
 
 char Stream::missed_packets(Flow* flow, char dir)
@@ -898,6 +898,6 @@ char Stream::missed_packets(Flow* flow, char dir)
     if (!flow || flow->protocol != PktType::TCP)
         return 1;
 
-    return Stream5PacketsMissingTcp(flow, dir);
+    return StreamPacketsMissingTcp(flow, dir);
 }
 

diff --git a/src/stream/stream_api.h b/src/stream/stream_api.h
index 252e71417ea4f1933dc5886b309e18b4d143cd56..5ad4b214484cfe36ac088678e2ad2b64cd417fc4 100644 (file)
--- a/src/stream/stream_api.h
+++ b/src/stream/stream_api.h
@@ -47,12 +47,12 @@
 #define SSN_MISSING_AFTER  0x02
 #define SSN_MISSING_BOTH   (SSN_MISSING_BEFORE | SSN_MISSING_AFTER)
 
-#define SSN_DIR_NONE 0x0
-#define SSN_DIR_CLIENT 0x1
-#define SSN_DIR_SENDER 0x1
-#define SSN_DIR_SERVER 0x2
-#define SSN_DIR_RESPONDER 0x2
-#define SSN_DIR_BOTH 0x03
+#define SSN_DIR_NONE           0x00
+#define SSN_DIR_FROM_CLIENT    0x01
+#define SSN_DIR_FROM_SENDER    0x01
+#define SSN_DIR_FROM_SERVER    0x02
+#define SSN_DIR_FROM_RESPONDER 0x02
+#define SSN_DIR_BOTH           0x03
 
 class Flow;
 

diff --git a/src/stream/tcp/ips_stream_reassemble.cc b/src/stream/tcp/ips_stream_reassemble.cc
index 6fcf2d84abc916342ab169e4e45563315da5a5d1..fb390515370ada7378bba25be1d23ad06de34a3e 100644 (file)
--- a/src/stream/tcp/ips_stream_reassemble.cc
+++ b/src/stream/tcp/ips_stream_reassemble.cc
@@ -118,13 +118,13 @@ int ReassembleOption::eval(Cursor&, Packet* pkt)
 
     if ( !srod.enable ) /* Turn it off */
     {
-        if ( srod.direction & SSN_DIR_SERVER )
+        if ( srod.direction & SSN_DIR_FROM_SERVER )
         {
             tcpssn->server.flush_policy = STREAM_FLPOLICY_IGNORE;
             stream.set_splitter(lwssn, true);
         }   
 
-        if ( srod.direction & SSN_DIR_CLIENT )
+        if ( srod.direction & SSN_DIR_FROM_CLIENT )
         {
             tcpssn->client.flush_policy = STREAM_FLPOLICY_IGNORE;
             stream.set_splitter(lwssn, false);
@@ -134,13 +134,13 @@ int ReassembleOption::eval(Cursor&, Packet* pkt)
     {
         // FIXIT-M PAF need to instantiate service splitter?
         // FIXIT-M PAF need to check for ips / on-data
-        if ( srod.direction & SSN_DIR_SERVER )
+        if ( srod.direction & SSN_DIR_FROM_SERVER )
         {
             tcpssn->server.flush_policy = STREAM_FLPOLICY_ON_ACK;
             stream.set_splitter(lwssn, true, new AtomSplitter(true));
         }   
 
-        if ( srod.direction & SSN_DIR_CLIENT )
+        if ( srod.direction & SSN_DIR_FROM_CLIENT )
         {
             tcpssn->client.flush_policy = STREAM_FLPOLICY_ON_ACK;
             stream.set_splitter(lwssn, false, new AtomSplitter(false));

diff --git a/src/stream/tcp/ips_stream_size.cc b/src/stream/tcp/ips_stream_size.cc
index c746ded0f943c77c54dc698afc6141848d74ecc5..daabc900f69876e5a8d9a3661b20711eb7c24782 100644 (file)
--- a/src/stream/tcp/ips_stream_size.cc
+++ b/src/stream/tcp/ips_stream_size.cc
@@ -181,12 +181,12 @@ int SizeOption::eval(Cursor&, Packet* pkt)
 
     switch (ssod.direction)
     {
-    case SSN_DIR_CLIENT:
+    case SSN_DIR_FROM_CLIENT:
         if ( ssod.compare(client_size, ssod.size) )
             result = DETECTION_OPTION_MATCH;
         break;
 
-    case SSN_DIR_SERVER:
+    case SSN_DIR_FROM_SERVER:
         if ( ssod.compare(server_size, ssod.size) )
             result = DETECTION_OPTION_MATCH;
         break;

diff --git a/src/stream/tcp/stream_paf.h b/src/stream/tcp/stream_paf.h
index bf6b72146217bdf709fd9b3bbcfdf5109ee43ed6..c5f7df4836afd12581622688a166c4e5f49cfd02 100644 (file)
--- a/src/stream/tcp/stream_paf.h
+++ b/src/stream/tcp/stream_paf.h
@@ -27,8 +27,8 @@
 // @author  Russ Combs <rcombs@sourcefire.com>
 //--------------------------------------------------------------------
 
-#ifndef STREAM5_PAF_H
-#define STREAM5_PAF_H
+#ifndef STREAM_PAF_H
+#define STREAM_PAF_H
 
 #include <stdint.h>
 #include "snort_types.h"

diff --git a/src/stream/tcp/stream_tcp.h b/src/stream/tcp/stream_tcp.h
index 291b5cbf068975ba5480ad874567a4afd1d7c22a..99206002222bb6171bda514850a97e299a5ec1e7 100644 (file)
--- a/src/stream/tcp/stream_tcp.h
+++ b/src/stream/tcp/stream_tcp.h
@@ -19,8 +19,8 @@
  *
  ****************************************************************************/
 
-#ifndef STREAM5_TCP_H
-#define STREAM5_TCP_H
+#ifndef STREAM_TCP_H
+#define STREAM_TCP_H
 
 #include "flow/flow.h"
 #include "stream/stream_api.h"
@@ -69,33 +69,33 @@ void tcp_reset_stats();
 void tcp_show(StreamTcpConfig*);
 
 // Stream support
-int Stream5FlushListener(Packet*, Flow*);
-int Stream5FlushTalker(Packet*, Flow*);
-int Stream5FlushClient(Packet*, Flow*);
-int Stream5FlushServer(Packet*, Flow*);
-void Stream5TcpSessionClear(Flow*);
-char Stream5GetReassemblyDirectionTcp(Flow*);
-
-int Stream5AddSessionAlertTcp(Flow*, Packet*, uint32_t gid, uint32_t sid);
-int Stream5CheckSessionAlertTcp(Flow*, Packet*, uint32_t gid, uint32_t sid);
-int Stream5UpdateSessionAlertTcp(
+int StreamFlushListener(Packet*, Flow*);
+int StreamFlushTalker(Packet*, Flow*);
+int StreamFlushClient(Packet*, Flow*);
+int StreamFlushServer(Packet*, Flow*);
+void StreamTcpSessionClear(Flow*);
+char StreamGetReassemblyDirectionTcp(Flow*);
+
+int StreamAddSessionAlertTcp(Flow*, Packet*, uint32_t gid, uint32_t sid);
+int StreamCheckSessionAlertTcp(Flow*, Packet*, uint32_t gid, uint32_t sid);
+int StreamUpdateSessionAlertTcp(
     Flow*, Packet*, uint32_t gid, uint32_t sid, uint32_t event_id, uint32_t event_second);
 
-void Stream5SetExtraDataTcp(Flow*, Packet*, uint32_t flag);
-void Stream5ClearExtraDataTcp(Flow*, Packet*, uint32_t flag);
+void StreamSetExtraDataTcp(Flow*, Packet*, uint32_t flag);
+void StreamClearExtraDataTcp(Flow*, Packet*, uint32_t flag);
 
-bool Stream5GetReassemblyFlushPolicyTcp(Flow*, char dir);
+bool StreamGetReassemblyFlushPolicyTcp(Flow*, char dir);
 
-char Stream5IsStreamSequencedTcp(Flow*, char dir);
-int Stream5MissingInReassembledTcp(Flow*, char dir);
-char Stream5PacketsMissingTcp(Flow*, char dir);
+char StreamIsStreamSequencedTcp(Flow*, char dir);
+int StreamMissingInReassembledTcp(Flow*, char dir);
+char StreamPacketsMissingTcp(Flow*, char dir);
 
 void* get_paf_config(StreamTcpConfig*);
-void** Stream5GetPAFUserDataTcp(Flow*, bool to_server);
-bool Stream5IsPafActiveTcp(Flow*, bool to_server);
+void** StreamGetPAFUserDataTcp(Flow*, bool to_server);
+bool StreamIsPafActiveTcp(Flow*, bool to_server);
 
-void Stream5SetSplitterTcp(Flow*, bool c2s, StreamSplitter*);
-StreamSplitter* Stream5GetSplitterTcp(Flow*, bool c2s);
+void StreamSetSplitterTcp(Flow*, bool c2s, StreamSplitter*);
+StreamSplitter* StreamGetSplitterTcp(Flow*, bool c2s);
 
 int GetTcpRebuiltPackets(Packet*, Flow*, PacketIterator, void *userdata);
 int GetTcpStreamSegments(Packet*, Flow*, StreamSegmentIterator, void *userdata);

diff --git a/src/stream/tcp/tcp_module.cc b/src/stream/tcp/tcp_module.cc
index fe2c969e8a6545bad10aa5eedccf30f1b60e6124..91caa6e08b6918068326c1f86312b3bc9d1d9fc7 100644 (file)
--- a/src/stream/tcp/tcp_module.cc
+++ b/src/stream/tcp/tcp_module.cc
@@ -264,7 +264,7 @@ bool StreamTcpModule::set(const char*, Value& v, SnortConfig*)
         config->footprint = v.get_long();
 
     else if ( v.is("ignore_any_rules") )
-        config->flags |= STREAM5_CONFIG_IGNORE_ANY;
+        config->flags |= STREAM_CONFIG_IGNORE_ANY;
 
     else if ( v.is("max_bytes") )
         config->max_queued_bytes = v.get_long();
@@ -290,9 +290,9 @@ bool StreamTcpModule::set(const char*, Value& v, SnortConfig*)
     else if ( v.is("reassemble_async") )
     {
         if ( v.get_bool() )
-            config->flags &= ~STREAM5_CONFIG_NO_ASYNC_REASSEMBLY;
+            config->flags &= ~STREAM_CONFIG_NO_ASYNC_REASSEMBLY;
         else
-            config->flags |= STREAM5_CONFIG_NO_ASYNC_REASSEMBLY;
+            config->flags |= STREAM_CONFIG_NO_ASYNC_REASSEMBLY;
     }
     else if ( v.is("require_3whs") )
     {
@@ -301,9 +301,9 @@ bool StreamTcpModule::set(const char*, Value& v, SnortConfig*)
     else if ( v.is("show_rebuilt_packets") )
     {
         if ( v.get_bool() )
-            config->flags |= STREAM5_CONFIG_SHOW_PACKETS;
+            config->flags |= STREAM_CONFIG_SHOW_PACKETS;
         else
-            config->flags &= ~STREAM5_CONFIG_SHOW_PACKETS;
+            config->flags &= ~STREAM_CONFIG_SHOW_PACKETS;
     }
 
     else

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 900ca1813f8800dafb412e6197c4e9b8e4f57884..5076e4301ea060ad70281c51822c8b05ca623704 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -192,8 +192,8 @@ THREAD_LOCAL Memcap* tcp_memcap = nullptr;
 #define CHK_SEQ         0
 #define NO_CHK_SEQ      1
 
-#define S5_UNALIGNED       0
-#define S5_ALIGNED         1
+#define STREAM_UNALIGNED       0
+#define STREAM_ALIGNED         1
 
 /* actions */
 #define ACTION_NOTHING                  0x00000000
@@ -245,10 +245,10 @@ THREAD_LOCAL Memcap* tcp_memcap = nullptr;
 #define STREAM_INSERT_TIMEOUT       2
 #define STREAM_INSERT_FAILED        3
 
-#define S5_DEFAULT_TCP_PACKET_MEMCAP  8388608  /* 8MB */
-#define S5_MIN_OVERLAP_LIMIT 0
-#define S5_MAX_OVERLAP_LIMIT 255
-#define S5_MAX_FLUSH_FACTOR 2048
+#define STREAM_DEFAULT_TCP_PACKET_MEMCAP  8388608  /* 8MB */
+#define STREAM_MIN_OVERLAP_LIMIT 0
+#define STREAM_MAX_OVERLAP_LIMIT 255
+#define STREAM_MAX_FLUSH_FACTOR 2048
 
 /* target-based policy types */
 #define STREAM_POLICY_FIRST       1
@@ -282,28 +282,28 @@ THREAD_LOCAL Memcap* tcp_memcap = nullptr;
 #define REASSEMBLY_POLICY_VISTA      13
 #define REASSEMBLY_POLICY_DEFAULT    REASSEMBLY_POLICY_BSD
 
-#define S5_MAX_MAX_WINDOW       0x3FFFc000 /* max window allowed by TCP */
+#define STREAM_MAX_MAX_WINDOW       0x3FFFc000 /* max window allowed by TCP */
                                            /* 65535 << 14 (max wscale) */
-#define S5_MIN_MAX_WINDOW       0
+#define STREAM_MIN_MAX_WINDOW       0
 
 #define MAX_PORTS_TO_PRINT      20
 
-#define S5_DEFAULT_MAX_QUEUED_BYTES 1048576 /* 1 MB */
-#define S5_MIN_MAX_QUEUED_BYTES 1024       /* Don't let this go below 1024 */
-#define S5_MAX_MAX_QUEUED_BYTES 0x40000000 /* 1 GB, most we could reach within
+#define STREAM_DEFAULT_MAX_QUEUED_BYTES 1048576 /* 1 MB */
+#define STREAM_MIN_MAX_QUEUED_BYTES 1024       /* Don't let this go below 1024 */
+#define STREAM_MAX_MAX_QUEUED_BYTES 0x40000000 /* 1 GB, most we could reach within
                                             * largest window scale */
 #define AVG_PKT_SIZE            400
-#define S5_DEFAULT_MAX_QUEUED_SEGS (S5_DEFAULT_MAX_QUEUED_BYTES/AVG_PKT_SIZE)
-#define S5_MIN_MAX_QUEUED_SEGS  2          /* Don't let this go below 2 */
-#define S5_MAX_MAX_QUEUED_SEGS  0x40000000 /* 1 GB worth of one-byte segments */
+#define STREAM_DEFAULT_MAX_QUEUED_SEGS (STREAM_DEFAULT_MAX_QUEUED_BYTES/AVG_PKT_SIZE)
+#define STREAM_MIN_MAX_QUEUED_SEGS  2          /* Don't let this go below 2 */
+#define STREAM_MAX_MAX_QUEUED_SEGS  0x40000000 /* 1 GB worth of one-byte segments */
 
-#define S5_DEFAULT_MAX_SMALL_SEG_SIZE 0    /* disabled */
-#define S5_MAX_MAX_SMALL_SEG_SIZE 2048     /* 2048 bytes in single packet, uh, not small */
-#define S5_MIN_MAX_SMALL_SEG_SIZE 0        /* 0 means disabled */
+#define STREAM_DEFAULT_MAX_SMALL_SEG_SIZE 0    /* disabled */
+#define STREAM_MAX_MAX_SMALL_SEG_SIZE 2048     /* 2048 bytes in single packet, uh, not small */
+#define STREAM_MIN_MAX_SMALL_SEG_SIZE 0        /* 0 means disabled */
 
-#define S5_DEFAULT_CONSEC_SMALL_SEGS 0     /* disabled */
-#define S5_MAX_CONSEC_SMALL_SEGS 2048      /* 2048 single byte packets without acks is alot */
-#define S5_MIN_CONSEC_SMALL_SEGS 0         /* 0 means disabled */
+#define STREAM_DEFAULT_CONSEC_SMALL_SEGS 0     /* disabled */
+#define STREAM_MAX_CONSEC_SMALL_SEGS 2048      /* 2048 single byte packets without acks is alot */
+#define STREAM_MIN_CONSEC_SMALL_SEGS 0         /* 0 means disabled */
 
 #define SUB_SYN_SENT  0x01
 #define SUB_ACK_SENT  0x02
@@ -313,11 +313,11 @@ THREAD_LOCAL Memcap* tcp_memcap = nullptr;
 
 #define SLAM_MAX 4
 
-//#define DEBUG_STREAM5
-#ifdef DEBUG_STREAM5
-#define STREAM5_DEBUG_WRAP(x) DEBUG_WRAP(x)
+//#define DEBUG_STREAM_EX
+#ifdef DEBUG_STREAM_EX
+#define STREAM_DEBUG_WRAP(x) DEBUG_WRAP(x)
 #else
-#define STREAM5_DEBUG_WRAP(x)
+#define STREAM_DEBUG_WRAP(x)
 #endif
 
 #define SL_BUF_FLUSHED 1
@@ -382,7 +382,7 @@ static inline bool DataToFlush (const StreamTracker* st)
 }
 
 /*  P R O T O T Y P E S  ********************************************/
-static void Stream5PrintTcpConfig(StreamTcpConfig*);
+static void StreamPrintTcpConfig(StreamTcpConfig*);
 
 static inline void SetupTcpDataBlock(TcpDataBlock *, Packet *);
 static int ProcessTcp(Flow *, Packet *, TcpDataBlock *,
@@ -391,10 +391,10 @@ static inline int CheckFlushPolicyOnData(
     TcpSession *, StreamTracker *, StreamTracker *, Packet *);
 static inline int CheckFlushPolicyOnAck(
     TcpSession *, StreamTracker *, StreamTracker *, Packet *);
-static void Stream5SeglistAddNode(StreamTracker *, StreamSegment *,
+static void StreamSeglistAddNode(StreamTracker *, StreamSegment *,
                 StreamSegment *);
-static int Stream5SeglistDeleteNode(StreamTracker*, StreamSegment*);
-static int Stream5SeglistDeleteNodeTrim(StreamTracker*, StreamSegment*, uint32_t flush_seq);
+static int StreamSeglistDeleteNode(StreamTracker*, StreamSegment*);
+static int StreamSeglistDeleteNodeTrim(StreamTracker*, StreamSegment*, uint32_t flush_seq);
 static int AddStreamNode(
     StreamTracker*, Packet*, TcpDataBlock*,
     int16_t len, uint32_t slide, uint32_t trunc,
@@ -405,10 +405,10 @@ static int DupStreamNode(
     StreamSegment* left,
     StreamSegment** retSeg);
 
-static uint32_t Stream5GetWscale(Packet *, uint16_t *);
-static uint32_t Stream5PacketHasWscale(Packet *);
-static uint32_t Stream5GetMss(Packet *, uint16_t *);
-static uint32_t Stream5GetTcpTimestamp(Packet *, uint32_t *, int strip);
+static uint32_t StreamGetWscale(Packet *, uint16_t *);
+static uint32_t StreamPacketHasWscale(Packet *);
+static uint32_t StreamGetMss(Packet *, uint16_t *);
+static uint32_t StreamGetTcpTimestamp(Packet *, uint32_t *, int strip);
 
 int s5TcpStreamSizeInit(SnortConfig* sc, char *name, char *parameters, void **dataPtr);
 int s5TcpStreamSizeEval(Packet*, const uint8_t **cursor, void *dataPtr);
@@ -439,7 +439,7 @@ static const char* const reassembly_policy_names[] = {
     "IPS"
 };
 
-#ifdef DEBUG_STREAM5
+#ifdef DEBUG_STREAM_EX
 static const char* const state_names[] = {
     "NONE",
     "LISTEN",
@@ -479,7 +479,7 @@ static inline void init_flush_policy(Flow*, StreamTracker* trk)
         trk->flush_policy = STREAM_FLPOLICY_ON_DATA;
 }
 
-bool Stream5IsPafActiveTcp (Flow* lwssn, bool c2s)
+bool StreamIsPafActiveTcp (Flow* lwssn, bool c2s)
 {
     TcpSession* tcpssn = (TcpSession*)lwssn->session;
     StreamSplitter* ss = c2s ? tcpssn->server.splitter : tcpssn->client.splitter;
@@ -487,7 +487,7 @@ bool Stream5IsPafActiveTcp (Flow* lwssn, bool c2s)
     return ss && ss->is_paf();
 }
 
-void Stream5SetSplitterTcp (Flow* lwssn, bool c2s, StreamSplitter* ss)
+void StreamSetSplitterTcp (Flow* lwssn, bool c2s, StreamSplitter* ss)
 {
     TcpSession* tcpssn = (TcpSession*)lwssn->session;
     StreamTracker* trk;
@@ -510,7 +510,7 @@ void Stream5SetSplitterTcp (Flow* lwssn, bool c2s, StreamSplitter* ss)
         s5_paf_setup(&trk->paf_state);
 }
 
-StreamSplitter* Stream5GetSplitterTcp (Flow* lwssn, bool c2s)
+StreamSplitter* StreamGetSplitterTcp (Flow* lwssn, bool c2s)
 {
     TcpSession* tcpssn = (TcpSession*)lwssn->session;
     StreamTracker* trk;
@@ -527,7 +527,7 @@ StreamSplitter* Stream5GetSplitterTcp (Flow* lwssn, bool c2s)
     return trk->splitter;
 }
 
-void Stream5UpdatePerfBaseState(SFBASE *sf_base,
+void StreamUpdatePerfBaseState(SFBASE *sf_base,
                                 Flow *lwssn,
                                 char newState)
 {
@@ -606,7 +606,7 @@ void Stream5UpdatePerfBaseState(SFBASE *sf_base,
     default:
         break;
     }
-    sf_base->stream5_mem_in_use = tcp_memcap->used();
+    sf_base->stream_mem_in_use = tcp_memcap->used();
 }
 
 //-------------------------------------------------------------------------
@@ -660,15 +660,15 @@ StreamTcpConfig::StreamTcpConfig()
     flags = 0;
     flush_factor = 0;
 
-    session_timeout = S5_DEFAULT_SSN_TIMEOUT;
+    session_timeout = STREAM_DEFAULT_SSN_TIMEOUT;
     max_window = 0;
     overlap_limit = 0;
 
-    max_queued_bytes = S5_DEFAULT_MAX_QUEUED_BYTES;
-    max_queued_segs = S5_DEFAULT_MAX_QUEUED_SEGS;
+    max_queued_bytes = STREAM_DEFAULT_MAX_QUEUED_BYTES;
+    max_queued_segs = STREAM_DEFAULT_MAX_QUEUED_SEGS;
 
-    max_consec_small_segs = S5_DEFAULT_CONSEC_SMALL_SEGS;
-    max_consec_small_seg_size = S5_DEFAULT_MAX_SMALL_SEG_SIZE;
+    max_consec_small_segs = STREAM_DEFAULT_CONSEC_SMALL_SEGS;
+    max_consec_small_seg_size = STREAM_DEFAULT_MAX_SMALL_SEG_SIZE;
 
     hs_timeout = -1;
     footprint = 0;
@@ -703,9 +703,9 @@ inline bool StreamTcpConfig::midstream_allowed(Packet* p)
 // make sense of the code in this file.
 //-------------------------------------------------------------------------
 
-static void Stream5PrintTcpConfig(StreamTcpConfig* config)
+static void StreamPrintTcpConfig(StreamTcpConfig* config)
 {
-    LogMessage("Stream5 TCP Policy config:\n");
+    LogMessage("Stream TCP Policy config:\n");
     LogMessage("    Reassembly Policy: %s\n",
         reassembly_policy_names[config->reassembly_policy]);
     LogMessage("    Timeout: %d seconds\n", config->session_timeout);
@@ -726,11 +726,11 @@ static void Stream5PrintTcpConfig(StreamTcpConfig* config)
     if (config->flags)
     {
         LogMessage("    Options:\n");
-        if (config->flags & STREAM5_CONFIG_IGNORE_ANY)
+        if (config->flags & STREAM_CONFIG_IGNORE_ANY)
         {
             LogMessage("        Ignore Any -> Any Rules: YES\n");
         }
-        if (config->flags & STREAM5_CONFIG_NO_ASYNC_REASSEMBLY)
+        if (config->flags & STREAM_CONFIG_NO_ASYNC_REASSEMBLY)
         {
             LogMessage("        Don't queue packets on one-sided sessions: YES\n");
         }
@@ -750,12 +750,12 @@ static void Stream5PrintTcpConfig(StreamTcpConfig* config)
 // attribute table foo
 //-------------------------------------------------------------------------
 
-int Stream5VerifyTcpConfig(SnortConfig*, StreamTcpConfig*)
+int StreamVerifyTcpConfig(SnortConfig*, StreamTcpConfig*)
 {
     return 0;
 }
 
-#ifdef DEBUG_STREAM5
+#ifdef DEBUG_STREAM_EX
 static void PrintStateMgr(StateMgr *s)
 {
     LogMessage("StateMgr:\n");
@@ -818,7 +818,6 @@ static void PrintTcpDataBlock(TcpDataBlock *tdb)
     LogMessage("    end:    0x%08X\n", tdb->end_seq);
 }
 
-#ifdef DEBUG_STREAM5
 static void PrintFlushMgr(FlushMgr *fm)
 {
     if(fm == NULL)
@@ -827,23 +826,22 @@ static void PrintFlushMgr(FlushMgr *fm)
     switch(fm->flush_policy)
     {
         case STREAM_FLPOLICY_IGNORE:
-            STREAM5_DEBUG_WRAP(DebugMessage(
+            STREAM_DEBUG_WRAP(DebugMessage(
                 DEBUG_STREAM_STATE, "    IGNORE\n"););
             break;
 
         case STREAM_FLPOLICY_ON_ACK:
-            STREAM5_DEBUG_WRAP(DebugMessage(
+            STREAM_DEBUG_WRAP(DebugMessage(
                 DEBUG_STREAM_STATE, "    PROTOCOL\n"););
             break;
 
         case STREAM_FLPOLICY_ON_DATA:
-            STREAM5_DEBUG_WRAP(DebugMessage(
+            STREAM_DEBUG_WRAP(DebugMessage(
                 DEBUG_STREAM_STATE, "    PROTOCOL_IPS\n"););
             break;
     }
 }
-#endif  // DEBUG
-#endif  // DEBUG_STREAM5
+#endif  // DEBUG_STREAM_EX
 
 static inline void Discard ()
 {
@@ -964,8 +962,8 @@ static inline void EventInternal (uint32_t eventSid)
 
     tcpStats.internalEvents++;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-        "Stream5 raised internal event %d\n", eventSid););
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        "Stream raised internal event %d\n", eventSid););
 
     SnortEventqAdd(GENERATOR_INTERNAL, eventSid);
 }
@@ -1174,7 +1172,7 @@ static inline void SwapPacketHeaderFoo (TcpSession* tcpssn)
 
 static inline int IsBetween(uint32_t low, uint32_t high, uint32_t cur)
 {
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "(%X, %X, %X) = (low, high, cur)\n", low,high,cur););
 
     /* If we haven't seen anything, ie, low & high are 0, return true */
@@ -1190,7 +1188,7 @@ static inline bool TwoWayTraffic (Flow* lwssn)
     return ( (lwssn->s5_state.session_flags & SSNFLAG_SEEN_BOTH) == SSNFLAG_SEEN_BOTH );
 }
 
-static inline uint32_t Stream5GetWindow(
+static inline uint32_t StreamGetWindow(
     Flow* lwssn, StreamTracker* st, TcpDataBlock* tdb)
 {
     int32_t window;
@@ -1198,7 +1196,7 @@ static inline uint32_t Stream5GetWindow(
     if ( st->l_window )
     {
         // don't use the window if we may have missed scaling
-        if ( !(lwssn->session_state & STREAM5_STATE_MIDSTREAM) )
+        if ( !(lwssn->session_state & STREAM_STATE_MIDSTREAM) )
             return st->l_window;
     }
     // one way zero window is unitialized
@@ -1228,22 +1226,22 @@ static inline int ValidRstSynSent(StreamTracker *st, TcpDataBlock *tdb)
 static inline int ValidRst(
     Flow* lwssn, StreamTracker *st, TcpDataBlock *tdb)
 {
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Checking end_seq (%X) > r_win_base (%X) && "
                 "seq (%X) < r_nxt_ack(%X)\n",
                 tdb->end_seq, st->r_win_base, tdb->seq,
-                st->r_nxt_ack+Stream5GetWindow(lwssn, st, tdb)););
+                st->r_nxt_ack+StreamGetWindow(lwssn, st, tdb)););
 
     switch (st->os_policy)
     {
         case STREAM_POLICY_HPUX11:
             if (SEQ_GEQ(tdb->seq, st->r_nxt_ack))
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "rst is valid seq (>= next seq)!\n"););
                 return 1;
             }
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "rst is not valid seq (>= next seq)!\n"););
             return 0;
             break;
@@ -1257,11 +1255,11 @@ static inline int ValidRst(
         case STREAM_POLICY_IRIX:
             if (SEQ_EQ(tdb->seq, st->r_nxt_ack))
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "rst is valid seq (next seq)!\n"););
                 return 1;
             }
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "rst is not valid seq (next seq)!\n"););
             return 0;
             break;
@@ -1272,21 +1270,21 @@ static inline int ValidRst(
             if(SEQ_GEQ(tdb->end_seq, st->r_win_base))
             {
                 // reset must be admitted when window closed
-                if ( SEQ_LEQ(tdb->seq, st->r_win_base+Stream5GetWindow(lwssn, st, tdb)) )
+                if ( SEQ_LEQ(tdb->seq, st->r_win_base+StreamGetWindow(lwssn, st, tdb)) )
                 {
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "rst is valid seq (within window)!\n"););
                     return 1;
                 }
             }
 
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "rst is not valid seq (within window)!\n"););
             return 0;
             break;
     }
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
         "rst is not valid!\n"););
     return 0;
 }
@@ -1316,10 +1314,10 @@ static inline int ValidTimestamp(StreamTracker *talker,
     if((talker->flags & TF_TSTAMP) && (listener->flags & TF_TSTAMP))
     {
         char validate_timestamp = 1;
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Checking timestamps for PAWS\n"););
 
-        *got_ts = Stream5GetTcpTimestamp(p, &tdb->ts, 0);
+        *got_ts = StreamGetTcpTimestamp(p, &tdb->ts, 0);
 
         if (*got_ts)
         {
@@ -1379,7 +1377,7 @@ static inline int ValidTimestamp(StreamTracker *talker,
 
                 if(result < 0)
                 {
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "Packet outside PAWS window, dropping\n"););
                     /* bail, we've got a packet outside the PAWS window! */
                     //Discard();
@@ -1391,7 +1389,7 @@ static inline int ValidTimestamp(StreamTracker *talker,
                         ((uint32_t)p->pkth->ts.tv_sec > talker->ts_last_pkt+PAWS_24DAYS))
                 {
                     /* this packet is from way too far into the future */
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "packet PAWS timestamp way too far ahead of"
                                 "last packet %d %d...\n", p->pkth->ts.tv_sec,
                                 talker->ts_last_pkt););
@@ -1402,7 +1400,7 @@ static inline int ValidTimestamp(StreamTracker *talker,
                 }
                 else
                 {
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "packet PAWS ok...\n"););
                 }
             }
@@ -1415,7 +1413,7 @@ static inline int ValidTimestamp(StreamTracker *talker,
              * but continue to process the packet
              */
             *eventcode |= EVENT_NO_TIMESTAMP;
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "packet no timestamp, had one earlier from this side...ok for now...\n"););
 
             if (listener->config->policy == STREAM_POLICY_SOLARIS)
@@ -1430,7 +1428,7 @@ static inline int ValidTimestamp(StreamTracker *talker,
     }
     else if ( p->ptrs.tcph->is_syn_only() )
     {
-        *got_ts = Stream5GetTcpTimestamp(p, &tdb->ts, 0);
+        *got_ts = StreamGetTcpTimestamp(p, &tdb->ts, 0);
         if ( *got_ts )
             talker->flags |= TF_TSTAMP;
     }
@@ -1441,9 +1439,9 @@ static inline int ValidTimestamp(StreamTracker *talker,
         // (nop) the timestamp option.  this includes the cases where
         // we disable timestamp handling.
         int strip = ( SetupOK(talker) && SetupOK(listener) );
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "listener not doing timestamps...\n"););
-        *got_ts = Stream5GetTcpTimestamp(p, &tdb->ts, strip);
+        *got_ts = StreamGetTcpTimestamp(p, &tdb->ts, strip);
 
         if (*got_ts)
         {
@@ -1474,7 +1472,7 @@ static inline int ValidTimestamp(StreamTracker *talker,
                     /* Old Linux & Windows allows a 0 timestamp value. */
                     break;
                 default:
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "Packet with 0 timestamp, dropping\n"););
                     //Discard();
                     /* bail */
@@ -1506,7 +1504,7 @@ static inline int ValidTimestamp(StreamTracker *talker,
 static inline int ValidSeq(
     const Packet* p, Flow* lwssn, StreamTracker *st, TcpDataBlock *tdb)
 {
-    uint32_t win = Stream5GetWindow(lwssn, st, tdb);
+    uint32_t win = StreamGetWindow(lwssn, st, tdb);
 
     if ( !p->dsize )
     {
@@ -1534,11 +1532,11 @@ static inline int ValidSeq(
     int right_ok;
     uint32_t left_seq;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Checking end_seq (%X) > r_win_base (%X) && "
                 "seq (%X) < r_nxt_ack(%X)\n",
                 tdb->end_seq, st->r_win_base, tdb->seq,
-                st->r_nxt_ack+Stream5GetWindow(lwssn, st, tdb)););
+                st->r_nxt_ack+StreamGetWindow(lwssn, st, tdb)););
 
     if ( SEQ_LT(st->r_nxt_ack, st->r_win_base) )
         left_seq = st->r_nxt_ack;
@@ -1552,23 +1550,23 @@ static inline int ValidSeq(
 
     if ( right_ok )
     {
-        uint32_t win = Stream5GetWindow(lwssn, st, tdb);
+        uint32_t win = StreamGetWindow(lwssn, st, tdb);
 
         if( SEQ_LEQ(tdb->seq, st->r_win_base+win) )
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "seq is within window!\n"););
             return 1;
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "seq is past the end of the window!\n"););
         }
     }
     else
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "end_seq is before win_base\n"););
     }
     return 0;
@@ -1683,7 +1681,7 @@ static inline void SetupTcpDataBlock(TcpDataBlock *tdb, Packet *p)
     // we will bump if/when fin is processed
 
 
-#ifdef DEBUG_STREAM5
+#ifdef DEBUG_STREAM_EX
     PrintTcpDataBlock(&tdb);
 #endif
 }
@@ -1692,7 +1690,7 @@ static void SegmentFree (StreamSegment *seg)
 {
     unsigned dropped = sizeof(StreamSegment);
 
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
         "Dumping segment at seq %X, size %d, caplen %d\n",
         seg->seq, seg->size, seg->caplen););
 
@@ -1703,7 +1701,7 @@ static void SegmentFree (StreamSegment *seg)
     free(seg);
     tcpStats.segs_released++;
 
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
         "SegmentFree dropped %d bytes\n", dropped););
 }
 
@@ -1713,7 +1711,7 @@ static void DeleteSeglist(StreamSegment *listhead)
     StreamSegment *dump_me;
     int i = 0;
 
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                 "In DeleteSeglist\n"););
     while(idx)
     {
@@ -1723,7 +1721,7 @@ static void DeleteSeglist(StreamSegment *listhead)
         SegmentFree(dump_me);
     }
 
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                 "Dropped %d segments\n", i););
 }
 
@@ -1735,7 +1733,7 @@ static inline int purge_alerts(
 
     for (i=0;i<st->alert_count;i++)
     {
-        Stream5AlertInfo* ai = st->alerts + i;
+        StreamAlertInfo* ai = st->alerts + i;
 
         if (SEQ_LT(ai->seq, flush_seq) )
         {
@@ -1769,7 +1767,7 @@ static inline int purge_to_seq(TcpSession *tcpssn, StreamTracker *st, uint32_t f
     {
         if ( SEQ_LT(st->seglist_base_seq, flush_seq) )
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "setting st->seglist_base_seq to 0x%X\n", flush_seq););
             st->seglist_base_seq = flush_seq;
         }
@@ -1778,12 +1776,12 @@ static inline int purge_to_seq(TcpSession *tcpssn, StreamTracker *st, uint32_t f
 
     ss = st->seglist;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "In purge_to_seq, start seq = 0x%X end seq = 0x%X delta %d\n",
                 ss->seq, flush_seq, flush_seq-ss->seq););
     while(ss)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "s: %X  sz: %d\n", ss->seq, ss->size););
         dump_me = ss;
 
@@ -1794,7 +1792,7 @@ static inline int purge_to_seq(TcpSession *tcpssn, StreamTracker *st, uint32_t f
             {
                 last_ts = dump_me->ts;
             }
-            purged_bytes += Stream5SeglistDeleteNodeTrim(st, dump_me, flush_seq);
+            purged_bytes += StreamSeglistDeleteNodeTrim(st, dump_me, flush_seq);
         }
         else
             break;
@@ -1802,7 +1800,7 @@ static inline int purge_to_seq(TcpSession *tcpssn, StreamTracker *st, uint32_t f
 
     if ( SEQ_LT(st->seglist_base_seq, flush_seq) )
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
             "setting st->seglist_base_seq to 0x%X\n", flush_seq););
         st->seglist_base_seq = flush_seq;
     }
@@ -1896,8 +1894,8 @@ static inline int purge_flushed_ackd (TcpSession *tcpssn, StreamTracker *st)
 
 static void ShowRebuiltPacket (TcpSession* ssn, Packet* pkt)
 {
-    if ( (ssn->client.config->flags & STREAM5_CONFIG_SHOW_PACKETS) ||
-         (ssn->server.config->flags & STREAM5_CONFIG_SHOW_PACKETS) )
+    if ( (ssn->client.config->flags & STREAM_CONFIG_SHOW_PACKETS) ||
+         (ssn->server.config->flags & STREAM_CONFIG_SHOW_PACKETS) )
     {
 #ifdef REG_TEST
         printf("+++++++++++++++++++Stream Packet+++++++++++++++++++++\n");
@@ -1937,7 +1935,7 @@ static int FlushStream(
     const uint8_t *flushbuf_end)
 {
     uint16_t bytes_flushed = 0;
-    STREAM5_DEBUG_WRAP(uint32_t bytes_queued = st->seg_bytes_logical;);
+    STREAM_DEBUG_WRAP(uint32_t bytes_queued = st->seg_bytes_logical;);
     uint32_t segs = 0;
     uint32_t flags = PKT_PDU_HEAD;
     PROFILE_VARS;
@@ -1955,7 +1953,7 @@ static int FlushStream(
         unsigned bytes_copied = 0;
         assert(bytes_to_copy);
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
             "Flushing %u bytes from %X\n", bytes_to_copy, ss->seq));
 
         if ( 
@@ -2037,8 +2035,8 @@ static int FlushStream(
             break;
     }
 
-    STREAM5_DEBUG_WRAP(bytes_queued -= bytes_flushed;);
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(bytes_queued -= bytes_flushed;);
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
         "flushed %d bytes / %d segs on stream, "
         "%d still queued\n",
         bytes_flushed, segs, bytes_queued););
@@ -2092,7 +2090,7 @@ static inline int _flush_to_seq (
 
         if(footprint == 0)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Negative footprint, bailing %d (0x%X - 0x%X)\n",
                         footprint, stop_seq, st->seglist_base_seq););
             MODULE_PROFILE_END(s5TcpFlushPerfStats);
@@ -2100,10 +2098,10 @@ static inline int _flush_to_seq (
             return bytes_processed;
         }
 
-#ifdef DEBUG_STREAM5
+#ifdef DEBUG_STREAM_EX
         if(footprint < st->seg_bytes_logical)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Footprint less than queued bytes, "
                         "win_base: 0x%X base_seq: 0x%X\n",
                         stop_seq, st->seglist_base_seq););
@@ -2117,7 +2115,7 @@ static inline int _flush_to_seq (
             stop_seq = st->seglist_base_seq + footprint;
         }
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Attempting to flush %lu bytes\n", footprint););
 
         ((DAQ_PktHdr_t*)s5_pkt->pkth)->ts.tv_sec = st->seglist_next->tv.tv_sec;
@@ -2171,7 +2169,7 @@ static inline int _flush_to_seq (
 
         st->seglist_base_seq += flushed_bytes;
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
             "setting st->seglist_base_seq to 0x%X\n", st->seglist_base_seq););
 
         if ( st->splitter )
@@ -2194,26 +2192,26 @@ static inline int flush_to_seq(
     TcpSession *tcpssn, StreamTracker *st, uint32_t bytes, Packet *p,
     uint32_t dir)
 {
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "In flush_to_seq()\n"););
 
     if ( !bytes )
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "bailing, no data\n"););
         return 0;
     }
 
     if ( !st->seglist_next )
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "bailing, bad seglist ptr\n"););
         return 0;
     }
 
     if (!DataToFlush(st) && !(st->flags & TF_FORCE_FLUSH))
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "only 1 packet in seglist no need to flush\n"););
         return 0;
     }
@@ -2326,7 +2324,7 @@ static inline int flush_stream(
     return flush_ackd(tcpssn, st, p, dir);
 }
 
-int Stream5FlushServer(Packet *p, Flow *lwssn)
+int StreamFlushServer(Packet *p, Flow *lwssn)
 {
     int flushed;
     TcpSession* tcpssn = (TcpSession*)lwssn->session;
@@ -2354,7 +2352,7 @@ int Stream5FlushServer(Packet *p, Flow *lwssn)
     return flushed;
 }
 
-int Stream5FlushClient(Packet *p, Flow *lwssn)
+int StreamFlushClient(Packet *p, Flow *lwssn)
 {
     int flushed;
     TcpSession* tcpssn = (TcpSession*)lwssn->session;
@@ -2382,7 +2380,7 @@ int Stream5FlushClient(Packet *p, Flow *lwssn)
     return flushed;
 }
 
-int Stream5FlushListener(Packet *p, Flow *lwssn)
+int StreamFlushListener(Packet *p, Flow *lwssn)
 {
     StreamTracker *listener = NULL;
     int dir = 0;
@@ -2394,7 +2392,7 @@ int Stream5FlushListener(Packet *p, Flow *lwssn)
      * looked at it, so the packet_flags are already set. */
     if(p->packet_flags & PKT_FROM_SERVER)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Flushing listener on packet from server\n"););
         listener = &tcpssn->client;
         /* dir of flush is the data from the opposite side */
@@ -2402,7 +2400,7 @@ int Stream5FlushListener(Packet *p, Flow *lwssn)
     }
     else if (p->packet_flags & PKT_FROM_CLIENT)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Flushing listener on packet from client\n"););
         listener = &tcpssn->server;
         /* dir of flush is the data from the opposite side */
@@ -2423,7 +2421,7 @@ int Stream5FlushListener(Packet *p, Flow *lwssn)
     return flushed;
 }
 
-int Stream5FlushTalker(Packet *p, Flow *lwssn)
+int StreamFlushTalker(Packet *p, Flow *lwssn)
 {
     StreamTracker *talker = NULL;
     int dir = 0;
@@ -2435,7 +2433,7 @@ int Stream5FlushTalker(Packet *p, Flow *lwssn)
      * looked at it, so the packet_flags are already set. */
     if(p->packet_flags & PKT_FROM_SERVER)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Flushing talker on packet from server\n"););
         talker = &tcpssn->server;
         /* dir of flush is the data from the opposite side */
@@ -2443,7 +2441,7 @@ int Stream5FlushTalker(Packet *p, Flow *lwssn)
     }
     else if (p->packet_flags & PKT_FROM_CLIENT)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Flushing talker on packet from client\n"););
         talker = &tcpssn->client;
         /* dir of flush is the data from the opposite side */
@@ -2466,11 +2464,11 @@ int Stream5FlushTalker(Packet *p, Flow *lwssn)
 
 static void TcpSessionClear (Flow* lwssn, TcpSession* tcpssn, int freeApplicationData)
 {
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                 "In TcpSessionClear, %lu bytes in use\n", tcp_memcap->used()););
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                 "client has %d segs queued\n", tcpssn->client.seg_count););
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                 "server has %d segs queued\n", tcpssn->server.seg_count););
 
     // update stats
@@ -2481,7 +2479,7 @@ static void TcpSessionClear (Flow* lwssn, TcpSession* tcpssn, int freeApplicatio
     else
         return;
 
-    Stream5UpdatePerfBaseState(&sfBase, tcpssn->flow, TCP_STATE_CLOSED);
+    StreamUpdatePerfBaseState(&sfBase, tcpssn->flow, TCP_STATE_CLOSED);
     RemoveStreamSession(&sfBase);
 
     if (lwssn->s5_state.session_flags & SSNFLAG_PRUNED)
@@ -2519,7 +2517,7 @@ static void TcpSessionClear (Flow* lwssn, TcpSession* tcpssn, int freeApplicatio
     // generate event for rate filtering
     EventInternal(INTERNAL_EVENT_SESSION_DEL);
 
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                 "After cleaning, %lu bytes in use\n", tcp_memcap->used()););
 
     memset(&tcpssn->client, 0, sizeof(tcpssn->client));
@@ -2537,7 +2535,7 @@ static void TcpSessionCleanup(Flow *lwssn, int freeApplicationData)
         int flushed;
 
         /* Flush the client */
-        if (tcpssn->client.seglist && !(lwssn->s5_state.ignore_direction & SSN_DIR_SERVER) )
+        if (tcpssn->client.seglist && !(lwssn->s5_state.ignore_direction & SSN_DIR_FROM_SERVER) )
         {
             DAQ_PktHdr_t* const tmp_pcap_hdr = const_cast<DAQ_PktHdr_t*>(cleanup_pkt->pkth);
             tcpStats.s5tcp1++;
@@ -2566,7 +2564,7 @@ static void TcpSessionCleanup(Flow *lwssn, int freeApplicationData)
         }
 
         /* Flush the server */
-        if (tcpssn->server.seglist && !(lwssn->s5_state.ignore_direction & SSN_DIR_CLIENT) )
+        if (tcpssn->server.seglist && !(lwssn->s5_state.ignore_direction & SSN_DIR_FROM_CLIENT) )
         {
             DAQ_PktHdr_t* const tmp_pcap_hdr = const_cast<DAQ_PktHdr_t*>(cleanup_pkt->pkth);
             tcpStats.s5tcp2++;
@@ -2793,9 +2791,9 @@ static inline void S5TraceTCP (
 #define S5TraceTCP(pkt, flow, tdb, evt)
 #endif  // REG_TEST
 
-static uint32_t Stream5GetTcpTimestamp(Packet *p, uint32_t *ts, int strip)
+static uint32_t StreamGetTcpTimestamp(Packet *p, uint32_t *ts, int strip)
 {
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Getting timestamp...\n"););
 
     TcpOptIterator iter(p->ptrs.tcph, p);
@@ -2812,7 +2810,7 @@ static uint32_t Stream5GetTcpTimestamp(Packet *p, uint32_t *ts, int strip)
             else
             {
                 *ts = EXTRACT_32BITS(opt.data);
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "Found timestamp %lu\n", *ts););
 
                 return TF_TSTAMP;
@@ -2821,15 +2819,15 @@ static uint32_t Stream5GetTcpTimestamp(Packet *p, uint32_t *ts, int strip)
     }
     *ts = 0;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "No timestamp...\n"););
 
     return TF_NONE;
 }
 
-static uint32_t Stream5GetMss(Packet *p, uint16_t *value)
+static uint32_t StreamGetMss(Packet *p, uint16_t *value)
 {
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Getting MSS...\n"););
 
     TcpOptIterator iter(p->ptrs.tcph, p);
@@ -2838,7 +2836,7 @@ static uint32_t Stream5GetMss(Packet *p, uint16_t *value)
         if(opt.code == TcpOptCode::MAXSEG)
         {
             *value = EXTRACT_16BITS(opt.data);
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "Found MSS %u\n", *value););
             return TF_MSS;
         }
@@ -2846,14 +2844,14 @@ static uint32_t Stream5GetMss(Packet *p, uint16_t *value)
 
     *value = 0;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "No MSS...\n"););
     return TF_NONE;
 }
 
-static uint32_t Stream5GetWscale(Packet *p, uint16_t *value)
+static uint32_t StreamGetWscale(Packet *p, uint16_t *value)
 {
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Getting wscale...\n"););
 
 
@@ -2865,7 +2863,7 @@ static uint32_t Stream5GetWscale(Packet *p, uint16_t *value)
         if(opt.code == TcpOptCode::WSCALE)
         {
             *value = (uint16_t) opt.data[0];
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "Found wscale %d\n", *value););
 
             /* If scale specified in option is larger than 14,
@@ -2884,18 +2882,18 @@ static uint32_t Stream5GetWscale(Packet *p, uint16_t *value)
     }
 
     *value = 0;
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "No wscale...\n"););
     return TF_NONE;
 }
 
-static uint32_t Stream5PacketHasWscale(Packet *p)
+static uint32_t StreamPacketHasWscale(Packet *p)
 {
     uint16_t wscale;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Checking for wscale...\n"););
-    return Stream5GetWscale(p, &wscale);
+    return StreamGetWscale(p, &wscale);
 }
 
 #if 0
@@ -2928,10 +2926,10 @@ static void FinishServerInit(Packet *p, TcpDataBlock *tdb, TcpSession *ssn)
     if ( p->ptrs.tcph->th_flags & TH_FIN )
         server->l_nxt_seq--;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                "seglist_base_seq = %X\n", client->seglist_base_seq););
 
-    if (!(ssn->flow->session_state & STREAM5_STATE_MIDSTREAM))
+    if (!(ssn->flow->session_state & STREAM_STATE_MIDSTREAM))
     {
         server->s_mgr.state = TCP_STATE_SYN_RCVD;
         client->seglist_base_seq = server->l_unackd;
@@ -2942,15 +2940,15 @@ static void FinishServerInit(Packet *p, TcpDataBlock *tdb, TcpSession *ssn)
         client->seglist_base_seq = tdb->seq;
         client->r_win_base = tdb->seq;
     }
-    server->flags |= Stream5GetTcpTimestamp(p, &server->ts_last, 0);
+    server->flags |= StreamGetTcpTimestamp(p, &server->ts_last, 0);
     if (server->ts_last == 0)
         server->flags |= TF_TSTAMP_ZERO;
     else
         server->ts_last_pkt = p->pkth->ts.tv_sec;
-    server->flags |= Stream5GetMss(p, &server->mss);
-    server->flags |= Stream5GetWscale(p, &server->wscale);
+    server->flags |= StreamGetMss(p, &server->mss);
+    server->flags |= StreamGetWscale(p, &server->wscale);
 
-#ifdef DEBUG_STREAM5
+#ifdef DEBUG_STREAM_EX
     PrintTcpSession(ssn);
 #endif
 }
@@ -2962,7 +2960,7 @@ static void NewQueue(
     uint32_t overlap = 0;
     PROFILE_VARS;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "In NewQueue\n"););
 
     MODULE_PROFILE_START(s5TcpInsertPerfStats);
@@ -2977,12 +2975,12 @@ static void NewQueue(
         /* new packet seq is below the last ack... */
         if ( SEQ_GT(st->r_win_base, seq) )
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "segment overlaps ack'd data...\n"););
             overlap = st->r_win_base - tdb->seq;
             if(overlap >= p->dsize)
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "full overlap on ack'd data, dropping segment\n"););
                 MODULE_PROFILE_END(s5TcpInsertPerfStats);
                 return;
@@ -2991,7 +2989,7 @@ static void NewQueue(
 
         AddStreamNode(st, p, tdb, p->dsize, overlap, 0, tdb->seq+overlap, NULL, &ss);
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Attached new queue to seglist, %d bytes queued, "
                     "base_seq 0x%X\n",
                     ss->size, st->seglist_base_seq););
@@ -3003,7 +3001,7 @@ static void NewQueue(
 
 static inline int SegmentFastTrack(StreamSegment *tail, TcpDataBlock *tdb)
 {
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Checking seq for fast track: %X > %X\n", tdb->seq,
                 tail->seq + tail->size););
 
@@ -3067,23 +3065,23 @@ static int AddStreamNode(
          * zero size data because of trimming.  Don't
          * insert it
          */
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "zero size TCP data after left & right trimming "
                     "(len: %d slide: %d trunc: %d)\n",
                     len, slide, trunc););
         Discard();
         NormalTrimPayloadIf(p, NORM_TCP_TRIM, 0, tdb);
 
-#ifdef DEBUG_STREAM5
+#ifdef DEBUG_STREAM_EX
         {
             StreamSegment *idx = st->seglist;
             unsigned long i = 0;
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Dumping seglist, %d segments\n", st->seg_count););
             while (idx)
             {
                 i++;
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "%d  ptr: %p  seq: 0x%X  size: %d nxt: %p prv: %p\n",
                         i, idx, idx->seq, idx->size, idx->next, idx->prev););
 
@@ -3147,7 +3145,7 @@ static int AddStreamNode(
         }
     }
 
-    Stream5SeglistAddNode(st, left, ss);
+    StreamSeglistAddNode(st, left, ss);
     st->seg_bytes_logical += ss->size;
     st->seg_bytes_total += ss->caplen;  /* Includes protocol headers and payload */
     st->total_segs_queued++;
@@ -3155,7 +3153,7 @@ static int AddStreamNode(
 
     p->packet_flags |= PKT_STREAM_INSERT;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "added %d bytes on segment list @ seq: 0x%X, total %lu, "
                 "%d segments queued\n", ss->size, ss->seq,
                 st->seg_bytes_logical, SegsToFlush(st, 0)););
@@ -3186,12 +3184,12 @@ static int DupStreamNode(Packet *p,
     ss->size = left->size;
     ss->seq = left->seq;
 
-    Stream5SeglistAddNode(st, left, ss);
+    StreamSeglistAddNode(st, left, ss);
     st->seg_bytes_total += ss->caplen;
     st->total_segs_queued++;
     //st->total_bytes_queued += ss->size;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "added %d bytes on segment list @ seq: 0x%X, total %lu, "
                 "%d segments queued\n", ss->size, ss->seq,
                 st->seg_bytes_logical, SegsToFlush(st, 0)););
@@ -3255,7 +3253,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
     uint16_t rsize = p->dsize;
     uint32_t rseq = tdb->seq;
     PROFILE_VARS;
-    STREAM5_DEBUG_WRAP(
+    STREAM_DEBUG_WRAP(
         StreamSegment *lastptr = NULL;
         uint32_t base_seq = st->seglist_base_seq;
         int last = 0;
@@ -3267,16 +3265,16 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
     else
         reassembly_policy = st->reassembly_policy;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Queuing %d bytes on stream!\n"
                 "base_seq: %X seq: %X  seq_end: %X\n",
                 seq_end - seq, base_seq, seq, seq_end););
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "%d segments on seglist\n", SegsToFlush(st, 0)););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+\n"););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+\n"););
 
     MODULE_PROFILE_START(s5TcpInsertPerfStats);
@@ -3288,7 +3286,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
         left = st->seglist_tail;
         right = NULL;
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
             "Fast tracking segment! (tail_seq %X size %d)\n",
             st->seglist_tail->seq, st->seglist_tail->size););
 
@@ -3330,7 +3328,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
         /* Start iterating at the head (left) */
         for(ss = st->seglist; ss; ss = ss->next)
         {
-            STREAM5_DEBUG_WRAP(
+            STREAM_DEBUG_WRAP(
                 DebugMessage(DEBUG_STREAM_STATE,
                     "ss: %p  seq: 0x%X  size: %lu delta: %d\n",
                     ss, ss->seq, ss->size, (ss->seq-base_seq) - last);
@@ -3358,7 +3356,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
         /* Start iterating at the tail (right) */
         for(ss = st->seglist_tail; ss; ss = ss->prev)
         {
-            STREAM5_DEBUG_WRAP(
+            STREAM_DEBUG_WRAP(
                 DebugMessage(DEBUG_STREAM_STATE,
                     "ss: %p  seq: 0x%X  size: %lu delta: %d\n",
                     ss, ss->seq, ss->size, (ss->seq-base_seq) - last);
@@ -3382,12 +3380,12 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
             left = NULL;
     }
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+\n"););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+!+\n"););
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "left: %p:0x%X  right: %p:0x%X\n", left,
                 left?left->seq:0, right, right?right->seq:0););
 
@@ -3402,7 +3400,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
         /* check if the new segment overlaps on the left side */
         overlap = left->seq + left->size - seq;
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "left overlap %d\n", overlap););
 
         if(overlap > 0)
@@ -3424,7 +3422,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                 case REASSEMBLY_POLICY_IRIX:
                 case REASSEMBLY_POLICY_OLD_LINUX:
                 case REASSEMBLY_POLICY_MACOS:
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "left overlap, honoring old data\n"););
                     if ( ips_data )
                     {
@@ -3468,7 +3466,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                         /* New packet is entirely overlapped by an
                          * existing packet on both sides.  Drop the
                          * new data. */
-                        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                     "left overlap, honoring old data\n"););
                         seq += overlap;
                         //slide = overlap;
@@ -3488,7 +3486,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                     /* Otherwise, trim the old data accordingly */
                     left->size -= (int16_t)overlap;
                     st->seg_bytes_logical -= overlap;
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "left overlap, honoring new data\n"););
                     break;
                 case REASSEMBLY_POLICY_LAST:
@@ -3526,14 +3524,14 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                         st->seg_bytes_logical -= overlap;
                     }
 
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "left overlap, honoring new data\n"););
                     break;
             }
 
             if(SEQ_LEQ(seq_end, seq))
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "seq_end < seq"););
                 /*
                  * houston, we have a problem
@@ -3547,7 +3545,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "No left overlap\n"););
         }
     }
@@ -3560,7 +3558,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
         //overlap = right->size - (right->seq - seq);
         //right->seq + right->size - seq_end;
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "right overlap(%d): len: %d right->seq: 0x%X seq: 0x%X\n",
                     overlap, len, right->seq, seq););
 
@@ -3577,7 +3575,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
             tcpStats.overlaps++;
             st->overlap_count++;
 
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Got partial right overlap\n"););
 
             switch(reassembly_policy)
@@ -3656,7 +3654,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                 continue;
             }
 
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Got full right overlap\n"););
 
             tcpStats.overlaps++;
@@ -3676,11 +3674,11 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                     {
                         dump_me = right;
 
-                        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                     "retrans, dropping old data at seq %d, size %d\n",
                                     right->seq, right->size););
                         right = right->next;
-                        Stream5SeglistDeleteNode(st, dump_me);
+                        StreamSeglistDeleteNode(st, dump_me);
                         break;
                     }
                     else
@@ -3711,7 +3709,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                     /* Fall through */
                 case REASSEMBLY_POLICY_FIRST:
                 case REASSEMBLY_POLICY_VISTA:
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "Got full right overlap, truncating new\n"););
                     if ( ips_data )
                     {
@@ -3732,7 +3730,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                         /* Adjusted seq is fully overlapped */
                         if (SEQ_EQ(seq, seq_end))
                         {
-                            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                         "StreamQueue got full right overlap with "
                                         "resulting seq too high, bad segment "
                                         "(seq: %X  seq_end: %X overlap: %lu\n",
@@ -3791,7 +3789,7 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                         trunc += overlap;
                         if(SEQ_LEQ((int)(seq_end - trunc), seq))
                         {
-                            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "StreamQueue got full right overlap with "
                                 "resulting seq too high, bad segment "
                                 "(seq: %X  seq_end: %X overlap: %lu\n",
@@ -3807,11 +3805,11 @@ static int StreamQueue(StreamTracker *st, Packet *p, TcpDataBlock *tdb,
                 case REASSEMBLY_POLICY_OLD_LINUX:
                 case REASSEMBLY_POLICY_LAST:
 right_overlap_last:
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "Got full right overlap of old, dropping old\n"););
                     dump_me = right;
                     right = right->next;
-                    Stream5SeglistDeleteNode(st, dump_me);
+                    StreamSeglistDeleteNode(st, dump_me);
                     break;
             }
         }
@@ -3826,11 +3824,11 @@ right_overlap_last:
     }
     else
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Fully truncated right overlap\n"););
     }
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "StreamQueue returning normally\n"););
 
     MODULE_PROFILE_END(s5TcpInsertPerfStats);
@@ -3842,7 +3840,7 @@ static void ProcessTcpStream(StreamTracker *rcv, TcpSession *tcpssn,
                              StreamTcpConfig* config)
 {
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "In ProcessTcpStream(), %d bytes to queue\n", p->dsize););
 
     if ( p->packet_flags & PKT_IGNORE )
@@ -3852,7 +3850,7 @@ static void ProcessTcpStream(StreamTracker *rcv, TcpSession *tcpssn,
     SetPacketHeaderFoo(tcpssn, p);
 #endif
 
-    if ((config->flags & STREAM5_CONFIG_NO_ASYNC_REASSEMBLY) &&
+    if ((config->flags & STREAM_CONFIG_NO_ASYNC_REASSEMBLY) &&
         !TwoWayTraffic(tcpssn->flow))
     {
         return;
@@ -3898,13 +3896,13 @@ static void ProcessTcpStream(StreamTracker *rcv, TcpSession *tcpssn,
     {
         if(rcv->flush_policy == STREAM_FLPOLICY_IGNORE)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Ignoring segment due to IGNORE flush_policy\n"););
             return;
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "queuing segment\n"););
 
             if ( SEQ_GT(rcv->r_win_base, tdb->seq) )
@@ -3930,12 +3928,12 @@ static void ProcessTcpStream(StreamTracker *rcv, TcpSession *tcpssn,
             if ((rcv->config->overlap_limit) &&
                 (rcv->overlap_count > rcv->config->overlap_limit))
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Reached the overlap limit.  Flush the data "
                         "and kill the session if configured\n"););
                 if (p->packet_flags & PKT_FROM_CLIENT)
                 {
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Flushing data on packet from the client\n"););
                     flush_stream(tcpssn, rcv, p, PKT_FROM_CLIENT);
 
@@ -3943,7 +3941,7 @@ static void ProcessTcpStream(StreamTracker *rcv, TcpSession *tcpssn,
                 }
                 else
                 {
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Flushing data on packet from the server\n"););
                     flush_stream(tcpssn, rcv, p, PKT_FROM_SERVER);
 
@@ -3962,13 +3960,13 @@ static void ProcessTcpStream(StreamTracker *rcv, TcpSession *tcpssn,
     {
         if(rcv->flush_policy == STREAM_FLPOLICY_IGNORE)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "Ignoring segment due to IGNORE flush_policy\n"););
             return;
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "queuing segment\n"););
             NewQueue(rcv, p, tdb);
         }
@@ -3983,30 +3981,30 @@ static int ProcessTcpData(
 {
     PROFILE_VARS;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "In ProcessTcpData()\n"););
 
     MODULE_PROFILE_START(s5TcpDataPerfStats);
     if ((p->ptrs.tcph->th_flags & TH_SYN) && (listener->os_policy != STREAM_POLICY_MACOS))
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Bailing, data on SYN, not MAC Policy!\n"););
         NormalTrimPayloadIf(p, NORM_TCP_TRIM, 0, tdb);
         MODULE_PROFILE_END(s5TcpDataPerfStats);
-        return S5_UNALIGNED;
+        return STREAM_UNALIGNED;
     }
 
     /* we're aligned, so that's nice anyway */
     if(tdb->seq == listener->r_nxt_ack)
     {
         /* check if we're in the window */
-        if(Stream5GetWindow(tcpssn->flow, listener, tdb) == 0)
+        if(StreamGetWindow(tcpssn->flow, listener, tdb) == 0)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Bailing, we're out of the window!\n"););
             NormalTrimPayloadIf(p, NORM_TCP_TRIM, 0, tdb);
             MODULE_PROFILE_END(s5TcpDataPerfStats);
-            return S5_UNALIGNED;
+            return STREAM_UNALIGNED;
         }
 
         /* move the ack boundry up, this is the only way we'll accept data */
@@ -4023,7 +4021,7 @@ static int ProcessTcpData(
             /* set flags to session flags */
 
             MODULE_PROFILE_END(s5TcpDataPerfStats);
-            return S5_ALIGNED;
+            return STREAM_ALIGNED;
         }
     }
     else
@@ -4038,20 +4036,20 @@ static int ProcessTcpData(
          * See HP, Solaris, et al. for those that favor
          * duplicate data over the original in some cases.
          */
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "out of order segment (tdb->seq: 0x%X "
                     "l->r_nxt_ack: 0x%X!\n", tdb->seq, listener->r_nxt_ack););
 
         if (listener->s_mgr.state_queue == TCP_STATE_NONE)
         {
             /* check if we're in the window */
-            if(Stream5GetWindow(tcpssn->flow, listener, tdb) == 0)
+            if(StreamGetWindow(tcpssn->flow, listener, tdb) == 0)
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "Bailing, we're out of the window!\n"););
                 NormalTrimPayloadIf(p, NORM_TCP_TRIM, 0, tdb);
                 MODULE_PROFILE_END(s5TcpDataPerfStats);
-                return S5_UNALIGNED;
+                return STREAM_UNALIGNED;
             }
 
             if ((listener->s_mgr.state == TCP_STATE_ESTABLISHED) &&
@@ -4079,7 +4077,7 @@ static int ProcessTcpData(
     }
 
     MODULE_PROFILE_END(s5TcpDataPerfStats);
-    return S5_UNALIGNED;
+    return STREAM_UNALIGNED;
 }
 
 void SetTcpReassemblyPolicy(StreamTracker *st)
@@ -4211,7 +4209,7 @@ static void NewTcpSession(
     }
 
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "adding TcpSession to lightweight session\n"););
         lwssn->protocol = p->type();
         tmp->flow = lwssn;
@@ -4257,15 +4255,15 @@ static void NewTcpSession(
         init_flush_policy(lwssn, &tmp->server);
         init_flush_policy(lwssn, &tmp->client);
 
-#ifdef DEBUG_STREAM5
+#ifdef DEBUG_STREAM_EX
         PrintTcpSession(tmp);
 #endif
         lwssn->set_expire(p, dstPolicy->session_timeout);
 
         AddStreamSession(
-            &sfBase, lwssn->session_state & STREAM5_STATE_MIDSTREAM ? SSNFLAG_MIDSTREAM : 0);
+            &sfBase, lwssn->session_state & STREAM_STATE_MIDSTREAM ? SSNFLAG_MIDSTREAM : 0);
 
-        Stream5UpdatePerfBaseState(&sfBase, tmp->flow, TCP_STATE_SYN_SENT);
+        StreamUpdatePerfBaseState(&sfBase, tmp->flow, TCP_STATE_SYN_SENT);
 
         EventInternal(INTERNAL_EVENT_SESSION_ADD);
 
@@ -4289,7 +4287,7 @@ static void NewTcpSessionOnSyn(
          * start new sessions on proper SYN packets
          *****************************************************************/
         tmp = (TcpSession*)lwssn->session;
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Creating new session tracker on SYN!\n"););
 
         lwssn->s5_state.session_flags |= SSNFLAG_SEEN_CLIENT;
@@ -4312,15 +4310,15 @@ static void NewTcpSessionOnSyn(
         tmp->server.r_nxt_ack = tmp->client.l_unackd;
         tmp->server.r_win_base = tdb->seq+1;
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "seglist_base_seq = %X\n", tmp->server.seglist_base_seq););
         tmp->server.s_mgr.state = TCP_STATE_LISTEN;
 
-        tmp->client.flags |= Stream5GetTcpTimestamp(p, &tmp->client.ts_last, 0);
+        tmp->client.flags |= StreamGetTcpTimestamp(p, &tmp->client.ts_last, 0);
         if (tmp->client.ts_last == 0)
             tmp->client.flags |= TF_TSTAMP_ZERO;
-        tmp->client.flags |= Stream5GetMss(p, &tmp->client.mss);
-        tmp->client.flags |= Stream5GetWscale(p, &tmp->client.wscale);
+        tmp->client.flags |= StreamGetMss(p, &tmp->client.mss);
+        tmp->client.flags |= StreamGetWscale(p, &tmp->client.wscale);
 
 
         /* Set the StreamTcpConfig for each direction (pkt from client) */
@@ -4343,7 +4341,7 @@ static void NewTcpSessionOnSynAck(
     TcpSession* tmp;
     {
         tmp = (TcpSession*)lwssn->session;
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Creating new session tracker on SYN_ACK!\n"););
 
         lwssn->s5_state.session_flags |= SSNFLAG_SEEN_SERVER;
@@ -4371,15 +4369,15 @@ static void NewTcpSessionOnSynAck(
         tmp->client.l_nxt_seq = tdb->ack;
         tmp->client.isn = tdb->ack-1;
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "seglist_base_seq = %X\n", tmp->client.seglist_base_seq););
         tmp->client.s_mgr.state = TCP_STATE_SYN_SENT;
 
-        tmp->server.flags |= Stream5GetTcpTimestamp(p, &tmp->server.ts_last, 0);
+        tmp->server.flags |= StreamGetTcpTimestamp(p, &tmp->server.ts_last, 0);
         if (tmp->server.ts_last == 0)
             tmp->server.flags |= TF_TSTAMP_ZERO;
-        tmp->server.flags |= Stream5GetMss(p, &tmp->server.mss);
-        tmp->server.flags |= Stream5GetWscale(p, &tmp->server.wscale);
+        tmp->server.flags |= StreamGetMss(p, &tmp->server.mss);
+        tmp->server.flags |= StreamGetWscale(p, &tmp->server.wscale);
 
         /* Set the config for each direction (pkt from server) */
         tmp->server.config = dstPolicy;
@@ -4404,7 +4402,7 @@ static void NewTcpSessionOn3Way(
          * start new sessions on completion of 3-way (ACK only, no data)
          *****************************************************************/
         tmp = (TcpSession*)lwssn->session;
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Creating new session tracker on ACK!\n"););
 
         lwssn->s5_state.session_flags |= SSNFLAG_SEEN_CLIENT;
@@ -4427,15 +4425,15 @@ static void NewTcpSessionOn3Way(
         tmp->server.r_nxt_ack = tmp->client.l_unackd;
         tmp->server.r_win_base = tdb->seq+1;
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "seglist_base_seq = %X\n", tmp->server.seglist_base_seq););
         tmp->server.s_mgr.state = TCP_STATE_ESTABLISHED;
 
-        tmp->client.flags |= Stream5GetTcpTimestamp(p, &tmp->client.ts_last, 0);
+        tmp->client.flags |= StreamGetTcpTimestamp(p, &tmp->client.ts_last, 0);
         if (tmp->client.ts_last == 0)
             tmp->client.flags |= TF_TSTAMP_ZERO;
-        tmp->client.flags |= Stream5GetMss(p, &tmp->client.mss);
-        tmp->client.flags |= Stream5GetWscale(p, &tmp->client.wscale);
+        tmp->client.flags |= StreamGetMss(p, &tmp->client.mss);
+        tmp->client.flags |= StreamGetWscale(p, &tmp->client.wscale);
 
         /* Set the config for each direction (pkt from client) */
         tmp->client.config = dstPolicy;
@@ -4457,12 +4455,12 @@ static void NewTcpSessionOnData(
     TcpSession* tmp;
     {
         tmp = (TcpSession*)lwssn->session;
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Creating new session tracker on data packet (ACK|PSH)!\n"););
 
         if (lwssn->s5_state.direction == FROM_CLIENT)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Session direction is FROM_CLIENT\n"););
 
             /* Sender is client (src port is higher) */
@@ -4491,15 +4489,15 @@ static void NewTcpSessionOnData(
             //tmp->server.l_nxt_seq = tdb->ack + 1;
             tmp->server.l_unackd = tdb->ack - 1;
 
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "seglist_base_seq = %X\n", tmp->server.seglist_base_seq););
             tmp->server.s_mgr.state = TCP_STATE_ESTABLISHED;
 
-            tmp->client.flags |= Stream5GetTcpTimestamp(p, &tmp->client.ts_last, 0);
+            tmp->client.flags |= StreamGetTcpTimestamp(p, &tmp->client.ts_last, 0);
             if (tmp->client.ts_last == 0)
                 tmp->client.flags |= TF_TSTAMP_ZERO;
-            tmp->client.flags |= Stream5GetMss(p, &tmp->client.mss);
-            tmp->client.flags |= Stream5GetWscale(p, &tmp->client.wscale);
+            tmp->client.flags |= StreamGetMss(p, &tmp->client.mss);
+            tmp->client.flags |= StreamGetWscale(p, &tmp->client.wscale);
 
             /* Set the config for each direction (pkt from client) */
             tmp->client.config = dstPolicy;
@@ -4509,7 +4507,7 @@ static void NewTcpSessionOnData(
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Session direction is FROM_SERVER\n"););
 
             /* Sender is server (src port is lower) */
@@ -4533,15 +4531,15 @@ static void NewTcpSessionOnData(
             tmp->client.l_window = 0; /* reset later */
             tmp->client.isn = tdb->ack-1;
 
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "seglist_base_seq = %X\n", tmp->client.seglist_base_seq););
             tmp->client.s_mgr.state = TCP_STATE_ESTABLISHED;
 
-            tmp->server.flags |= Stream5GetTcpTimestamp(p, &tmp->server.ts_last, 0);
+            tmp->server.flags |= StreamGetTcpTimestamp(p, &tmp->server.ts_last, 0);
             if (tmp->server.ts_last == 0)
                 tmp->server.flags |= TF_TSTAMP_ZERO;
-            tmp->server.flags |= Stream5GetMss(p, &tmp->server.mss);
-            tmp->server.flags |= Stream5GetWscale(p, &tmp->server.wscale);
+            tmp->server.flags |= StreamGetMss(p, &tmp->server.mss);
+            tmp->server.flags |= StreamGetWscale(p, &tmp->server.wscale);
 
             /* Set the config for each direction (pkt from server) */
             tmp->server.config = dstPolicy;
@@ -4570,7 +4568,7 @@ static int RepeatedSyn(
          */
         if (SEQ_EQ(tdb->seq, listener->r_nxt_ack))
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Got syn on established windows ssn, which causes Reset,"
                 "bailing\n"););
             tcpssn->flow->s5_state.session_flags |= SSNFLAG_RESET;
@@ -4579,7 +4577,7 @@ static int RepeatedSyn(
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Got syn on established windows ssn, not causing Reset,"
                 "bailing\n"););
             Discard();
@@ -4588,7 +4586,7 @@ static int RepeatedSyn(
         break;
     case STREAM_POLICY_MACOS:
         /* MACOS ignores a 2nd SYN, regardless of the sequence number. */
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
             "Got syn on established macos ssn, not causing Reset,"
             "bailing\n"););
         Discard();
@@ -4606,7 +4604,7 @@ static int RepeatedSyn(
         /* If its not a retransmission of the actual SYN... RESET */
         if(!SEQ_EQ(tdb->seq,talker->isn))
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Got syn on established ssn, which causes Reset, bailing\n"););
             tcpssn->flow->s5_state.session_flags |= SSNFLAG_RESET;
             talker->s_mgr.state = TCP_STATE_CLOSED;
@@ -4614,7 +4612,7 @@ static int RepeatedSyn(
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Got syn on established ssn, not causing Reset,"
                 "bailing\n"););
             Discard();
@@ -4691,12 +4689,12 @@ static int ProcessTcp(
     TcpSession *tcpssn = NULL;
     StreamTracker *talker = NULL;
     StreamTracker *listener = NULL;
-    STREAM5_DEBUG_WRAP(char *t = NULL; char *l = NULL;)
+    STREAM_DEBUG_WRAP(char *t = NULL; char *l = NULL;)
     PROFILE_VARS;
 
     if (lwssn->protocol != PktType::TCP)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Lightweight session not TCP on TCP packet\n"););
         return retcode;
     }
@@ -4724,14 +4722,14 @@ static int ProcessTcp(
 
         if ( p->ptrs.tcph->is_syn_only() )
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-                    "Stream5 SYN PACKET, establishing lightweight"
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    "Stream SYN PACKET, establishing lightweight"
                     "session direction.\n"););
             /* SYN packet from client */
             lwssn->s5_state.direction = FROM_CLIENT;
-            lwssn->session_state |= STREAM5_STATE_SYN;
+            lwssn->session_state |= STREAM_STATE_SYN;
 
-            if ( require3Way || (Stream5PacketHasWscale(p) & TF_WSCALE) ||
+            if ( require3Way || (StreamPacketHasWscale(p) & TF_WSCALE) ||
                  (p->dsize > 0) )
             {
                 /* Create TCP session if we
@@ -4749,15 +4747,15 @@ static int ProcessTcp(
         else if ( p->ptrs.tcph->is_syn_ack() )
         {
             /* SYN-ACK from server */
-            if ((lwssn->session_state == STREAM5_STATE_NONE) ||
+            if ((lwssn->session_state == STREAM_STATE_NONE) ||
                 (lwssn->s5_state.session_flags & SSNFLAG_RESET))
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-                        "Stream5 SYN|ACK PACKET, establishing lightweight"
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                        "Stream SYN|ACK PACKET, establishing lightweight"
                         "session direction.\n"););
                 lwssn->s5_state.direction = FROM_SERVER;
             }
-            lwssn->session_state |= STREAM5_STATE_SYN_ACK;
+            lwssn->session_state |= STREAM_STATE_SYN_ACK;
 
             if ( !require3Way || allow_midstream )
             {
@@ -4768,15 +4766,15 @@ static int ProcessTcp(
         }
         else if (
             p->ptrs.tcph->is_ack() && !p->ptrs.tcph->is_rst() &&
-            (lwssn->session_state & STREAM5_STATE_SYN_ACK) )
+            (lwssn->session_state & STREAM_STATE_SYN_ACK) )
         {
             /* TODO: do we need to verify the ACK field is >= the seq of the SYN-ACK? */
             /* 3-way Handshake complete, create TCP session */
-            lwssn->session_state |= STREAM5_STATE_ACK | STREAM5_STATE_ESTABLISHED;
+            lwssn->session_state |= STREAM_STATE_ACK | STREAM_STATE_ESTABLISHED;
             NewTcpSessionOn3Way(p, lwssn, tdb, config);
             new_ssn = 1;
             NormalTrackECN(tcpssn, (TCPHdr*)p->ptrs.tcph, require3Way);
-            Stream5UpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
+            StreamUpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
         }
         else if ( p->dsize && (!require3Way || allow_midstream) )
         {
@@ -4787,15 +4785,15 @@ static int ProcessTcp(
             else
                 lwssn->s5_state.direction = FROM_SERVER;
 
-            lwssn->session_state |= STREAM5_STATE_MIDSTREAM;
+            lwssn->session_state |= STREAM_STATE_MIDSTREAM;
             lwssn->s5_state.session_flags |= SSNFLAG_MIDSTREAM;
 
             NewTcpSessionOnData(p, lwssn, tdb, config);
             new_ssn = 1;
             NormalTrackECN(tcpssn, (TCPHdr*)p->ptrs.tcph, require3Way);
 
-            if (lwssn->session_state & STREAM5_STATE_ESTABLISHED)
-                Stream5UpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
+            if (lwssn->session_state & STREAM_STATE_ESTABLISHED)
+                StreamUpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
         }
         else if ( !p->dsize )
         {
@@ -4807,7 +4805,7 @@ static int ProcessTcp(
     else
     {
         /* If session is already marked as established */
-        if ( !(lwssn->session_state & STREAM5_STATE_ESTABLISHED) &&
+        if ( !(lwssn->session_state & STREAM_STATE_ESTABLISHED) &&
              (!config->require_3whs() || config->midstream_allowed(p)) )
         {
             /* If not requiring 3-way Handshake... */
@@ -4819,16 +4817,16 @@ static int ProcessTcp(
             if ( p->ptrs.tcph->is_syn_ack() )
             {
                 /* SYN-ACK from server */
-                if (lwssn->session_state != STREAM5_STATE_NONE)
+                if (lwssn->session_state != STREAM_STATE_NONE)
                 {
-                    lwssn->session_state |= STREAM5_STATE_SYN_ACK;
+                    lwssn->session_state |= STREAM_STATE_SYN_ACK;
                 }
             }
             else if ( p->ptrs.tcph->is_ack() &&
-                (lwssn->session_state & STREAM5_STATE_SYN_ACK) )
+                (lwssn->session_state & STREAM_STATE_SYN_ACK) )
             {
-                lwssn->session_state |= STREAM5_STATE_ACK | STREAM5_STATE_ESTABLISHED;
-                Stream5UpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
+                lwssn->session_state |= STREAM_STATE_ACK | STREAM_STATE_ESTABLISHED;
+                StreamUpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
             }
         }
         if ( p->ptrs.tcph->is_syn() )
@@ -4840,8 +4838,8 @@ static int ProcessTcp(
 
     if(p->packet_flags & PKT_FROM_SERVER)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-                    "Stream5: Updating on packet from server\n"););
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    "Stream: Updating on packet from server\n"););
         lwssn->s5_state.session_flags |= SSNFLAG_SEEN_SERVER;
         if (tcpssn->tcp_init)
         {
@@ -4849,7 +4847,7 @@ static int ProcessTcp(
             listener = &tcpssn->client;
         }
 
-        STREAM5_DEBUG_WRAP(
+        STREAM_DEBUG_WRAP(
                 t = "Server";
                 l = "Client");
 
@@ -4859,8 +4857,8 @@ static int ProcessTcp(
             eventcode |= EVENT_4WHS;
         }
         /* If we picked this guy up midstream, finish the initialization */
-        if ((lwssn->session_state & STREAM5_STATE_MIDSTREAM) &&
-            !(lwssn->session_state & STREAM5_STATE_ESTABLISHED))
+        if ((lwssn->session_state & STREAM_STATE_MIDSTREAM) &&
+            !(lwssn->session_state & STREAM_STATE_ESTABLISHED))
         {
             FinishServerInit(p, tdb, tcpssn);
             if((p->ptrs.tcph->th_flags & TH_ECE) &&
@@ -4872,9 +4870,9 @@ static int ProcessTcp(
             if (lwssn->s5_state.session_flags & SSNFLAG_SEEN_CLIENT)
             {
                 // should TCP state go to established too?
-                lwssn->session_state |= STREAM5_STATE_ESTABLISHED;
+                lwssn->session_state |= STREAM_STATE_ESTABLISHED;
                 lwssn->s5_state.session_flags |= SSNFLAG_ESTABLISHED;
-                Stream5UpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
+                StreamUpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
             }
         }
         if ( !lwssn->inner_server_ttl )
@@ -4882,8 +4880,8 @@ static int ProcessTcp(
     }
     else
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-                    "Stream5: Updating on packet from client\n"););
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    "Stream: Updating on packet from client\n"););
         /* if we got here we had to see the SYN already... */
         lwssn->s5_state.session_flags |= SSNFLAG_SEEN_CLIENT;
         if (tcpssn->tcp_init)
@@ -4892,17 +4890,17 @@ static int ProcessTcp(
             listener = &tcpssn->server;
         }
 
-        STREAM5_DEBUG_WRAP(
+        STREAM_DEBUG_WRAP(
                 t = "Client";
                 l = "Server";);
 
-        if ((lwssn->session_state & STREAM5_STATE_MIDSTREAM) &&
-            !(lwssn->session_state & STREAM5_STATE_ESTABLISHED))
+        if ((lwssn->session_state & STREAM_STATE_MIDSTREAM) &&
+            !(lwssn->session_state & STREAM_STATE_ESTABLISHED))
         {
             /* Midstream and seen server. */
             if (lwssn->s5_state.session_flags & SSNFLAG_SEEN_SERVER)
             {
-                lwssn->session_state |= STREAM5_STATE_ESTABLISHED;
+                lwssn->session_state |= STREAM_STATE_ESTABLISHED;
                 lwssn->s5_state.session_flags |= SSNFLAG_ESTABLISHED;
             }
         }
@@ -4935,7 +4933,7 @@ static int ProcessTcp(
             else if ( p->ptrs.tcph->is_syn_only() )
             {
                 lwssn->s5_state.direction = FROM_CLIENT;
-                lwssn->session_state = STREAM5_STATE_SYN;
+                lwssn->session_state = STREAM_STATE_SYN;
                 lwssn->set_ttl(p, true);
                 NewTcpSessionOnSyn(p, lwssn, tdb, config);
                 tcpStats.resyns++;
@@ -4953,7 +4951,7 @@ static int ProcessTcp(
             else if ( p->ptrs.tcph->is_syn_ack() )
             {
                 lwssn->s5_state.direction = FROM_SERVER;
-                lwssn->session_state = STREAM5_STATE_SYN_ACK;
+                lwssn->session_state = STREAM_STATE_SYN_ACK;
                 lwssn->set_ttl(p, false);
                 NewTcpSessionOnSynAck(p, lwssn, tdb, config);
                 tcpStats.resyns++;
@@ -4970,7 +4968,7 @@ static int ProcessTcp(
                 lwssn->s5_state.session_flags = SSNFLAG_SEEN_SERVER;
             }
         }
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Got SYN pkt on reset ssn, re-SYN-ing\n"););
     }
 
@@ -4980,12 +4978,12 @@ static int ProcessTcp(
     {
         if ( talker && (talker->flags & TF_FORCE_FLUSH) )
         {
-            Stream5FlushTalker(p, lwssn);
+            StreamFlushTalker(p, lwssn);
             talker->flags &= ~TF_FORCE_FLUSH;
         }
         if ( listener && (listener->flags & TF_FORCE_FLUSH) )
         {
-            Stream5FlushListener(p, lwssn);
+            StreamFlushListener(p, lwssn);
             listener->flags &= ~TF_FORCE_FLUSH;
         }
         p->packet_flags |= PKT_IGNORE;
@@ -5004,7 +5002,7 @@ static int ProcessTcp(
             }
             else
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Got data on SYN packet, not processing it\n"););
                 //EventDataOnSyn(config);
                 eventcode |= EVENT_DATA_ON_SYN;
@@ -5020,10 +5018,10 @@ static int ProcessTcp(
         return retcode;
     }
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "   %s [talker] state: %s\n", t,
                 state_names[talker->s_mgr.state]););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "   %s state: %s(%d)\n", l,
                 state_names[listener->s_mgr.state],
                 listener->s_mgr.state););
@@ -5047,7 +5045,7 @@ static int ProcessTcp(
              */
             if(!IsBetween(listener->l_unackd, listener->l_nxt_seq, tdb->ack))
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "Pkt ack is out of bounds, bailing!\n"););
                 Discard();
                 NormalTrimPayloadIf(p, NORM_TCP_TRIM, 0, tdb);
@@ -5057,7 +5055,7 @@ static int ProcessTcp(
             }
         }
 
-        talker->flags |= Stream5GetTcpTimestamp(p, &tdb->ts, 0);
+        talker->flags |= StreamGetTcpTimestamp(p, &tdb->ts, 0);
         if (tdb->ts == 0)
             talker->flags |= TF_TSTAMP_ZERO;
 
@@ -5066,7 +5064,7 @@ static int ProcessTcp(
          */
         if(p->ptrs.tcph->th_flags & TH_RST)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "got RST\n"););
 
             NormalTrimPayloadIf(p, NORM_TCP_TRIM, 0, tdb);
@@ -5076,7 +5074,7 @@ static int ProcessTcp(
              */
             if(ValidRstSynSent(listener, tdb))
             {
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "got RST, closing talker\n"););
                 /* Reset is valid */
                 /* Mark session as reset... Leave it around so that any
@@ -5085,14 +5083,14 @@ static int ProcessTcp(
                  */
                 lwssn->s5_state.session_flags |= SSNFLAG_RESET;
                 talker->s_mgr.state = TCP_STATE_CLOSED;
-                Stream5UpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_CLOSING);
+                StreamUpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_CLOSING);
                 /* Leave listener open, data may be in transit */
                 LogTcpEvents(eventcode);
                 MODULE_PROFILE_END(s5TcpStatePerfStats);
                 return retcode | ACTION_RST;
             }
             /* Reset not valid. */
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "bad sequence number, bailing\n"););
             Discard();
             eventcode |= EVENT_BAD_RST;
@@ -5113,12 +5111,12 @@ static int ProcessTcp(
                 talker->ts_last_pkt = p->pkth->ts.tv_sec;
                 talker->ts_last = tdb->ts;
             }
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Finish server init got called!\n"););
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Finish server init didn't get called!\n"););
         }
 
@@ -5132,7 +5130,7 @@ static int ProcessTcp(
          * explicitly set the state
          */
         listener->s_mgr.state = TCP_STATE_SYN_SENT;
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Accepted SYN ACK\n"););
         LogTcpEvents(eventcode);
         MODULE_PROFILE_END(s5TcpStatePerfStats);
@@ -5171,7 +5169,7 @@ static int ProcessTcp(
 
         if(ValidRst(lwssn, listener, tdb))
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Got RST, bailing\n"););
 
             if (
@@ -5180,14 +5178,14 @@ static int ProcessTcp(
                 listener->s_mgr.state == TCP_STATE_CLOSE_WAIT ||
                 listener->s_mgr.state == TCP_STATE_CLOSING
             ) {
-                Stream5FlushTalker(p, lwssn);
-                Stream5FlushListener(p, lwssn);
+                StreamFlushTalker(p, lwssn);
+                StreamFlushListener(p, lwssn);
                 lwssn->free_application_data();
             }
             lwssn->s5_state.session_flags |= SSNFLAG_RESET;
             talker->s_mgr.state = TCP_STATE_CLOSED;
             talker->s_mgr.sub_state |= SUB_RST_SENT;
-            Stream5UpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_CLOSING);
+            StreamUpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_CLOSING);
 
             if ( Normalize_IsEnabled(NORM_TCP_IPS) )
                 listener->s_mgr.state = TCP_STATE_CLOSED;
@@ -5199,7 +5197,7 @@ static int ProcessTcp(
             return retcode | ACTION_RST;
         }
         /* Reset not valid. */
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "bad sequence number, bailing\n"););
         Discard();
         eventcode |= EVENT_BAD_RST;
@@ -5214,7 +5212,7 @@ static int ProcessTcp(
         if ( (listener->s_mgr.state >= TCP_STATE_ESTABLISHED) &&
             !ValidSeq(p, lwssn, listener, tdb) )
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "bad sequence number, bailing\n"););
             Discard();
             NormalTrimPayloadIf(p, NORM_TCP_TRIM, 0, tdb);
@@ -5226,7 +5224,7 @@ static int ProcessTcp(
 
     if (ts_action != ACTION_NOTHING)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "bad timestamp, bailing\n"););
         Discard();
         // this packet was normalized elsewhere
@@ -5238,7 +5236,7 @@ static int ProcessTcp(
     /*
      * update PAWS timestamps
      */
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "PAWS update tdb->seq %lu > listener->r_win_base %lu\n",
                 tdb->seq, listener->r_win_base););
     if(got_ts && SEQ_EQ(listener->r_win_base, tdb->seq))
@@ -5246,7 +5244,7 @@ static int ProcessTcp(
         if((int32_t)(tdb->ts - talker->ts_last) >= 0 ||
            (uint32_t)p->pkth->ts.tv_sec >= talker->ts_last_pkt+PAWS_24DAYS)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "updating timestamps...\n"););
             talker->ts_last = tdb->ts;
             talker->ts_last_pkt = p->pkth->ts.tv_sec;
@@ -5254,7 +5252,7 @@ static int ProcessTcp(
     }
     else
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "not updating timestamps...\n"););
     }
 
@@ -5289,7 +5287,7 @@ static int ProcessTcp(
      */
     if (listener->config->max_window && (tdb->win > listener->config->max_window))
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Got window that was beyond the allowed policy value, bailing\n"););
         /* got a window too large, alert! */
         eventcode |= EVENT_WINDOW_TOO_LARGE;
@@ -5304,7 +5302,7 @@ static int ProcessTcp(
             && !(p->ptrs.tcph->th_flags & (TH_FIN|TH_RST))
             && !(lwssn->s5_state.session_flags & SSNFLAG_MIDSTREAM))
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
             "Window slammed shut!\n"););
         /* got a window slam alert! */
         eventcode |= EVENT_WINDOW_SLAM;
@@ -5320,13 +5318,13 @@ static int ProcessTcp(
 
     if(talker->s_mgr.state_queue != TCP_STATE_NONE)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Found queued state transition on ack 0x%X, "
                     "current 0x%X!\n", talker->s_mgr.transition_seq,
                     tdb->ack););
         if(tdb->ack == talker->s_mgr.transition_seq)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "accepting transition!\n"););
             talker->s_mgr.state = talker->s_mgr.state_queue;
             talker->s_mgr.state_queue = TCP_STATE_NONE;
@@ -5338,9 +5336,9 @@ static int ProcessTcp(
      */
     if(p->ptrs.tcph->th_flags & TH_ACK)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Got an ACK...\n"););
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "   %s [listener] state: %s\n", l,
                     state_names[listener->s_mgr.state]););
 
@@ -5349,16 +5347,16 @@ static int ProcessTcp(
             case TCP_STATE_SYN_SENT:
                     break;
             case TCP_STATE_SYN_RCVD:
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "listener state is SYN_SENT...\n"););
                 if ( IsBetween(listener->l_unackd, listener->l_nxt_seq, tdb->ack) )
                 {
                     UpdateSsn(p, listener, talker, tdb);
                     lwssn->s5_state.session_flags |= SSNFLAG_ESTABLISHED;
-                    lwssn->session_state |= STREAM5_STATE_ESTABLISHED;
+                    lwssn->session_state |= STREAM_STATE_ESTABLISHED;
                     listener->s_mgr.state = TCP_STATE_ESTABLISHED;
                     talker->s_mgr.state = TCP_STATE_ESTABLISHED;
-                    Stream5UpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
+                    StreamUpdatePerfBaseState(&sfBase, lwssn, TCP_STATE_ESTABLISHED);
                     /* Indicate this packet completes 3-way handshake */
                     p->packet_flags |= PKT_STREAM_TWH;
                 }
@@ -5380,7 +5378,7 @@ static int ProcessTcp(
             case TCP_STATE_FIN_WAIT_1:
                 UpdateSsn(p, listener, talker, tdb);
 
-                STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                             "tdb->ack %X >= talker->r_nxt_ack %X\n",
                             tdb->ack, talker->r_nxt_ack););
 
@@ -5403,7 +5401,7 @@ static int ProcessTcp(
 
                     if ( (p->ptrs.tcph->th_flags & TH_FIN) )
                     {
-                        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "seq ok, setting state!\n"););
 
                         if (talker->s_mgr.state_queue == TCP_STATE_NONE)
@@ -5428,7 +5426,7 @@ static int ProcessTcp(
                 }
                 else
                 {
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                                 "bad ack!\n"););
                 }
                 break;
@@ -5473,7 +5471,7 @@ static int ProcessTcp(
      */
     if(p->dsize)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "   %s state: %s(%d) getting data\n", l,
                     state_names[listener->s_mgr.state],
                     listener->s_mgr.state););
@@ -5512,7 +5510,7 @@ static int ProcessTcp(
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "Queuing data on listener, t %s, l %s...\n",
                         flush_policy_names[talker->flush_policy],
                         flush_policy_names[listener->flush_policy]););
@@ -5560,19 +5558,19 @@ static int ProcessTcp(
 
     if(p->ptrs.tcph->th_flags & TH_FIN)
     {
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Got an FIN...\n"););
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "   %s state: %s(%d)\n", l,
                     state_names[talker->s_mgr.state],
                     talker->s_mgr.state););
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "checking ack (0x%X) vs nxt_ack (0x%X)\n",
                     tdb->end_seq, listener->r_win_base););
         if(SEQ_LT(tdb->end_seq,listener->r_win_base))
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "FIN inside r_win_base, bailing\n"););
             goto dupfin;
         }
@@ -5613,7 +5611,7 @@ static int ProcessTcp(
                     if ( !p->dsize )
                         CheckFlushPolicyOnData(tcpssn, talker, listener, p);
 
-                    Stream5UpdatePerfBaseState(&sfBase, tcpssn->flow, TCP_STATE_CLOSING);
+                    StreamUpdatePerfBaseState(&sfBase, tcpssn->flow, TCP_STATE_CLOSING);
                     break;
 
                 case TCP_STATE_CLOSE_WAIT:
@@ -5634,7 +5632,7 @@ static int ProcessTcp(
                 if ( (listener->s_mgr.expected_flags == TH_ACK) &&
                      SEQ_GEQ(end_seq, listener->s_mgr.transition_seq) )
                 {
-                    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "FIN beyond previous, ignoring\n"););
                     eventcode |= EVENT_BAD_FIN;
                     LogTcpEvents(eventcode);
@@ -5668,10 +5666,10 @@ static int ProcessTcp(
 
 dupfin:
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "   %s [talker] state: %s\n", t,
                 state_names[talker->s_mgr.state]););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "   %s state: %s(%d)\n", l,
                 state_names[listener->s_mgr.state],
                 listener->s_mgr.state););
@@ -5684,12 +5682,12 @@ dupfin:
        (listener->s_mgr.state == TCP_STATE_TIME_WAIT && talker->s_mgr.state == TCP_STATE_TIME_WAIT))
     {
 //dropssn:
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                     "Session terminating, flushing session buffers\n"););
 
         if(p->packet_flags & PKT_FROM_SERVER)
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "flushing FROM_SERVER\n"););
             if(talker->seg_bytes_logical)
             {
@@ -5716,7 +5714,7 @@ dupfin:
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "flushing FROM_CLIENT\n"););
             if(listener->seg_bytes_logical)
             {
@@ -5743,7 +5741,7 @@ dupfin:
         LogTcpEvents(eventcode);
         /* The last ACK is a part of the session.  Delete the session after processing is complete. */
         TcpSessionCleanup(lwssn, 0);
-        lwssn->session_state |= STREAM5_STATE_CLOSED;
+        lwssn->session_state |= STREAM_STATE_CLOSED;
         MODULE_PROFILE_END(s5TcpStatePerfStats);
         return retcode | ACTION_LWSSN_CLOSED;
     }
@@ -5875,19 +5873,19 @@ static inline int CheckFlushPolicyOnData(
 {
     uint32_t flushed = 0;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "In CheckFlushPolicyOnData\n"););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Talker flush policy: %s\n",
                 flush_policy_names[talker->flush_policy]););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Listener flush policy: %s\n",
                 flush_policy_names[listener->flush_policy]););
 
     switch(listener->flush_policy)
     {
         case STREAM_FLPOLICY_IGNORE:
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "STREAM_FLPOLICY_IGNORE\n"););
             return 0;
 
@@ -6031,19 +6029,19 @@ int CheckFlushPolicyOnAck(
 {
     uint32_t flushed = 0;
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "In CheckFlushPolicyOnAck\n"););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Talker flush policy: %s\n",
                 flush_policy_names[talker->flush_policy]););
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                 "Listener flush policy: %s\n",
                 flush_policy_names[listener->flush_policy]););
 
     switch(talker->flush_policy)
     {
         case STREAM_FLPOLICY_IGNORE:
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
                         "STREAM_FLPOLICY_IGNORE\n"););
             return 0;
 
@@ -6094,7 +6092,7 @@ int CheckFlushPolicyOnAck(
     return flushed;
 }
 
-static void Stream5SeglistAddNode(StreamTracker *st, StreamSegment *prev,
+static void StreamSeglistAddNode(StreamTracker *st, StreamSegment *prev,
         StreamSegment *ss)
 {
     tcpStats.segs_queued++;
@@ -6128,12 +6126,12 @@ static void Stream5SeglistAddNode(StreamTracker *st, StreamSegment *prev,
 #endif
 }
 
-static int Stream5SeglistDeleteNode (StreamTracker* st, StreamSegment* seg)
+static int StreamSeglistDeleteNode (StreamTracker* st, StreamSegment* seg)
 {
     int ret;
     assert(st && seg);
 
-    STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+    STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                     "Dropping segment at seq %X, len %d\n",
                     seg->seq, seg->size););
 
@@ -6167,7 +6165,7 @@ static int Stream5SeglistDeleteNode (StreamTracker* st, StreamSegment* seg)
     return ret;
 }
 
-static int Stream5SeglistDeleteNodeTrim (
+static int StreamSeglistDeleteNodeTrim (
     StreamTracker* st, StreamSegment* seg, uint32_t flush_seq)
 {
     assert(st && seg);
@@ -6179,7 +6177,7 @@ static int Stream5SeglistDeleteNodeTrim (
 
         if ( delta < seg->size )
         {
-            STREAM5_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
+            STREAM_DEBUG_WRAP( DebugMessage(DEBUG_STREAM_STATE,
                 "Left-Trimming segment at seq %X, len %d, delta %u\n",
                 seg->seq, seg->size, delta););
 
@@ -6190,7 +6188,7 @@ static int Stream5SeglistDeleteNodeTrim (
             return 0;
         }
     }
-    return Stream5SeglistDeleteNode(st, seg);
+    return StreamSeglistDeleteNode(st, seg);
 }
 
 /* Iterates through the packets that were reassembled for
@@ -6287,12 +6285,12 @@ int GetTcpStreamSegments(Packet *p, Flow *ssn,
     return packets;
 }
 
-int Stream5AddSessionAlertTcp(
+int StreamAddSessionAlertTcp(
     Flow* lwssn, Packet* p,
     uint32_t gid, uint32_t sid)
 {
     StreamTracker *st;
-    Stream5AlertInfo* ai;
+    StreamAlertInfo* ai;
     TcpSession *tcpssn = (TcpSession*)lwssn->session;
 
     if (sfip_equals(p->ptrs.ip_api.get_src(),&tcpssn->flow->client_ip))
@@ -6320,7 +6318,7 @@ int Stream5AddSessionAlertTcp(
     return 1;
 }
 
-int Stream5CheckSessionAlertTcp(Flow *lwssn, Packet *p, uint32_t gid, uint32_t sid)
+int StreamCheckSessionAlertTcp(Flow *lwssn, Packet *p, uint32_t gid, uint32_t sid)
 {
     StreamTracker *st;
     int i;
@@ -6357,7 +6355,7 @@ int Stream5CheckSessionAlertTcp(Flow *lwssn, Packet *p, uint32_t gid, uint32_t s
     return iRet;
 }
 
-int Stream5UpdateSessionAlertTcp (
+int StreamUpdateSessionAlertTcp (
     Flow *lwssn, Packet *p,
     uint32_t gid, uint32_t sid,
     uint32_t event_id, uint32_t event_second)
@@ -6383,7 +6381,7 @@ int Stream5UpdateSessionAlertTcp (
 
     for (i=0;i<st->alert_count;i++)
     {
-        Stream5AlertInfo* ai = st->alerts + i;
+        StreamAlertInfo* ai = st->alerts + i;
 
         if ( ai->gid == gid &&
              ai->sid == sid && SEQ_EQ(ai->seq, seq_num))
@@ -6397,7 +6395,7 @@ int Stream5UpdateSessionAlertTcp (
     return -1;
 }
 
-void Stream5SetExtraDataTcp (Flow* lwssn, Packet* p, uint32_t xid)
+void StreamSetExtraDataTcp (Flow* lwssn, Packet* p, uint32_t xid)
 {
     StreamTracker *st;
     TcpSession *tcpssn = (TcpSession*)lwssn->session;
@@ -6410,7 +6408,7 @@ void Stream5SetExtraDataTcp (Flow* lwssn, Packet* p, uint32_t xid)
     st->xtradata_mask |= BIT(xid);
 }
 
-void Stream5ClearExtraDataTcp (Flow* lwssn, Packet* p, uint32_t xid)
+void StreamClearExtraDataTcp (Flow* lwssn, Packet* p, uint32_t xid)
 {
     StreamTracker *st;
     TcpSession *tcpssn = (TcpSession*)lwssn->session;
@@ -6426,7 +6424,7 @@ void Stream5ClearExtraDataTcp (Flow* lwssn, Packet* p, uint32_t xid)
         st->xtradata_mask = 0;
 }
 
-char Stream5GetReassemblyDirectionTcp(Flow *lwssn)
+char StreamGetReassemblyDirectionTcp(Flow *lwssn)
 {
     char dir = SSN_DIR_NONE;
     TcpSession *tcpssn = NULL;
@@ -6438,18 +6436,18 @@ char Stream5GetReassemblyDirectionTcp(Flow *lwssn)
 
     if ( tcpssn->server.flush_policy != STREAM_FLPOLICY_IGNORE )
     {
-        dir |= SSN_DIR_SERVER;
+        dir |= SSN_DIR_FROM_CLIENT;
     }
 
     if ( tcpssn->client.flush_policy != STREAM_FLPOLICY_IGNORE )
     {
-        dir |= SSN_DIR_CLIENT;
+        dir |= SSN_DIR_FROM_SERVER;
     }
 
     return dir;
 }
 
-bool Stream5GetReassemblyFlushPolicyTcp(Flow *lwssn, char dir)
+bool StreamGetReassemblyFlushPolicyTcp(Flow *lwssn, char dir)
 {
     TcpSession *tcpssn = NULL;
 
@@ -6458,19 +6456,19 @@ bool Stream5GetReassemblyFlushPolicyTcp(Flow *lwssn, char dir)
 
     tcpssn = (TcpSession*)lwssn->session;
 
-    if (dir & SSN_DIR_CLIENT)
+    if (dir & SSN_DIR_FROM_CLIENT)
     {
         return (char)tcpssn->client.flush_policy != STREAM_FLPOLICY_IGNORE;
     }
 
-    if (dir & SSN_DIR_SERVER)
+    if (dir & SSN_DIR_FROM_SERVER)
     {
         return (char)tcpssn->server.flush_policy != STREAM_FLPOLICY_IGNORE;
     }
     return false;
 }
 
-char Stream5IsStreamSequencedTcp(Flow *lwssn, char dir)
+char StreamIsStreamSequencedTcp(Flow *lwssn, char dir)
 {
     TcpSession *tcpssn = NULL;
 
@@ -6479,13 +6477,13 @@ char Stream5IsStreamSequencedTcp(Flow *lwssn, char dir)
 
     tcpssn = (TcpSession*)lwssn->session;
 
-    if (dir & SSN_DIR_CLIENT)
+    if (dir & SSN_DIR_FROM_CLIENT)
     {
         if ( tcpssn->server.flags & (TF_MISSING_PREV_PKT|TF_MISSING_PKT) )
             return 0;
     }
 
-    if (dir & SSN_DIR_SERVER)
+    if (dir & SSN_DIR_FROM_SERVER)
     {
         if ( tcpssn->client.flags & (TF_MISSING_PREV_PKT|TF_MISSING_PKT) )
             return 0;
@@ -6496,7 +6494,7 @@ char Stream5IsStreamSequencedTcp(Flow *lwssn, char dir)
 
 /* This will falsly return SSN_MISSING_BEFORE on the first reassembed
  * packet if reassembly for this direction was set mid-session */
-int Stream5MissingInReassembledTcp(Flow *lwssn, char dir)
+int StreamMissingInReassembledTcp(Flow *lwssn, char dir)
 {
     TcpSession *tcpssn = NULL;
 
@@ -6505,7 +6503,7 @@ int Stream5MissingInReassembledTcp(Flow *lwssn, char dir)
 
     tcpssn = (TcpSession *)lwssn->session;
 
-    if (dir & SSN_DIR_CLIENT)
+    if (dir & SSN_DIR_FROM_CLIENT)
     {
         if ((tcpssn->server.flags & TF_MISSING_PKT) &&
             (tcpssn->server.flags & TF_MISSING_PREV_PKT))
@@ -6515,7 +6513,7 @@ int Stream5MissingInReassembledTcp(Flow *lwssn, char dir)
         else if (tcpssn->server.flags & TF_MISSING_PKT)
             return SSN_MISSING_AFTER;
     }
-    else if (dir & SSN_DIR_SERVER)
+    else if (dir & SSN_DIR_FROM_SERVER)
     {
         if ((tcpssn->client.flags & TF_MISSING_PKT) &&
             (tcpssn->client.flags & TF_MISSING_PREV_PKT))
@@ -6529,7 +6527,7 @@ int Stream5MissingInReassembledTcp(Flow *lwssn, char dir)
     return SSN_MISSING_NONE;
 }
 
-char Stream5PacketsMissingTcp(Flow *lwssn, char dir)
+char StreamPacketsMissingTcp(Flow *lwssn, char dir)
 {
     TcpSession *tcpssn = NULL;
 
@@ -6538,13 +6536,13 @@ char Stream5PacketsMissingTcp(Flow *lwssn, char dir)
 
     tcpssn = (TcpSession *)lwssn->session;
 
-    if (dir & SSN_DIR_CLIENT)
+    if (dir & SSN_DIR_FROM_CLIENT)
     {
         if (tcpssn->server.flags & TF_PKT_MISSED)
             return 1;
     }
 
-    if (dir & SSN_DIR_SERVER)
+    if (dir & SSN_DIR_FROM_SERVER)
     {
         if (tcpssn->client.flags & TF_PKT_MISSED)
             return 1;
@@ -6644,7 +6642,7 @@ void TcpSession::update_direction(
 
     if (sfip_equals(&flow->client_ip, ip) && (flow->client_port == port))
     {
-        if ((dir == SSN_DIR_CLIENT) && (flow->s5_state.direction == SSN_DIR_CLIENT))
+        if ((dir == SSN_DIR_FROM_CLIENT) && (flow->s5_state.direction == SSN_DIR_FROM_CLIENT))
         {
             /* Direction already set as client */
             return;
@@ -6652,7 +6650,7 @@ void TcpSession::update_direction(
     }
     else if (sfip_equals(&flow->server_ip, ip) && (flow->server_port == port))
     {
-        if ((dir == SSN_DIR_SERVER) && (flow->s5_state.direction == SSN_DIR_SERVER))
+        if ((dir == SSN_DIR_FROM_SERVER) && (flow->s5_state.direction == SSN_DIR_FROM_SERVER))
         {
             /* Direction already set as server */
             return;
@@ -6686,7 +6684,7 @@ int TcpSession::process(Packet *p)
     int status;
     PROFILE_VARS;
 
-    STREAM5_DEBUG_WRAP(
+    STREAM_DEBUG_WRAP(
         char flagbuf[9];
         CreateTCPFlagString(p->ptrs.tcph, flagbuf);
         DebugMessage((DEBUG_STREAM|DEBUG_STREAM_STATE),
@@ -6697,7 +6695,7 @@ int TcpSession::process(Packet *p)
     MODULE_PROFILE_START(s5TcpPerfStats);
 
     if ( stream.blocked_session(flow, p) ||
-        (flow->session_state & STREAM5_STATE_IGNORE) )
+        (flow->session_state & STREAM_STATE_IGNORE) )
     {
         MODULE_PROFILE_END(s5TcpPerfStats);
         return ACTION_NOTHING;
@@ -6715,7 +6713,7 @@ int TcpSession::process(Packet *p)
             if ( p->ptrs.tcph->is_syn_only() )
             {
                 /* SYN only */
-                flow->session_state = STREAM5_STATE_SYN;
+                flow->session_state = STREAM_STATE_SYN;
             }
             else
             {
@@ -6727,7 +6725,7 @@ int TcpSession::process(Packet *p)
 
                  // Do nothing with this packet since we require a 3-way ;)
                 DEBUG_WRAP(
-                    DebugMessage(DEBUG_STREAM_STATE, "Stream5: Requiring 3-way "
+                    DebugMessage(DEBUG_STREAM_STATE, "Stream: Requiring 3-way "
                     "Handshake, but failed to retrieve session object "
                     "for non SYN packet.\n"););
 
@@ -6750,7 +6748,7 @@ midstream_pickup_allowed:
             if ( 
                 !p->ptrs.tcph->is_syn_ack() &&
                 !p->dsize &&
-                !(Stream5PacketHasWscale(p) & TF_WSCALE) )
+                !(StreamPacketHasWscale(p) & TF_WSCALE) )
             {
                 MODULE_PROFILE_END(s5TcpPerfStats);
 #ifdef REG_TEST
@@ -6777,8 +6775,8 @@ midstream_pickup_allowed:
         }
         else
         {
-            STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-                    "Stream5 TCP session timedout!\n"););
+            STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+                    "Stream TCP session timedout!\n"););
 
             /* Not reset, simply time'd out.  Clean it up */
             TcpSessionCleanup(flow, 1);
@@ -6787,8 +6785,8 @@ midstream_pickup_allowed:
     }
     status = ProcessTcp(flow, p, &tdb, config);
 
-    STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-        "Finished Stream5 TCP cleanly!\n"
+    STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+        "Finished Stream TCP cleanly!\n"
                     "---------------------------------------------------\n"););
 
     if ( !(status & ACTION_LWSSN_CLOSED) )
@@ -6800,8 +6798,8 @@ midstream_pickup_allowed:
     {
         DisableInspection(p);
 
-        STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-            "Stream5 Ignoring packet from %d. Session marked as ignore\n",
+        STREAM_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
+            "Stream Ignoring packet from %d. Session marked as ignore\n",
             p->packet_flags & PKT_FROM_SERVER? "server" : "client"););
     }
 
@@ -6812,12 +6810,12 @@ midstream_pickup_allowed:
 
 bool TcpSession::add_alert(Packet* p, uint32_t gid, uint32_t sid)
 {
-    return Stream5AddSessionAlertTcp(p->flow, p, gid, sid) != 0;
+    return StreamAddSessionAlertTcp(p->flow, p, gid, sid) != 0;
 }
 
 bool TcpSession::check_alerted(Packet* p, uint32_t gid, uint32_t sid)
 {
-    return Stream5CheckSessionAlertTcp(p->flow, p, gid, sid) != 0;
+    return StreamCheckSessionAlertTcp(p->flow, p, gid, sid) != 0;
 }
 
 //-------------------------------------------------------------------------
@@ -6826,6 +6824,6 @@ bool TcpSession::check_alerted(Packet* p, uint32_t gid, uint32_t sid)
 
 void tcp_show(StreamTcpConfig* tcp_config)
 {
-    Stream5PrintTcpConfig(tcp_config);
+    StreamPrintTcpConfig(tcp_config);
 }
 

diff --git a/src/stream/tcp/tcp_session.h b/src/stream/tcp/tcp_session.h
index 7ba01d39e0034466bf9b54740a7578a8eb24f967..94cc979595c32eb4a2822f4e2b56466879184a04 100644 (file)
--- a/src/stream/tcp/tcp_session.h
+++ b/src/stream/tcp/tcp_session.h
@@ -57,12 +57,12 @@ struct StateMgr
 //
 // -- event id and second are added to the session alert trackers so that
 //    the extra data can be correlated with events
-// -- event id and second are not available when Stream5AddSessionAlertTcp
-//    is called; u2 calls Stream5UpdateSessionAlertTcp as events are logged
+// -- event id and second are not available when StreamAddSessionAlertTcp
+//    is called; u2 calls StreamUpdateSessionAlertTcp as events are logged
 //    to set these fields
 //-------------------------------------------------------------------------
 
-struct Stream5AlertInfo
+struct StreamAlertInfo
 {
     /* For storing alerts that have already been seen on the session */
     uint32_t sid;
@@ -130,7 +130,7 @@ struct StreamTracker
     // manipulate within this module.
     PAF_State paf_state;    // for tracking protocol aware flushing
 
-    Stream5AlertInfo alerts[MAX_SESSION_ALERTS]; /* history of alerts */
+    StreamAlertInfo alerts[MAX_SESSION_ALERTS]; /* history of alerts */
 
     StreamTcpConfig* config;
     StreamSegment *seglist;       /* first queued segment */

diff --git a/src/stream/udp/stream_udp.cc b/src/stream/udp/stream_udp.cc
index b22c3f880ab3b1fe742588aaf0547a0d5bd0810c..a9a4e0ba20e2d067071956f474a8017dcecabe1b 100644 (file)
--- a/src/stream/udp/stream_udp.cc
+++ b/src/stream/udp/stream_udp.cc
@@ -43,7 +43,7 @@ StreamUdpConfig::StreamUdpConfig()
 
 void udp_show(StreamUdpConfig*pc)
 {
-    LogMessage("Stream5 UDP config:\n");
+    LogMessage("Stream UDP config:\n");
     LogMessage("    Timeout: %d seconds\n", pc->session_timeout);
 
     const char* opt = (pc->ignore_any) ? "YES" : "NO";

diff --git a/src/stream/udp/stream_udp.h b/src/stream/udp/stream_udp.h
index d2a238578a6f788d18b2a55bc3a870ee2d82c049..f61d74a178d5834753c41abed385e33e0cad2742 100644 (file)
--- a/src/stream/udp/stream_udp.h
+++ b/src/stream/udp/stream_udp.h
@@ -19,8 +19,8 @@
  *
  ****************************************************************************/
 
-#ifndef STREAM5_UDP_H
-#define STREAM5_UDP_H
+#ifndef STREAM_UDP_H
+#define STREAM_UDP_H
 
 #include "flow/flow.h"
 

diff --git a/src/stream/udp/udp_session.cc b/src/stream/udp/udp_session.cc
index b7cabef9c892e78a6012e0420a5ca0c3ce723441..f0e84e27705857934e5b1be6c93a52f9f81221ca 100644 (file)
--- a/src/stream/udp/udp_session.cc
+++ b/src/stream/udp/udp_session.cc
@@ -110,14 +110,14 @@ static int ProcessUdp(
     if(p->packet_flags & PKT_FROM_SERVER)
     {
         DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-                    "Stream5: Updating on packet from responder\n"););
+                    "Stream: Updating on packet from responder\n"););
         lwssn->s5_state.session_flags |= SSNFLAG_SEEN_RESPONDER;
         lwssn->set_ttl(p, false);
     }
     else
     {
         DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
-            "Stream5: Updating on packet from client\n"););
+            "Stream: Updating on packet from client\n"););
         lwssn->s5_state.session_flags |= SSNFLAG_SEEN_SENDER;
         lwssn->set_ttl(p, true);
     }
@@ -187,7 +187,7 @@ void UdpSession::update_direction(
 
     if (sfip_equals(&flow->client_ip, ip) && (flow->client_port == port))
     {
-        if ((dir == SSN_DIR_SENDER) && (flow->s5_state.direction == SSN_DIR_SENDER))
+        if ((dir == SSN_DIR_FROM_SENDER) && (flow->s5_state.direction == SSN_DIR_FROM_SENDER))
         {
             /* Direction already set as SENDER */
             return;
@@ -195,7 +195,8 @@ void UdpSession::update_direction(
     }
     else if (sfip_equals(&flow->server_ip, ip) && (flow->server_port == port))
     {
-        if ((dir == SSN_DIR_RESPONDER) && (flow->s5_state.direction == SSN_DIR_RESPONDER))
+        if ((dir == SSN_DIR_FROM_RESPONDER) && 
+            (flow->s5_state.direction == SSN_DIR_FROM_RESPONDER))
         {
             /* Direction already set as RESPONDER */
             return;

diff --git a/src/test/sfip_test.cc b/src/test/sfip_test.cc
index e7cfc6a383976a6e9fbcc1fb2e595c31eb423295..be1c24e30c0b2c59f9a5434d576567e5edb77829 100644 (file)
--- a/src/test/sfip_test.cc
+++ b/src/test/sfip_test.cc
@@ -158,6 +158,10 @@ static FuncTest ftests[] = {
       "6543:21ff:ffff:ffff:ffff:ffff:ffff:ffff ffff:ff00::", SFIP_GREATER },
     { "sfip_compare", "1.2.3.4", "0.0.0.0", SFIP_EQUAL },
     { "sfip_compare", "1:2:3:4:5:6:7:8", "::", SFIP_EQUAL },
+    { "sfip_compare", "10.10.1.0/16", "10.10.24.14/24", SFIP_LESSER },
+    { "sfip_compare", "10.10.1.0/24", "10.10.1.0/16", SFIP_GREATER },
+    { "sfip_compare", "10.10.1.0/16", "10.10.2.1/8", SFIP_GREATER },
+    { "sfip_compare", "10.10.1.8/32", "10.10.1.8", SFIP_EQUAL },
 
     { "sfip_compare_unset", "1.2.3.4", "1.2.3.4", SFIP_EQUAL },
     { "sfip_compare_unset", "1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7:8", SFIP_EQUAL },
@@ -197,6 +201,10 @@ static FuncTest ftests[] = {
     { "sfip_contains", "192.168.0.1", "255.255.255.255/21", SFIP_NOT_CONTAINS },
     { "sfip_contains", "255.255.255.255/21", "255.255.255.255", SFIP_CONTAINS },
     { "sfip_contains", "255.255.255.255", "255.255.255.255/21", SFIP_NOT_CONTAINS },
+    { "sfip_contains", "10.10.1.0/16", "10.10.24.14/24", SFIP_CONTAINS },
+    { "sfip_contains", "10.10.1.0/16", "10.10.1.0/24", SFIP_CONTAINS },
+    { "sfip_contains", "10.10.1.0/16", "10.10.2.1/8", SFIP_NOT_CONTAINS },
+    { "sfip_contains", "10.10.1.8/32", "10.10.1.8", SFIP_CONTAINS },
 
     { "sfip_fast_cont6", "ffff:ffff::1", "ffff::ffff:1/8", SFIP_FAILURE },
     { "sfip_fast_cont6", "ffff::ffff:1/8", "ffff:ffff::1", SFIP_SUCCESS },

diff --git a/src/time/profiler.cc b/src/time/profiler.cc
index e31cf9705ef712b2e3d685ae3990c1254f1eeba4..f652d72664578764a3dfd74685f340c71000d82f 100644 (file)
--- a/src/time/profiler.cc
+++ b/src/time/profiler.cc
@@ -330,7 +330,6 @@ void CollectRTNProfile(void)
     OTN_WorstPerformer *owp, *node, *last = NULL;
     char got_position;
     SFGHASH_NODE *hashNode;
-    PolicyId policyId = 0;
     SnortConfig *sc = snort_conf;
 
     if (sc == NULL)
@@ -345,9 +344,6 @@ void CollectRTNProfile(void)
 
         sum_otn_profile_data(state);
 
-        for ( policyId = 0;
-              policyId < otn->proto_node_num;
-              policyId++ )
         {
             /* Only log info if OTN has actually been eval'd */
             if (state->checks > 0 && state->ticks > 0)

diff --git a/src/utils/sf_email_attach_decode.cc b/src/utils/sf_email_attach_decode.cc
index 0dbf1b4e9050b6c96afcfc0df24ff041a6af3d6a..8afeba5df433be24377393c118373193e6d03c03 100644 (file)
--- a/src/utils/sf_email_attach_decode.cc
+++ b/src/utils/sf_email_attach_decode.cc
@@ -91,11 +91,10 @@ int sf_qpdecode(char *src, uint32_t slen, char *dst, uint32_t dlen, uint32_t *by
                 return 0;
             }
         }
-        else
+        else if (isprint(ch) || isblank(ch))
         {
             dst[*bytes_copied] = ch;
             *bytes_copied +=1;
-
         }
     }
 
@@ -509,10 +508,8 @@ int UUDecode(const uint8_t *start, const uint8_t *end, Email_DecodeState *ds)
     {
         ds->uu_state.end_found = 0;
         ds->uu_state.begin_found = 0;
-        ds->decode_type = DECODE_NONE;
     }
 
-
     if(bytes_read < act_encode_size)
     {
         ds->prev_encoded_bytes = (act_encode_size - bytes_read);
@@ -563,10 +560,7 @@ int BitEncExtract(const uint8_t *start, const uint8_t *end, Email_DecodeState *d
 
     if( (uint32_t)(end-start) < bytes_avail )
     {
-        if ((end > start) && (*(end-1) == '\r'))
-            act_size = ( end - start) - 1;
-        else
-            act_size = ( end - start);
+        act_size = ( end - start);
     }
     else
     {

diff --git a/src/utils/sflsq.cc b/src/utils/sflsq.cc
index 9a0187dc254ff7ec536a84208d03d01830766d0e..f74afcde45ea2da999b839cd384bdda7e54e9eb7 100644 (file)
--- a/src/utils/sflsq.cc
+++ b/src/utils/sflsq.cc
@@ -235,11 +235,12 @@ NODE_DATA sflist_remove_head (SF_LIST * s)
       ndata = q->ndata;
       s->head = s->head->next;
       s->count--;
-      if( !s->head  )
-         {
-           s->tail = 0;
-           s->count = 0;
-         }
+
+      if ( !s->head  )
+           s->tail = nullptr;
+      else
+          s->head->prev = nullptr;
+
       s_free( q );
     }
   return (NODE_DATA)ndata;
@@ -259,36 +260,31 @@ NODE_DATA sflist_remove_tail (SF_LIST * s)
       ndata = q->ndata;
       s->count--;
       s->tail = q->prev;
+
       if (!s->tail)
-      {
-       s->tail = 0;
-        s->head = 0;
-       s->count = 0;
-      }
+          s->head = nullptr;
       else
-      {
-        if( q->prev ) q->prev->next = 0;
-      }
+          s->tail->next = nullptr;
+
       s_free (q);
     }
   return (NODE_DATA)ndata;
 }
 
-void sflist_remove_node (SF_LIST * s, SF_LNODE * n, void(*nfree)(void*) )
+void sflist_remove_node (SF_LIST* s, SF_LNODE* n)
 {
- // NODE_DATA ndata = 0;
   SF_LNODE * cur;
 
   if( n == s->head )
   {
         s->head = s->head->next;
         s->count--;
+
         if (!s->head)
-           {
-             s->tail = 0;
-             s->count = 0;
-           }
-        if( nfree ) nfree( n->ndata );
+             s->tail = nullptr;
+        else
+            s->head->prev = nullptr;
+
         s_free( n );
         return ;
   }
@@ -296,12 +292,12 @@ void sflist_remove_node (SF_LIST * s, SF_LNODE * n, void(*nfree)(void*) )
   {
         s->tail = s->tail->prev;
         s->count--;
+
         if (!s->tail )
-           {
              s->head = 0;
-             s->count = 0;
-           }
-        if( nfree ) nfree( n->ndata );
+        else
+            s->tail->next = nullptr;
+
         s_free( n );
         return ;
   }
@@ -316,7 +312,6 @@ void sflist_remove_node (SF_LIST * s, SF_LNODE * n, void(*nfree)(void*) )
        n->next->prev = n->prev;
        n->prev->next = n->next;
           s->count--;
-       if( nfree ) nfree( n->ndata );
        s_free(n);
        return ;
      }

diff --git a/src/utils/sflsq.h b/src/utils/sflsq.h
index fdc43d533b0f71357add01ef02563509f1e3d6d9..2f9758e3a6fbb133538dbeb1095d8222a56da40d 100644 (file)
--- a/src/utils/sflsq.h
+++ b/src/utils/sflsq.h
@@ -95,57 +95,57 @@ SF_QUEUE,SF_STACK,SF_LIST;
 *  Linked List Interface
 */ 
 SF_LIST * sflist_new ( void ); 
-void      sflist_init ( SF_LIST * s); 
-int       sflist_add_tail ( SF_LIST* s, NODE_DATA ndata );
-int       sflist_add_head ( SF_LIST* s, NODE_DATA ndata );
-int       sflist_add_before ( SF_LIST* s, SF_LNODE * lnode, NODE_DATA ndata );
-int       sflist_add_after ( SF_LIST* s, SF_LNODE * lnode, NODE_DATA ndata );
-NODE_DATA sflist_remove_head ( SF_LIST * s);
-NODE_DATA sflist_remove_tail ( SF_LIST * s); 
-void      sflist_remove_node (SF_LIST * s, SF_LNODE * n, void (*free)(void*) );
-int       sflist_count ( SF_LIST* s); 
+void      sflist_init ( SF_LIST*); 
+int       sflist_add_tail ( SF_LIST*, NODE_DATA);
+int       sflist_add_head ( SF_LIST*, NODE_DATA);
+int       sflist_add_before ( SF_LIST*, SF_LNODE*, NODE_DATA);
+int       sflist_add_after ( SF_LIST*, SF_LNODE*, NODE_DATA);
+NODE_DATA sflist_remove_head ( SF_LIST*);
+NODE_DATA sflist_remove_tail ( SF_LIST*); 
+void      sflist_remove_node (SF_LIST*, SF_LNODE*);
+int       sflist_count ( SF_LIST*); 
 NODE_DATA sflist_first(SF_LIST*, SF_LNODE**);
 NODE_DATA sflist_next(SF_LNODE**);
-void      sflist_free ( SF_LIST * s); 
-void      sflist_free_all( SF_LIST * s, void (*free)(void*) ); 
-void      sflist_static_free_all(SF_LIST *, void(*nfree)(void *));
-void      sflist_static_free(SF_LIST *);
+void      sflist_free ( SF_LIST*); 
+void      sflist_free_all( SF_LIST*, void (*free)(void*) ); 
+void      sflist_static_free_all(SF_LIST*, void(*nfree)(void *));
+void      sflist_static_free(SF_LIST*);
 
 /*
 *   Stack Interface ( LIFO - Last in, First out ) 
 */
 SF_STACK *sfstack_new ( void ); 
-int       sfstack_add( SF_STACK* s, NODE_DATA ndata ); 
-NODE_DATA sfstack_remove ( SF_STACK * s);
-int       sfstack_count ( SF_STACK * s); 
-void      sfstack_free ( SF_STACK * s); 
-void      sfstack_free_all( SF_STACK* s, void (*free)(void*) ); 
-void sfstack_static_free_all(SF_STACK *,void (*nfree)(void *));
-void sfstack_static_free(SF_STACK *);
+int       sfstack_add( SF_STACK*, NODE_DATA); 
+NODE_DATA sfstack_remove ( SF_STACK*);
+int       sfstack_count ( SF_STACK*); 
+void      sfstack_free ( SF_STACK*); 
+void      sfstack_free_all( SF_STACK*, void (*free)(void*) ); 
+void sfstack_static_free_all(SF_STACK*, void (*nfree)(void *));
+void sfstack_static_free(SF_STACK*);
 
 /*
 *   Queue Interface ( FIFO - First in, First out ) 
 */
 SF_QUEUE *sfqueue_new ( void ); 
-int       sfqueue_add( SF_QUEUE * s, NODE_DATA ndata ); 
-NODE_DATA sfqueue_remove ( SF_QUEUE * s);
-int       sfqueue_count ( SF_QUEUE * s); 
-void      sfqueue_free ( SF_QUEUE * s); 
-void      sfqueue_free_all( SF_QUEUE* s, void (*free)(void*) ); 
-void sfqueue_static_free_all(SF_QUEUE *,void (*nfree)(void *));
-void sfqueue_static_free(SF_QUEUE *);
+int       sfqueue_add( SF_QUEUE*, NODE_DATA); 
+NODE_DATA sfqueue_remove ( SF_QUEUE*);
+int       sfqueue_count ( SF_QUEUE*); 
+void      sfqueue_free ( SF_QUEUE*); 
+void      sfqueue_free_all( SF_QUEUE*, void (*free)(void*) ); 
+void sfqueue_static_free_all(SF_QUEUE*,void (*nfree)(void *));
+void sfqueue_static_free(SF_QUEUE*);
 
 /*
 * Performance Stack functions for Integer/Unsigned and Pointers, uses
 * user provided array storage, perhaps from the program stack or a global.
 * These are efficient, and use no memory functions.
 */
-int sfistack_init( SF_ISTACK * s, unsigned * a,  unsigned n  );
-int sfistack_push( SF_ISTACK *s, unsigned value);
-int sfistack_pop(  SF_ISTACK *s, unsigned * value);
+int sfistack_init( SF_ISTACK*, unsigned * a,  unsigned n  );
+int sfistack_push( SF_ISTACK*, unsigned value);
+int sfistack_pop(  SF_ISTACK*, unsigned * value);
 
-int sfpstack_init( SF_PSTACK * s, void ** a,  unsigned n  );
-int sfpstack_push( SF_PSTACK *s, void * value);
-int sfpstack_pop(  SF_PSTACK *s, void ** value);
+int sfpstack_init( SF_PSTACK*, void ** a,  unsigned n  );
+int sfpstack_push( SF_PSTACK*, void * value);
+int sfpstack_pop(  SF_PSTACK*, void ** value);
 
 #endif

diff --git a/src/utils/snort_bounds.h b/src/utils/snort_bounds.h
index 926af3f6bc241f70045cdc648b38eb27e92e8e36..8ca947c8f5fef80b2bc70eed119eafa016cad02c 100644 (file)
--- a/src/utils/snort_bounds.h
+++ b/src/utils/snort_bounds.h
@@ -103,6 +103,8 @@ static inline int SafeMemCheck(const void *dst, size_t n,
  */
 static inline int SafeMemcpy(void *dst, const void *src, size_t n, const void *start, const void *end)
 {
+    if ( !n )
+        return SAFEMEM_SUCCESS;
     if (SafeMemCheck(dst, n, start, end) != SAFEMEM_SUCCESS)
         ERRORRET;
     if (src == NULL)

diff --git a/src/utils/stats.cc b/src/utils/stats.cc
index a1dd2f6b64b51a599621c9cbb546d5272dc49efc..46d6d586ab9d9d77c6bf3cd70f0659b9656632f6 100644 (file)
--- a/src/utils/stats.cc
+++ b/src/utils/stats.cc
@@ -28,6 +28,7 @@
 
 #include "snort.h"
 #include "util.h"
+#include "helpers/process.h"
 #include "packet_io/sfdaq.h"
 #include "packet_io/active.h"
 #include "packet_io/trough.h"
@@ -318,6 +319,7 @@ void DropStats()
 #endif
     proc_stats.attribute_table_hosts = SFAT_NumberOfHosts();
     show_stats((PegCount*)&proc_stats, proc_names, array_size(proc_names)-1, "process");
+    log_malloc_info();
 }
 
 //-------------------------------------------------------------------------

diff --git a/src/utils/util.cc b/src/utils/util.cc
index 71e5b9e2c19af8ab328df9a8905916f698167233..9886816593622ecc10951f1941cfd9be1160ade0 100644 (file)
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -113,7 +113,7 @@ int DisplayBanner(void)
     LogMessage("  o\"  )~   Version %s (Build %s) %s\n",
                VERSION, BUILD, info);
     LogMessage("   ''''    By Martin Roesch & The Snort Team\n");
-    LogMessage("           http://snort.org/snort/snort-team\n");
+    LogMessage("           http://snort.org/contact#team\n");
     LogMessage("           Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.\n");
     LogMessage("           Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n");
 #ifdef HAVE_PCAP_LIB_VERSION
@@ -127,8 +127,6 @@ int DisplayBanner(void)
     return 0;
 }
 
-
-
 /****************************************************************************
  *
  * Function: ts_print(const struct, char *)
@@ -177,9 +175,11 @@ void ts_print(const struct timeval *tvp, char *timebuf)
 
     if (ScOutputIncludeYear())
     {
+        int year = (lt->tm_year >= 100) ? (lt->tm_year - 100) : lt->tm_year;
+
         (void) SnortSnprintf(timebuf, TIMEBUF_SIZE,
                         "%02d/%02d/%02d-%02d:%02d:%02d.%06u ",
-                        lt->tm_mon + 1, lt->tm_mday, lt->tm_year - 100,
+                        lt->tm_mon + 1, lt->tm_mday, year,
                         s / 3600, (s % 3600) / 60, s % 60,
                         (u_int) tvp->tv_usec);
     }