From: Russ Combs <rucombs@cisco.com>
Date: Wed, 10 Sep 2014 22:18:56 +0000 (-0400)
Subject: latest from josh
X-Git-Tag: 3.0.0-233~1414^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fd8a3c80d1dbd9b0d0815e3ea58461ed26ce13f;p=thirdparty%2Fsnort3.git

latest from josh
---

diff --git a/ChangeLog b/ChangeLog
index 9b82ea6d3..e35e365c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 -- fixed packet direction
 -- added default service bindings when wizard is configured but binder is not
 -- updated snort.lua
+-- latest from Josh
 
 118
 -- fixed bind action
diff --git a/src/flow/flow_control.cc b/src/flow/flow_control.cc
index c40918686..9efce71d2 100644
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@ -37,6 +37,7 @@
 #include "protocols/layer.h"
 #include "protocols/vlan.h"
 #include "managers/inspector_manager.h"
+#include "sfip/sf_ip.h"
 
 FlowControl::FlowControl(Inspector* pi)
 {
diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index 3d5d62d9c..808ffb11a 100644
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -494,7 +494,7 @@ static void instantiate_binder(SnortConfig* sc, FrameworkPolicy* fp)
     if ( tcp )
         m->add(PROTO_BIT__TCP, wiz_id);
 
-//    if ( udp )
+    if ( udp )
         m->add(PROTO_BIT__UDP, wiz_id);
 
     const InspectApi* api = get_plugin(bind_id);
diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index d809ebdb2..6a3dccf78 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -5777,9 +5777,8 @@ static inline uint32_t GetForwardDir (const Packet* p)
 // the key difference is that we operate on forward moving data
 // because we don't wait until it is acknowledged
 static inline uint32_t flush_pdu_ips (
-    TcpSession* ssn, StreamTracker* trk, Packet* pkt, uint32_t* flags)
+    TcpSession* ssn, StreamTracker* trk, uint32_t* flags)
 {
-    bool to_srv = ( *flags == PKT_FROM_CLIENT );
     uint32_t total = 0, avail;
     StreamSegment* seg;
     PROFILE_VARS;
@@ -5849,7 +5848,7 @@ static inline int CheckFlushPolicyOnData(
         case STREAM_FLPOLICY_ON_DATA:
         {
             uint32_t flags = GetForwardDir(p);
-            uint32_t flush_amt = flush_pdu_ips(tcpssn, listener, p, &flags);
+            uint32_t flush_amt = flush_pdu_ips(tcpssn, listener, &flags);
             uint32_t this_flush;
 
             while ( flush_amt > 0 )
@@ -5881,7 +5880,7 @@ static inline int CheckFlushPolicyOnData(
 
                 flushed += this_flush;
                 flags = GetForwardDir(p);
-                flush_amt = flush_pdu_ips(tcpssn, listener, p, &flags);
+                flush_amt = flush_pdu_ips(tcpssn, listener, &flags);
             }
             if ( !flags && listener->splitter->is_paf() )
             {
@@ -5916,9 +5915,8 @@ static inline int CheckFlushPolicyOnData(
 //   know where we left off and can resume scanning the remainder
 
 static inline uint32_t flush_pdu_ackd (
-    TcpSession* ssn, StreamTracker* trk, Packet* pkt, uint32_t* flags)
+    TcpSession* ssn, StreamTracker* trk, uint32_t* flags)
 {
-    bool to_srv = ( *flags == PKT_FROM_CLIENT );
     uint32_t total = 0;
     StreamSegment* seg;
     PROFILE_VARS;
@@ -5988,7 +5986,7 @@ int CheckFlushPolicyOnAck(
         case STREAM_FLPOLICY_ON_ACK:
         {
             uint32_t flags = GetReverseDir(p);
-            uint32_t flush_amt = flush_pdu_ackd(tcpssn, talker, p, &flags);
+            uint32_t flush_amt = flush_pdu_ackd(tcpssn, talker, &flags);
 
             while ( flush_amt > 0 )
             {
@@ -6010,7 +6008,7 @@ int CheckFlushPolicyOnAck(
                     break;
 
                 flags = GetReverseDir(p);
-                flush_amt = flush_pdu_ackd(tcpssn, talker, p, &flags);
+                flush_amt = flush_pdu_ackd(tcpssn, talker, &flags);
             }
             if ( !flags && talker->splitter->is_paf() )
             {