detect: constify rule file and lines in parsing and analyzer

pull/12749/head
Victor Julien 1 year ago committed by Victor Julien
parent c65756a38c
commit ce26159a03

@ -166,7 +166,7 @@ static void FpPatternStatsAdd(FpPatternStats *fp, int list, uint16_t patlen)
f->tot += patlen;
}
void EngineAnalysisFP(const DetectEngineCtx *de_ctx, const Signature *s, char *line)
void EngineAnalysisFP(const DetectEngineCtx *de_ctx, const Signature *s, const char *line)
{
int fast_pattern_set = 0;
int fast_pattern_only_set = 0;
@ -620,7 +620,8 @@ static void EngineAnalysisRulesPrintFP(const DetectEngineCtx *de_ctx, const Sign
fprintf(ea_ctx->rule_engine_analysis_fp, "buffer.\n");
}
void EngineAnalysisRulesFailure(const DetectEngineCtx *de_ctx, char *line, char *file, int lineno)
void EngineAnalysisRulesFailure(
const DetectEngineCtx *de_ctx, const char *line, const char *file, int lineno)
{
fprintf(de_ctx->ea->fp_engine_analysis_fp, "== Sid: UNKNOWN ==\n");
fprintf(de_ctx->ea->fp_engine_analysis_fp, "%s\n", line);

@ -31,11 +31,11 @@ struct DetectEngineCtx_;
void SetupEngineAnalysis(struct DetectEngineCtx_ *de_ctx, bool *, bool *);
void CleanupEngineAnalysis(struct DetectEngineCtx_ *de_ctx);
void EngineAnalysisFP(const struct DetectEngineCtx_ *de_ctx, const Signature *s, char *line);
void EngineAnalysisFP(const struct DetectEngineCtx_ *de_ctx, const Signature *s, const char *line);
void EngineAnalysisRules(
const struct DetectEngineCtx_ *de_ctx, const Signature *s, const char *line);
void EngineAnalysisRulesFailure(
const struct DetectEngineCtx_ *de_ctx, char *line, char *file, int lineno);
const struct DetectEngineCtx_ *de_ctx, const char *line, const char *file, int lineno);
void EngineAnalysisRules2(const struct DetectEngineCtx_ *de_ctx, const Signature *s);

@ -110,8 +110,8 @@ char *DetectLoadCompleteSigPath(const DetectEngineCtx *de_ctx, const char *sig_f
* \param badsigs_tot Will store number of invalid signatures in the file
* \retval 0 on success, -1 on error
*/
static int DetectLoadSigFile(
DetectEngineCtx *de_ctx, char *sig_file, int *goodsigs, int *badsigs, int *skippedsigs)
static int DetectLoadSigFile(DetectEngineCtx *de_ctx, const char *sig_file, int *goodsigs,
int *badsigs, int *skippedsigs)
{
Signature *sig = NULL;
int good = 0, bad = 0, skipped = 0;

@ -947,7 +947,7 @@ typedef struct DetectEngineCtx_ {
/** Store rule file and line so that parsers can use them in errors. */
int rule_line;
char *rule_file;
const char *rule_file;
const char *sigerror;
bool sigerror_silent;
bool sigerror_ok;

Loading…
Cancel
Save