From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Tue, 9 Apr 2019 17:33:56 +0000 (-0400)
Subject: Merge pull request #1569 in SNORT/snort3 from ~MASHASAN/snort3:tp_config_path to... 
X-Git-Tag: 3.0.0-252~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ee96aa3e05f000caf14d4657bbc14d860860d26;p=thirdparty%2Fsnort3.git

Merge pull request #1569 in SNORT/snort3 from ~MASHASAN/snort3:tp_config_path to master

Squashed commit of the following:

commit da74dfd4ea9c7b2bfe51156c83cb0e4cf77ac987
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Apr 2 09:18:00 2019 -0400

    snort2lua: Adding support for appid tp_config_path conversion
---

diff --git a/tools/snort2lua/preprocessor_states/pps_appid.cc b/tools/snort2lua/preprocessor_states/pps_appid.cc
index 4df502e9a..0ba6b249c 100644
--- a/tools/snort2lua/preprocessor_states/pps_appid.cc
+++ b/tools/snort2lua/preprocessor_states/pps_appid.cc
@@ -137,6 +137,19 @@ bool AppId::convert(std::istringstream& data_stream)
                 tmpval = false;
             }
         }
+        else if (keyword == "tp_config_path")
+        {
+            std::string file_name;
+            if (arg_stream >> file_name)
+            {
+                tmpval = table_api.add_option("tp_appid_config", file_name);
+            }
+            else
+            {
+                data_api.failed_conversion(arg_stream,  "appid: tp_config_path <missing_arg>");
+                tmpval = false;
+            }
+        }
         else
         {
             tmpval = false;