aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detect: constify mpm/detect funcs

Browse Source
pull/1978/head
Victor Julien 10 years ago
parent 4f8e1f59a6
commit 0d3f671b55
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
src/detect-engine-analyzer.c
Unescape Escape View File

@ -402,7 +402,7 @@ int PerCentEncodingMatch (uint8_t *content, uint8_t content_len)
return ret;
}
static void EngineAnalysisRulesPrintFP(Signature *s)
static void EngineAnalysisRulesPrintFP(const Signature *s)
{
DetectContentData *fp_cd = NULL;
SigMatch *mpm_sm = s->mpm_sm;
@ -506,7 +506,7 @@ void EngineAnalysisRulesFailure(char *line, char *file, int lineno)
*
* \param s Pointer to the signature.
*/
void EngineAnalysisRules(Signature *s, char *line)
void EngineAnalysisRules(const Signature *s, const char *line)
{
uint32_t rule_bidirectional = 0;
uint32_t rule_pcre = 0;

2
src/detect-engine-analyzer.h
Unescape Escape View File

@ -36,7 +36,7 @@ int PerCentEncodingSetup ();
int PerCentEncodingMatch (uint8_t *content, uint8_t content_len);
void EngineAnalysisFP(Signature *s, char *line);
void EngineAnalysisRules(Signature *s, char *line);
void EngineAnalysisRules(const Signature *s, const char *line);
void EngineAnalysisRulesFailure(char *line, char *file, int lineno);
#endif /* __DETECT_ENGINE_ANALYZER_H__ */

10
src/detect-engine-mpm.c
Unescape Escape View File

@ -76,7 +76,7 @@
* \retval 1 true
* \retval 0 false
*/
int SignatureHasPacketContent(Signature *s)
int SignatureHasPacketContent(const Signature *s)
{
SCEnter();
@ -110,7 +110,7 @@ int SignatureHasPacketContent(Signature *s)
* \retval 1 true
* \retval 0 false
*/
int SignatureHasStreamContent(Signature *s)
int SignatureHasStreamContent(const Signature *s)
{
SCEnter();
@ -1257,7 +1257,7 @@ static void PopulateMpmHelperAddPatternToPktCtx(MpmCtx *mpm_ctx,
return;
}
static void PopulateMpmAddPatternToMpm(DetectEngineCtx *de_ctx,
static void PopulateMpmAddPatternToMpm(const DetectEngineCtx *de_ctx,
SigGroupHead *sgh, Signature *s,
SigMatch *mpm_sm)
{
@ -1929,7 +1929,7 @@ SigMatch *RetrieveFPForSigV2(Signature *s)
*
* \retval 0 Always.
*/
static int PatternMatchPreparePopulateMpm(DetectEngineCtx *de_ctx,
static int PatternMatchPreparePopulateMpm(const DetectEngineCtx *de_ctx,
SigGroupHead *sgh)
{
uint32_t sig = 0;
@ -1949,7 +1949,7 @@ static int PatternMatchPreparePopulateMpm(DetectEngineCtx *de_ctx,
* \todo do error checking
* \todo rewrite the COPY stuff
*/
int PatternMatchPrepareGroup(DetectEngineCtx *de_ctx, SigGroupHead *sh)
int PatternMatchPrepareGroup(const DetectEngineCtx *de_ctx, SigGroupHead *sh)
{
Signature *s = NULL;
uint32_t has_co_packet = 0; /**< our sgh has packet payload inspecting content */

6
src/detect-engine-mpm.h
Unescape Escape View File

@ -64,7 +64,7 @@ void PatternMatchDestroy(MpmCtx *, uint16_t);
void PatternMatchThreadDestroy(MpmThreadCtx *mpm_thread_ctx, uint16_t);
void PatternMatchThreadPrint(MpmThreadCtx *, uint16_t);
int PatternMatchPrepareGroup(DetectEngineCtx *, SigGroupHead *);
int PatternMatchPrepareGroup(const DetectEngineCtx *, SigGroupHead *);
void DetectEngineThreadCtxInfo(ThreadVars *, DetectEngineThreadCtx *);
void PatternMatchDestroyGroup(SigGroupHead *);
@ -78,8 +78,8 @@ void MpmPatternIdTableFreeHash(MpmPatternIdStore *);
uint32_t MpmPatternIdStoreGetMaxId(MpmPatternIdStore *);
uint32_t DetectContentGetId(MpmPatternIdStore *, DetectContentData *);
int SignatureHasPacketContent(Signature *);
int SignatureHasStreamContent(Signature *);
int SignatureHasPacketContent(const Signature *);
int SignatureHasStreamContent(const Signature *);
SigMatch *RetrieveFPForSig(Signature *s);
SigMatch *RetrieveFPForSigV2(Signature *s);

2
src/detect-engine-proto.c
Unescape Escape View File

@ -162,7 +162,7 @@ error:
* \param proto protocol (such as IPPROTO_TCP) to look for
* \retval 0 protocol not in the set
* \retval 1 protocol is in the set */
int DetectProtoContainsProto(DetectProto *dp, int proto)
int DetectProtoContainsProto(const DetectProto *dp, int proto)
{
if (dp->flags & DETECT_PROTO_ANY)
return 1;

2
src/detect-engine-proto.h
Unescape Escape View File

@ -40,7 +40,7 @@ typedef struct DetectProto_ {
/* prototypes */
int DetectProtoParse(DetectProto *dp, char *str);
int DetectProtoContainsProto(DetectProto *, int);
int DetectProtoContainsProto(const DetectProto *, int);
void DetectProtoTests(void);

8
src/detect-engine-siggroup.c
Unescape Escape View File

@ -150,7 +150,7 @@ void SigGroupHeadStore(DetectEngineCtx *de_ctx, SigGroupHead *sgh)
* \retval sgh Pointer to the newly init SigGroupHead on success; or NULL in
* case of error.
*/
static SigGroupHead *SigGroupHeadAlloc(DetectEngineCtx *de_ctx, uint32_t size)
static SigGroupHead *SigGroupHeadAlloc(const DetectEngineCtx *de_ctx, uint32_t size)
{
SigGroupHead *sgh = SCMalloc(sizeof(SigGroupHead));
if (unlikely(sgh == NULL))
@ -998,7 +998,7 @@ void SigGroupHeadFreeMpmArrays(DetectEngineCtx *de_ctx)
return;
}
static uint16_t SignatureGetMpmPatternLen(Signature *s, int list)
static uint16_t SignatureGetMpmPatternLen(const Signature *s, const int list)
{
if (s->sm_lists[list] != NULL && s->mpm_sm != NULL &&
SigMatchListSMBelongsTo(s, s->mpm_sm) == list)
@ -1020,8 +1020,8 @@ static uint16_t SignatureGetMpmPatternLen(Signature *s, int list)
* \retval 0 On success.
* \retval -1 On failure.
*/
int SigGroupHeadAppendSig(DetectEngineCtx *de_ctx, SigGroupHead **sgh,
Signature *s)
int SigGroupHeadAppendSig(const DetectEngineCtx *de_ctx, SigGroupHead **sgh,
const Signature *s)
{
if (de_ctx == NULL)
return 0;

2
src/detect-engine-siggroup.h
Unescape Escape View File

@ -26,7 +26,7 @@
void DetectSigGroupPrintMemory(void);
int SigGroupHeadAppendSig(DetectEngineCtx *, SigGroupHead **, Signature *);
int SigGroupHeadAppendSig(const DetectEngineCtx *, SigGroupHead **, const Signature *);
int SigGroupHeadClearSigs(SigGroupHead *);
int SigGroupHeadCopySigs(DetectEngineCtx *, SigGroupHead *, SigGroupHead **);

4
src/detect-parse.c
Unescape Escape View File

@ -419,12 +419,12 @@ void SigMatchTransferSigMatchAcrossLists(SigMatch *sm,
return;
}
int SigMatchListSMBelongsTo(Signature *s, SigMatch *key_sm)
int SigMatchListSMBelongsTo(const Signature *s, const SigMatch *key_sm)
{
int list = 0;
for (list = 0; list < DETECT_SM_LIST_MAX; list++) {
SigMatch *sm = s->sm_lists[list];
const SigMatch *sm = s->sm_lists[list];
while (sm != NULL) {
if (sm == key_sm)
return list;

2
src/detect-parse.h
Unescape Escape View File

@ -55,7 +55,7 @@ Signature *DetectEngineAppendSig(DetectEngineCtx *, char *);
void SigMatchAppendSMToList(Signature *, SigMatch *, int);
void SigMatchRemoveSMFromList(Signature *, SigMatch *, int);
int SigMatchListSMBelongsTo(Signature *, SigMatch *);
int SigMatchListSMBelongsTo(const Signature *, const SigMatch *);
int DetectParseDupSigHashInit(DetectEngineCtx *);
void DetectParseDupSigHashFree(DetectEngineCtx *);

6
src/util-mpm.c
Unescape Escape View File

@ -184,7 +184,7 @@ int32_t MpmFactoryRegisterMpmCtxProfile(DetectEngineCtx *de_ctx, const char *nam
}
}
int32_t MpmFactoryIsMpmCtxAvailable(DetectEngineCtx *de_ctx, MpmCtx *mpm_ctx)
int32_t MpmFactoryIsMpmCtxAvailable(const DetectEngineCtx *de_ctx, const MpmCtx *mpm_ctx)
{
if (mpm_ctx == NULL)
return 0;
@ -203,7 +203,7 @@ int32_t MpmFactoryIsMpmCtxAvailable(DetectEngineCtx *de_ctx, MpmCtx *mpm_ctx)
}
}
MpmCtx *MpmFactoryGetMpmCtxForProfile(DetectEngineCtx *de_ctx, int32_t id, int direction)
MpmCtx *MpmFactoryGetMpmCtxForProfile(const DetectEngineCtx *de_ctx, int32_t id, int direction)
{
if (id == MPM_CTX_FACTORY_UNIQUE_CONTEXT) {
MpmCtx *mpm_ctx = SCMalloc(sizeof(MpmCtx));
@ -226,7 +226,7 @@ MpmCtx *MpmFactoryGetMpmCtxForProfile(DetectEngineCtx *de_ctx, int32_t id, int d
}
}
void MpmFactoryReClaimMpmCtx(DetectEngineCtx *de_ctx, MpmCtx *mpm_ctx)
void MpmFactoryReClaimMpmCtx(const DetectEngineCtx *de_ctx, MpmCtx *mpm_ctx)
{
if (mpm_ctx == NULL)
return;

6
src/util-mpm.h
Unescape Escape View File

@ -205,10 +205,10 @@ void MpmCudaEnvironmentSetup();
struct DetectEngineCtx_;
int32_t MpmFactoryRegisterMpmCtxProfile(struct DetectEngineCtx_ *, const char *, uint8_t);
void MpmFactoryReClaimMpmCtx(struct DetectEngineCtx_ *, MpmCtx *);
MpmCtx *MpmFactoryGetMpmCtxForProfile(struct DetectEngineCtx_ *, int32_t, int);
void MpmFactoryReClaimMpmCtx(const struct DetectEngineCtx_ *, MpmCtx *);
MpmCtx *MpmFactoryGetMpmCtxForProfile(const struct DetectEngineCtx_ *, int32_t, int);
void MpmFactoryDeRegisterAllMpmCtxProfiles(struct DetectEngineCtx_ *);
int32_t MpmFactoryIsMpmCtxAvailable(struct DetectEngineCtx_ *, MpmCtx *);
int32_t MpmFactoryIsMpmCtxAvailable(const struct DetectEngineCtx_ *, const MpmCtx *);
int PmqSetup(PatternMatcherQueue *, uint32_t);
void PmqMerge(PatternMatcherQueue *src, PatternMatcherQueue *dst);

Write Preview
Loading…
Cancel
Save