detect: during detection sgh is read only so turn into const

pull/2343/head
Victor Julien 10 years ago
parent 0e31124609
commit 43aed70976

@ -255,7 +255,7 @@ static void DeStateStoreFileNoMatchCnt(DetectEngineState *de_state, uint16_t fil
return; return;
} }
static int DeStateStoreFilestoreSigsCantMatch(SigGroupHead *sgh, DetectEngineState *de_state, uint8_t direction) static int DeStateStoreFilestoreSigsCantMatch(const SigGroupHead *sgh, DetectEngineState *de_state, uint8_t direction)
{ {
if (de_state->dir_state[direction & STREAM_TOSERVER ? 0 : 1].filestore_cnt == sgh->filestore_cnt) if (de_state->dir_state[direction & STREAM_TOSERVER ? 0 : 1].filestore_cnt == sgh->filestore_cnt)
return 1; return 1;

@ -993,7 +993,7 @@ DetectPostInspectFileFlagsUpdate(Flow *pflow, const SigGroupHead *sgh, uint8_t d
} }
static inline void static inline void
DetectPostInspectFirstSGH(const Packet *p, Flow *pflow, SigGroupHead *sgh) DetectPostInspectFirstSGH(const Packet *p, Flow *pflow, const SigGroupHead *sgh)
{ {
if ((p->flowflags & FLOW_PKT_TOSERVER) && !(pflow->flags & FLOW_SGH_TOSERVER)) { if ((p->flowflags & FLOW_PKT_TOSERVER) && !(pflow->flags & FLOW_SGH_TOSERVER)) {
/* first time we see this toserver sgh, store it */ /* first time we see this toserver sgh, store it */

@ -893,7 +893,7 @@ typedef struct DetectEngineThreadCtx_ {
SigIntId de_state_sig_array_len; SigIntId de_state_sig_array_len;
uint8_t *de_state_sig_array; uint8_t *de_state_sig_array;
struct SigGroupHead_ *sgh; const struct SigGroupHead_ *sgh;
SignatureNonPrefilterStore *non_pf_store_ptr; SignatureNonPrefilterStore *non_pf_store_ptr;
uint32_t non_pf_store_cnt; uint32_t non_pf_store_cnt;

@ -404,10 +404,10 @@ typedef struct Flow_
/** toclient sgh for this flow. Only use when FLOW_SGH_TOCLIENT flow flag /** toclient sgh for this flow. Only use when FLOW_SGH_TOCLIENT flow flag
* has been set. */ * has been set. */
struct SigGroupHead_ *sgh_toclient; const struct SigGroupHead_ *sgh_toclient;
/** toserver sgh for this flow. Only use when FLOW_SGH_TOSERVER flow flag /** toserver sgh for this flow. Only use when FLOW_SGH_TOSERVER flow flag
* has been set. */ * has been set. */
struct SigGroupHead_ *sgh_toserver; const struct SigGroupHead_ *sgh_toserver;
/* pointer to the var list */ /* pointer to the var list */
GenericVar *flowvar; GenericVar *flowvar;

Loading…
Cancel
Save