Merge pull request #1401 in SNORT/snort3 from file_gid to master

Squashed commit of the following:

commit 0b038d5d6442ef1eedffbdddb49413012357797f
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Oct 24 14:19:35 2018 -0400

    file_api: revert deleting gid 146 so existing 146 rulesets dont attempt empty rule eval

diff --git a/src/file_api/file_module.h b/src/file_api/file_module.h
index ae860930df3bcd7586495f3701c86d3350fcd699..fca12fe42391279f6d4934d24ec20f891fc38140 100644 (file)
--- a/src/file_api/file_module.h
+++ b/src/file_api/file_module.h
@@ -54,6 +54,11 @@ public:
 
     void show_dynamic_stats() override;
 
+    // FIXIT-L delete file_id gid when bogus rules are eliminated
+    // (this ensures those rules don't fire on every packet)
+    unsigned get_gid() const override
+    { return 146; }
+
 private:
     FileMagicRule rule;
     FileMagicData magic;