From: Andres Avila Segura (aavilase) <aavilase@cisco.com>
Date: Thu, 21 Nov 2024 13:44:24 +0000 (+0000)
Subject: Pull request #4493: appid: adding full path to read list of lua detectors
X-Git-Tag: 3.6.0.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe043e905a5677cf74bba00d53c4f8e978a039a;p=thirdparty%2Fsnort3.git

Pull request #4493: appid: adding full path to read list of lua detectors

Merge in SNORT/snort3 from ~AAVILASE/snort3:reduce_appid_test_load_time to master

Squashed commit of the following:

commit fe548a9e96f666fe57435bf404faac94d58a85bf
Author: Andres Avila Segura <aavilase@cisco.com>
Date:   Wed Oct 23 12:39:40 2024 -0400

    appid: adding full path to read list of lua detectors
---

diff --git a/src/network_inspectors/appid/lua_detector_module.cc b/src/network_inspectors/appid/lua_detector_module.cc
index f321d6308..a463db44f 100644
--- a/src/network_inspectors/appid/lua_detector_module.cc
+++ b/src/network_inspectors/appid/lua_detector_module.cc
@@ -589,7 +589,8 @@ void ControlLuaDetectorManager::load_lua_detectors(const char* path, bool is_cus
                     appid_log(nullptr, TRACE_WARNING_LEVEL, "appid: leak of %d lua stack elements before detector load\n", lua_top);
                 while (std::getline(file, line))
                 {
-                    process_detector_file(const_cast<char*>(line.c_str()), is_custom);
+                    std::string full_path = std::string(path) + "/" + line;
+                    process_detector_file(const_cast<char*>(full_path.c_str()), is_custom);
                 }
             }
             return;