detect/threshold: regex cleanup

diff --git a/src/detect-threshold.c b/src/detect-threshold.c
index 2748557a22f59adb3207b0d7c7d96570822f26bc..d368a8dbcbb2de4e761ca1bf9d7aafe944e90253 100644 (file)
--- a/src/detect-threshold.c
+++ b/src/detect-threshold.c
@@ -60,12 +60,13 @@
 #include "util-cpu.h"
 #endif
 
+#define PARSE_REGEX_NAME  "(track|type|count|seconds)"
+#define PARSE_REGEX_VALUE "(limit|both|threshold|by_dst|by_src|by_both|by_rule|by_flow|\\d+)"
+
 #define PARSE_REGEX                                                                                \
-    "^\\s*(track|type|count|seconds)\\s+(limit|both|threshold|by_dst|by_src|by_both|by_rule|by_"   \
-    "flow|\\d+)\\s*,\\s*(track|type|count|seconds)\\s+(limit|both|threshold|by_dst|by_src|by_"     \
-    "both|by_rule|by_flow|\\d+)\\s*,\\s*(track|type|count|seconds)\\s+(limit|both|threshold|by_"   \
-    "dst|by_src|by_both|by_rule|by_flow|\\d+)\\s*,\\s*(track|type|count|seconds)\\s+(limit|both|"  \
-    "threshold|by_dst|by_src|by_both|by_rule|by_flow|\\d+)\\s*"
+    "^\\s*" PARSE_REGEX_NAME "\\s+" PARSE_REGEX_VALUE "\\s*,\\s*" PARSE_REGEX_NAME                 \
+    "\\s+" PARSE_REGEX_VALUE "\\s*,\\s*" PARSE_REGEX_NAME "\\s+" PARSE_REGEX_VALUE                 \
+    "\\s*,\\s*" PARSE_REGEX_NAME "\\s+" PARSE_REGEX_VALUE "\\s*"
 
 static DetectParseRegex parse_regex;