From: rcombs <rcombs@sq18.sfeng.sourcefire.com>
Date: Mon, 22 Sep 2014 18:17:17 +0000 (-0400)
Subject: Merge branch 'master' of /nfs/home/rucombs/Snort++
X-Git-Tag: 3.0.0-233~1404^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38cd1ee675bebf6557fc7a20fef23c87d053e518;p=thirdparty%2Fsnort3.git

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

38cd1ee675bebf6557fc7a20fef23c87d053e518
diff --cc src/flow/flow_control.cc
index b3e0b7f0e,54d47dade..f71041e77
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@@ -329,12 -329,13 +329,15 @@@ unsigned FlowControl::process(FlowCache
  
      p->flow = flow;
  
-     if ( !flow->flow_state )
+     if ( flow->flow_state )
+         set_policies(snort_conf, flow->policy_id);
+ 
+     else
      {
          init_roles(p, flow);
 -        InspectorManager::get_binder()->eval(p);
 +        Inspector* b = InspectorManager::get_binder();
 +        if ( b )
 +            b->eval(p);
          ++news;
      }