From: Victor Julien <victor@inliniac.net>
Date: Tue, 1 Oct 2019 12:05:08 +0000 (+0200)
Subject: detect/priority: use global define for default prio
X-Git-Tag: suricata-5.0.0~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43b5234055f3ed69d53fe8486a1cf01aac1cc198;p=thirdparty%2Fsuricata.git

detect/priority: use global define for default prio
---

diff --git a/src/detect-classtype.c b/src/detect-classtype.c
index bd0dbbdb1c..5fbe689de3 100644
--- a/src/detect-classtype.c
+++ b/src/detect-classtype.c
@@ -116,12 +116,13 @@ static int DetectClasstypeSetup(DetectEngineCtx *de_ctx, Signature *s, const cha
     SCClassConfClasstype *ct = SCClassConfGetClasstype(parsed_ct_name, de_ctx);
     if (ct == NULL) {
         SCLogWarning(SC_ERR_UNKNOWN_VALUE, "unknown classtype: \"%s\", "
-                "using default priority 3", parsed_ct_name);
+                "using default priority %d",
+                parsed_ct_name, DETECT_DEFAULT_PRIO);
 
         char str[2048];
         snprintf(str, sizeof(str),
-                "config classification: %s,Unknown Classtype,3\n",
-                parsed_ct_name);
+                "config classification: %s,Unknown Classtype,%d\n",
+                parsed_ct_name, DETECT_DEFAULT_PRIO);
 
         if (SCClassConfAddClasstype(de_ctx, str, 0) < 0)
             return -1;
diff --git a/src/detect-parse.c b/src/detect-parse.c
index caf2fa6435..8c1f6bf194 100644
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -1800,7 +1800,7 @@ static Signature *SigInitHelper(DetectEngineCtx *de_ctx, const char *sigstr,
 
     /* signature priority hasn't been overwritten.  Using default priority */
     if (sig->prio == -1)
-        sig->prio = 3;
+        sig->prio = DETECT_DEFAULT_PRIO;
 
     sig->num = de_ctx->signum;
     de_ctx->signum++;
diff --git a/src/detect.h b/src/detect.h
index c4babf91ff..ae936040b9 100644
--- a/src/detect.h
+++ b/src/detect.h
@@ -57,6 +57,10 @@
 
 #define DETECT_TRANSFORMS_MAX 16
 
+/** default rule priority if not set through priority keyword or via
+ *  classtype. */
+#define DETECT_DEFAULT_PRIO 3
+
 /* forward declarations for the structures from detect-engine-sigorder.h */
 struct SCSigOrderFunc_;
 struct SCSigSignatureWrapper_;