Merge branch 'master' of /nfs/home/rucombs/Snort++ into codecs

diff --cc src/main/snort.cc
Simple merge

diff --cc src/main/snort_config.cc
Simple merge

diff --cc src/main/snort_config.h
Simple merge

diff --cc src/parser/parser.cc
index 050f675b4b4009f3b2f56a68df5957b650ecfc3d,892c5c8bea18bcaaac875a08c550077e5fa57c1d..487561578b4741a5786dba1b4f43fa9c065b074d
--- 1/src/parser/parser.cc
--- 2/src/parser/parser.cc
+++ b/src/parser/parser.cc
@@@ -78,8 -80,16 +79,9 @@@
  #include "keywords.h"
  #include "parse_conf.h"
  #include "parse_rule.h"
+ #include "parse_stream.h"
  #include "vars.h"
  #include "target_based/sftarget_reader.h"
 -#include "events/event_wrapper.h"  // see s_hack
 -
 -// FIXIT-L without s_hack, we get this error on Mac:
 -// Symbol not found: __Z18GenerateSnortEventP6Packetjj
 -// Referenced from: /Users/rucombs/install/lib/snort/inspectors/libport_scan.0.dylib
 -// Expected in: flat namespace
 -static uint32_t (*s_hack)(Packet*, uint32_t, uint32_t) = GenerateSnortEvent;
  
  static unsigned parse_errors = 0;
  

diff --cc src/stream/stream_splitter.h
Simple merge

diff --cc src/target_based/sftarget_reader.cc
index 5314d73da4bacf48fcffee3637c4b509aa21b4e3,680e171403d7459aa8ad241c399113c26ad17a27..53259836d951764a8592cd2fe4f6f03f25c24904
--- 1/src/target_based/sftarget_reader.cc
--- 2/src/target_based/sftarget_reader.cc
+++ b/src/target_based/sftarget_reader.cc
@@@ -49,13 -49,7 +49,8 @@@
  #include "perf_monitor/perf.h"
  #include "snort.h"
  #include "snort_debug.h"
 +#include "utils/stats.h"
  
- #define SFAT_CHECKHOST \
-     if (!current_host) return SFAT_ERROR;
- #define SFAT_CHECKAPP \
-     if (!current_app) return SFAT_ERROR;
- 
  #define ATTRIBUTE_MAP_MAX_ROWS 1024
  
  struct tTargetBasedConfig