Merge pull request #927 in SNORT/snort3 from flow_errors to master

Squashed commit of the following:

commit de672298786ea7070ca647594ee8d9a511ab5f9d
Author: allewi <allewi@cisco.com>
Date:   Wed Jun 7 11:22:14 2017 -0400

    removed unused code

diff --git a/src/ips_options/ips_flow.cc b/src/ips_options/ips_flow.cc
index c7d7498ad82152402f529b6634e35acf3da1b04a..162a91ffeddcfb9dbe38653c688ff712d940f408 100644 (file)
--- a/src/ips_options/ips_flow.cc
+++ b/src/ips_options/ips_flow.cc
@@ -227,32 +227,6 @@ int OtnFlowFromClient(OptTreeNode* otn)
     return 0;
 }
 
-int OtnFlowIgnoreReassembled(OptTreeNode* otn)
-{
-    FlowCheckOption* fco =
-        (FlowCheckOption*)get_rule_type_data(otn, s_name);
-
-    if ( fco )
-    {
-        if ( fco->config.ignore_reassembled )
-            return 1;
-    }
-    return 0;
-}
-
-int OtnFlowOnlyReassembled(OptTreeNode* otn)
-{
-    FlowCheckOption* fco =
-        (FlowCheckOption*)get_rule_type_data(otn, s_name);
-
-    if ( fco )
-    {
-        if ( fco->config.only_reassembled )
-            return 1;
-    }
-    return 0;
-}
-
 //-------------------------------------------------------------------------
 // support methods
 //-------------------------------------------------------------------------

diff --git a/src/ips_options/ips_flow.h b/src/ips_options/ips_flow.h
index 6eedd691ea87f88a3361633b18395953085d5cca..e52cca1c16cf25e3a3137c18779d632dfac36bfd 100644 (file)
--- a/src/ips_options/ips_flow.h
+++ b/src/ips_options/ips_flow.h
@@ -25,8 +25,6 @@ struct OptTreeNode;
 
 int OtnFlowFromServer(OptTreeNode*);
 int OtnFlowFromClient(OptTreeNode*);
-int OtnFlowIgnoreReassembled(OptTreeNode*);
-int OtnFlowOnlyReassembled(OptTreeNode*);
 
 #endif