From: Hui Cao (huica) <huica@cisco.com>
Date: Wed, 9 Nov 2016 15:53:14 +0000 (-0500)
Subject: Merge pull request #701 in SNORT/snort3 from appid_cleanup_reg_tests to master
X-Git-Tag: 3.0.0-233~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5db77fbddde58a3053553cbb33852aa469891420;p=thirdparty%2Fsnort3.git

Merge pull request #701 in SNORT/snort3 from appid_cleanup_reg_tests to master

Squashed commit of the following:

commit 4d63e4974dba68a76a568c402e34466b23d6a188
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date:   Tue Nov 8 16:18:43 2016 -0500

    remove function that logged debug info that was no longer useful
---

diff --git a/src/network_inspectors/appid/app_info_table.cc b/src/network_inspectors/appid/app_info_table.cc
index 5b8693952..916aa5dfa 100644
--- a/src/network_inspectors/appid/app_info_table.cc
+++ b/src/network_inspectors/appid/app_info_table.cc
@@ -98,31 +98,6 @@ static AppId get_static_app_info_entry(AppId appid)
     return 0;
 }
 
-void checkSandboxDetection(AppId appId)
-{
-    if (AppIdConfig::get_appid_config()->mod_config->instance_id)
-    {
-        auto entry = AppInfoManager::get_instance().get_app_info_entry(appId);
-        if ( entry && ( entry->flags & APPINFO_FLAG_ACTIVE ) )
-        {
-            DebugFormat(DEBUG_APPID, "Detected application %d is active.\n", entry->appId);
-        }
-        else if( appId != 0 )
-        {
-            if(entry)
-            {
-                DebugFormat(DEBUG_APPID, "Detected application %d is not active.\n", appId);
-            }
-            else
-            {
-                DebugFormat(DEBUG_APPID,
-                            "No entry in application info table for detected application %d.\n",
-                            appId);
-            }
-        }
-    }
-}
-
 AppInfoTableEntry* AppInfoManager::get_app_info_entry(AppId appId, const AppInfoTable& lookup_table)
 {
     AppId tmp;
diff --git a/src/network_inspectors/appid/app_info_table.h b/src/network_inspectors/appid/app_info_table.h
index 24091ca55..3e8d9d73e 100644
--- a/src/network_inspectors/appid/app_info_table.h
+++ b/src/network_inspectors/appid/app_info_table.h
@@ -157,7 +157,5 @@ private:
     std::mutex custom_app_mutex;
 };
 
-void checkSandboxDetection(AppId appId);
-
 #endif
 
diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index 5598139d9..6c9bcfff2 100644
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -91,7 +91,6 @@ void AppIdSession::add_user(AppIdSession* asd, const char* username, AppId appId
 
 void AppIdSession::add_payload(AppIdSession* asd, AppId payload_id)
 {
-    checkSandboxDetection(payload_id);
     asd->payload_app_id = payload_id;
 }
 
@@ -2286,8 +2285,6 @@ void AppIdSession::set_client_app_id_data(AppId id, char** version)
         unsigned prev_priority = app_info_mgr->get_app_info_priority(client_app_id);
         unsigned curr_priority = app_info_mgr->get_app_info_priority(id);
 
-        checkSandboxDetection(id);
-
         if ((client_app_id) && (prev_priority > curr_priority ))
             return;
         client_app_id = id;
@@ -2456,10 +2453,7 @@ void AppIdSession::set_referred_payload_app_id_data(AppId id)
         return;
 
     if (referred_payload_app_id != id)
-    {
-        checkSandboxDetection(id);
         referred_payload_app_id = id;
-    }
 }
 
 void AppIdSession::set_payload_app_id_data(ApplicationId id, char** version)
@@ -2472,8 +2466,6 @@ void AppIdSession::set_payload_app_id_data(ApplicationId id, char** version)
         unsigned prev_priority = app_info_mgr->get_app_info_priority(payload_app_id);
         unsigned curr_priority = app_info_mgr->get_app_info_priority(id);
 
-        checkSandboxDetection(id);
-
         if ((payload_app_id ) && (prev_priority > curr_priority ))
             return;
 
@@ -2515,7 +2507,6 @@ void AppIdSession::set_service_appid_data(AppId id, char* vendor, char** version
     if (serviceAppId != id)
     {
         serviceAppId = id;
-        checkSandboxDetection(id);
 
         /* Clear out previous values of vendor & version */
         if (serviceVendor)
@@ -3513,10 +3504,7 @@ int AppIdSession::process_http_packet(int direction)
     memset(&hmp, 0, sizeof(hmp));
 
     if (serviceAppId == APP_ID_NONE)
-    {
         serviceAppId = APP_ID_HTTP;
-        checkSandboxDetection(APP_ID_HTTP);
-    }
 
     if (session_logging_enabled)
         LogMessage("AppIdDbg %s chp_finished %d chp_hold_flow %d\n", session_logging_id,
diff --git a/src/network_inspectors/appid/client_plugins/client_app_base.cc b/src/network_inspectors/appid/client_plugins/client_app_base.cc
index be6263f0b..631f9ef64 100644
--- a/src/network_inspectors/appid/client_plugins/client_app_base.cc
+++ b/src/network_inspectors/appid/client_plugins/client_app_base.cc
@@ -721,7 +721,6 @@ void AppIdAddClientApp(AppIdSession* asd, AppId service_id, AppId id, const char
     asd->set_session_flags(APPID_SESSION_CLIENT_DETECTED);
     asd->client_service_app_id = service_id;
     asd->client_app_id = id;
-    checkSandboxDetection(id);
 }
 
 static void AppIdAddClientAppInfo(AppIdSession* asd, const char* info)
diff --git a/src/network_inspectors/appid/service_plugins/service_base.cc b/src/network_inspectors/appid/service_plugins/service_base.cc
index df4ae28fa..f3d6e1f90 100644
--- a/src/network_inspectors/appid/service_plugins/service_base.cc
+++ b/src/network_inspectors/appid/service_plugins/service_base.cc
@@ -340,8 +340,6 @@ AppId getPortServiceId(IpProtocol proto, uint16_t port, const AppIdConfig* confi
     else
         appId = config->ip_protocol[(uint16_t)proto];
 
-    checkSandboxDetection(appId);
-
     return appId;
 }
 
@@ -1143,7 +1141,6 @@ static int AppIdServiceAddServiceEx(AppIdSession* asd, const Packet* pkt, int di
     }
     asd->set_session_flags(APPID_SESSION_SERVICE_DETECTED);
     asd->serviceAppId = appId;
-    checkSandboxDetection(appId);
 
     if (asd->get_session_flags(APPID_SESSION_IGNORE_HOST))
         return SERVICE_SUCCESS;