From: Josh <jrosenba@cisco.com>
Date: Wed, 27 Aug 2014 19:10:44 +0000 (-0400)
Subject: Merge branch 'master' of /nfs/home/rucombs/Snort++ into codecs
X-Git-Tag: 3.0.0-233~1417^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b698a395cf635bcfff3e9b9809edffb6c3dcca4;p=thirdparty%2Fsnort3.git

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

3b698a395cf635bcfff3e9b9809edffb6c3dcca4
diff --cc src/parser/parser.cc
index 050f675b4,892c5c8be..487561578
--- a/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/target_based/sftarget_reader.cc
index 5314d73da,680e17140..53259836d
--- a/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