detect/app-layer-events: constify arguments; minor cleanups

pull/9939/head
Victor Julien 2 years ago committed by Victor Julien
parent 15b545d16f
commit 643f25280b

@ -59,15 +59,14 @@ int AppLayerGetEventInfoById(int event_id, const char **event_name,
AppLayerEventType *event_type); AppLayerEventType *event_type);
void AppLayerDecoderEventsSetEventRaw(AppLayerDecoderEvents **sevents, uint8_t event); void AppLayerDecoderEventsSetEventRaw(AppLayerDecoderEvents **sevents, uint8_t event);
static inline int AppLayerDecoderEventsIsEventSet(AppLayerDecoderEvents *devents, static inline int AppLayerDecoderEventsIsEventSet(
uint8_t event) const AppLayerDecoderEvents *devents, uint8_t event)
{ {
if (devents == NULL) if (devents == NULL)
return 0; return 0;
int i;
int cnt = devents->cnt; int cnt = devents->cnt;
for (i = 0; i < cnt; i++) { for (int i = 0; i < cnt; i++) {
if (devents->events[i] == event) if (devents->events[i] == event)
return 1; return 1;
} }

@ -92,14 +92,14 @@ static uint8_t DetectEngineAptEventInspect(DetectEngineCtx *de_ctx, DetectEngine
{ {
int r = 0; int r = 0;
const AppProto alproto = f->alproto; const AppProto alproto = f->alproto;
AppLayerDecoderEvents *decoder_events = const AppLayerDecoderEvents *decoder_events =
AppLayerParserGetEventsByTx(f->proto, alproto, tx); AppLayerParserGetEventsByTx(f->proto, alproto, tx);
if (decoder_events == NULL) { if (decoder_events == NULL) {
goto end; goto end;
} }
SigMatchData *smd = engine->smd; const SigMatchData *smd = engine->smd;
while (1) { while (1) {
DetectAppLayerEventData *aled = (DetectAppLayerEventData *)smd->ctx; const DetectAppLayerEventData *aled = (const DetectAppLayerEventData *)smd->ctx;
KEYWORD_PROFILING_START; KEYWORD_PROFILING_START;
if (AppLayerDecoderEventsIsEventSet(decoder_events, aled->event_id)) { if (AppLayerDecoderEventsIsEventSet(decoder_events, aled->event_id)) {

Loading…
Cancel
Save