Merge pull request #602 in SNORT/snort3 from ips_fragbits_edit to master

Squashed commit of the following:

commit 9571d405e2dc4b54d2cd97e1106a2cf13f33d591
Author: alewis <albert.l.lewis@gmail.com>
Date:   Mon Aug 22 21:19:52 2016 -0400

    removed has_*_mode() functions as the logic was changed from if/else ladder to use a switch statement

diff --git a/src/ips_options/ips_fragbits.cc b/src/ips_options/ips_fragbits.cc
index 4abcb0020065a539ea99183c99595b6f0fc71f83..19d350b35ca653c002308c8239d1f790b49b244c 100644 (file)
--- a/src/ips_options/ips_fragbits.cc
+++ b/src/ips_options/ips_fragbits.cc
@@ -110,11 +110,6 @@ private:
     const static char ANY_FLAG = '*'; 
     const static char NOT_FLAG = '!';
     
-    bool has_normal_mode();
-    bool has_any_mode();
-    bool has_not_mode();
-    bool has_plus_mode();
-    
     bool check_normal(const uint16_t);
     bool check_any(const uint16_t);
     bool check_not(const uint16_t);
@@ -149,18 +144,6 @@ void FragBitsData::set_plus_mode()
 void FragBitsData::set_not_mode()
 { mode = NOT; }
 
-bool FragBitsData::has_normal_mode()
-{ return (mode == NORMAL); }
-
-bool FragBitsData::has_any_mode()
-{ return (mode == ANY); }
-
-bool FragBitsData::has_not_mode()
-{ return (mode == NOT); }
-
-bool FragBitsData::has_plus_mode() 
-{ return (mode == PLUS); }
-
 // this is the function that checks for a match
 bool FragBitsData::is_match(Packet* p) 
 {