From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Tue, 30 Jul 2019 16:04:59 +0000 (-0400)
Subject: Merge pull request #1694 in SNORT/snort3 from ~MASHASAN/snort3:wizard_host_cache... 
X-Git-Tag: 3.0.0-259~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bc3ee3f66ba0c4624cafa72e0ffc096ccf731eb;p=thirdparty%2Fsnort3.git

Merge pull request #1694 in SNORT/snort3 from ~MASHASAN/snort3:wizard_host_cache to master

Squashed commit of the following:

commit 0c6bdabbfea675104681c4b13ed7ba33acd5344d
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Jul 29 13:55:00 2019 -0400

    wizard: Avoiding host cache service insertion since we are using flow service
---

diff --git a/src/service_inspectors/wizard/wizard.cc b/src/service_inspectors/wizard/wizard.cc
index 768adfb74..2465d7c5c 100644
--- a/src/service_inspectors/wizard/wizard.cc
+++ b/src/service_inspectors/wizard/wizard.cc
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#include "host_tracker/host_cache.h"
 #include "flow/flow.h"
 #include "log/messages.h"
 #include "profiler/profiler.h"
@@ -262,14 +261,7 @@ bool Wizard::spellbind(
     const MagicPage*& m, Flow* f, const uint8_t* data, unsigned len)
 {
     f->service = m->book.find_spell(data, len, m);
-
-    if ( f->service != nullptr )
-    {
-        host_cache[f->server_ip]->add_service(f->server_port, (IpProtocol)f->ip_proto);
-        return true;
-    }
-
-    return false;
+    return ( f->service != nullptr );
 }
 
 bool Wizard::cursebind(vector<CurseServiceTracker>& curse_tracker, Flow* f,
@@ -281,10 +273,7 @@ bool Wizard::cursebind(vector<CurseServiceTracker>& curse_tracker, Flow* f,
         {
             f->service = cst.curse->service.c_str();
             if ( f->service != nullptr )
-            {
-                host_cache[f->server_ip]->add_service(f->server_port, (IpProtocol)f->ip_proto);
                 return true;
-            }
         }
     }