From 61185cc9bad5e2d1254d4ebb3acff6ed36c0ac53 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 2 Oct 2019 21:29:32 +0200 Subject: [PATCH] reference: change scope of add func to global --- src/util-reference-config.c | 10 +++++----- src/util-reference-config.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/util-reference-config.c b/src/util-reference-config.c index fe57f6a64e..5951d637aa 100644 --- a/src/util-reference-config.c +++ b/src/util-reference-config.c @@ -242,7 +242,7 @@ static char *SCRConfStringToLowercase(const char *str) * \retval 0 On success. * \retval -1 On failure. */ -static int SCRConfAddReference(char *rawstr, DetectEngineCtx *de_ctx) +int SCRConfAddReference(DetectEngineCtx *de_ctx, const char *line) { char system[REFERENCE_SYSTEM_NAME_MAX]; char url[REFERENCE_CONTENT_NAME_MAX]; @@ -254,7 +254,7 @@ static int SCRConfAddReference(char *rawstr, DetectEngineCtx *de_ctx) int ret = 0; int ov[MAX_SUBSTRINGS]; - ret = pcre_exec(regex, regex_study, rawstr, strlen(rawstr), 0, 0, ov, 30); + ret = pcre_exec(regex, regex_study, line, strlen(line), 0, 0, ov, 30); if (ret < 0) { SCLogError(SC_ERR_REFERENCE_CONFIG, "Invalid Reference Config in " "reference.config file"); @@ -262,14 +262,14 @@ static int SCRConfAddReference(char *rawstr, DetectEngineCtx *de_ctx) } /* retrieve the reference system */ - ret = pcre_copy_substring((char *)rawstr, ov, 30, 1, system, sizeof(system)); + ret = pcre_copy_substring((char *)line, ov, 30, 1, system, sizeof(system)); if (ret < 0) { SCLogError(SC_ERR_PCRE_GET_SUBSTRING, "pcre_copy_substring() failed"); goto error; } /* retrieve the reference url */ - ret = pcre_copy_substring((char *)rawstr, ov, 30, 2, url, sizeof(url)); + ret = pcre_copy_substring((char *)line, ov, 30, 2, url, sizeof(url)); if (ret < 0) { SCLogError(SC_ERR_PCRE_GET_SUBSTRING, "pcre_copy_substring() failed"); goto error; @@ -343,7 +343,7 @@ static void SCRConfParseFile(DetectEngineCtx *de_ctx, FILE *fd) if (SCRConfIsLineBlankOrComment(line)) continue; - SCRConfAddReference(line, de_ctx); + SCRConfAddReference(de_ctx, line); i++; } diff --git a/src/util-reference-config.h b/src/util-reference-config.h index fc7ea34e86..0bbab62af3 100644 --- a/src/util-reference-config.h +++ b/src/util-reference-config.h @@ -43,6 +43,7 @@ int SCRConfLoadReferenceConfigFile(DetectEngineCtx *, FILE *); void SCRConfDeInitContext(DetectEngineCtx *); SCRConfReference *SCRConfGetReference(const char *, DetectEngineCtx *); +int SCRConfAddReference(DetectEngineCtx *de_ctx, const char *line); void SCRConfRegisterTests(void); /* these below functions are only used by unittests */