Merge pull request #2169 in SNORT/snort3 from ~RDEMPSTE/snort3:remove_qos_from_firewa...

Squashed commit of the following:

commit 40b91128051a27ef58af8b2963927cd550ab9227
Author: rdempste <rdempste@cisco.com>
Date:   Thu Apr 16 16:20:23 2020 -0400

    snort2lua: make qos configuration values deleted from firewall

diff --git a/tools/snort2lua/preprocessor_states/pps_firewall.cc b/tools/snort2lua/preprocessor_states/pps_firewall.cc
index a56ae9d71c7ffa080b5c2385aca1786c992a2d40..c11d8481543bcef59fe4998aa1b9e4fa1f31822e 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_firewall.cc
+++ b/tools/snort2lua/preprocessor_states/pps_firewall.cc
@@ -54,7 +54,7 @@ namespace preprocessors
             if (keyword == "fw_rule_path")
                 tmpval = parse_string_option("fw_rule_path", data_stream);
             else if (keyword == "qos_rule_path")
-                tmpval = parse_string_option("qos_rule_path", data_stream);
+                tmpval = parse_deleted_option("qos_rule_path", data_stream);
             else if (keyword == "dns_rule_path")
                 tmpval = parse_string_option("dns_rule_path", data_stream);
             else if (keyword == "url_rule_path")
@@ -103,7 +103,7 @@ namespace preprocessors
             else if (keyword == "fw_app_stats")
                 tmpval = parse_string_option("app_stats_filename", data_stream);
             else if (keyword == "fw_qos_rule_stats")
-                tmpval = parse_string_option("qos_rule_stats_filename", data_stream);
+                tmpval = parse_deleted_option("qos_rule_stats_filename", data_stream);
             else if (keyword == "fw_intf_stats")
                 tmpval = parse_string_option("intf_stats_filename", data_stream);
             else if (keyword == "fw_stats_time")