mqtt: move sub/unsub limits into app-layer config

diff --git a/src/detect-mqtt-subscribe-topic.c b/src/detect-mqtt-subscribe-topic.c
index 390da5c2987b705b3584af05a51859eff6f892e2..32d7b1608354ffaa1ca7b16b9f3ed6f2270d8336 100644 (file)
--- a/src/detect-mqtt-subscribe-topic.c
+++ b/src/detect-mqtt-subscribe-topic.c
@@ -204,7 +204,7 @@ void DetectMQTTSubscribeTopicRegister (void)
     sigmatch_table[DETECT_AL_MQTT_SUBSCRIBE_TOPIC].flags |= SIGMATCH_INFO_STICKY_BUFFER;
 
     intmax_t val = 0;
-    if (ConfGetInt("mqtt.subscribe-topic-match-limit", &val)) {
+    if (ConfGetInt("app-layer.protocols.mqtt.subscribe-topic-match-limit", &val)) {
         subscribe_topic_match_limit = val;
     }
     if (subscribe_topic_match_limit <= 0) {

diff --git a/src/detect-mqtt-unsubscribe-topic.c b/src/detect-mqtt-unsubscribe-topic.c
index 24f0a3696a9b597b8ff23ffbea1a6de4e36fd27d..671cfebaf4e60db555bcbca557ce86ed54f77415 100644 (file)
--- a/src/detect-mqtt-unsubscribe-topic.c
+++ b/src/detect-mqtt-unsubscribe-topic.c
@@ -204,7 +204,7 @@ void DetectMQTTUnsubscribeTopicRegister (void)
     sigmatch_table[DETECT_AL_MQTT_UNSUBSCRIBE_TOPIC].flags |= SIGMATCH_INFO_STICKY_BUFFER;
 
     intmax_t val = 0;
-    if (ConfGetInt("mqtt.unsubscribe-topic-match-limit", &val)) {
+    if (ConfGetInt("app-layer.protocols.mqtt.unsubscribe-topic-match-limit", &val)) {
         unsubscribe_topic_match_limit = val;
     }
     if (unsubscribe_topic_match_limit <= 0) {

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 2f1b44787c8634c6d9f9a69c5e1a1310cf02c807..ba1a983b3868c2af4dd8ac165e7818c66d6cbe3c 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -726,6 +726,8 @@ app-layer:
     mqtt:
       # enabled: no
       # max-msg-length: 1mb
+      # subscribe-topic-match-limit: 100
+      # unsubscribe-topic-match-limit: 100
     krb5:
       enabled: yes
     snmp:
@@ -1115,11 +1117,6 @@ pcre:
   match-limit: 3500
   match-limit-recursion: 1500
 
-# MQTT topic detection depth
-#mqtt:
-#  subscribe-topic-match-limit: 100
-#  unsubscribe-topic-match-limit: 100
-
 ##
 ## Advanced Traffic Tracking and Reconstruction Settings
 ##