detect/priority: use global define for default prio

pull/4288/head
Victor Julien 7 years ago
parent 954c43daf4
commit 43b5234055

@ -116,12 +116,13 @@ static int DetectClasstypeSetup(DetectEngineCtx *de_ctx, Signature *s, const cha
SCClassConfClasstype *ct = SCClassConfGetClasstype(parsed_ct_name, de_ctx); SCClassConfClasstype *ct = SCClassConfGetClasstype(parsed_ct_name, de_ctx);
if (ct == NULL) { if (ct == NULL) {
SCLogWarning(SC_ERR_UNKNOWN_VALUE, "unknown classtype: \"%s\", " 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]; char str[2048];
snprintf(str, sizeof(str), snprintf(str, sizeof(str),
"config classification: %s,Unknown Classtype,3\n", "config classification: %s,Unknown Classtype,%d\n",
parsed_ct_name); parsed_ct_name, DETECT_DEFAULT_PRIO);
if (SCClassConfAddClasstype(de_ctx, str, 0) < 0) if (SCClassConfAddClasstype(de_ctx, str, 0) < 0)
return -1; return -1;

@ -1800,7 +1800,7 @@ static Signature *SigInitHelper(DetectEngineCtx *de_ctx, const char *sigstr,
/* signature priority hasn't been overwritten. Using default priority */ /* signature priority hasn't been overwritten. Using default priority */
if (sig->prio == -1) if (sig->prio == -1)
sig->prio = 3; sig->prio = DETECT_DEFAULT_PRIO;
sig->num = de_ctx->signum; sig->num = de_ctx->signum;
de_ctx->signum++; de_ctx->signum++;

@ -57,6 +57,10 @@
#define DETECT_TRANSFORMS_MAX 16 #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 */ /* forward declarations for the structures from detect-engine-sigorder.h */
struct SCSigOrderFunc_; struct SCSigOrderFunc_;
struct SCSigSignatureWrapper_; struct SCSigSignatureWrapper_;

Loading…
Cancel
Save