file: convert filesize to new FileMatch api.

pull/45/head
Victor Julien 13 years ago
parent f93c54136c
commit 250c4e9310

@ -49,7 +49,7 @@ static pcre_extra *parse_regex_study;
/*prototypes*/ /*prototypes*/
static int DetectFilesizeMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Flow *f, static int DetectFilesizeMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Flow *f,
uint8_t flags, void *state, Signature *s, SigMatch *m); uint8_t flags, File *file, Signature *s, SigMatch *m);
static int DetectFilesizeSetup (DetectEngineCtx *, Signature *, char *); static int DetectFilesizeSetup (DetectEngineCtx *, Signature *, char *);
static void DetectFilesizeFree (void *); static void DetectFilesizeFree (void *);
static void DetectFilesizeRegisterTests (void); static void DetectFilesizeRegisterTests (void);
@ -62,7 +62,7 @@ void DetectFilesizeRegister(void)
{ {
sigmatch_table[DETECT_FILESIZE].name = "filesize"; sigmatch_table[DETECT_FILESIZE].name = "filesize";
sigmatch_table[DETECT_FILESIZE].alproto = ALPROTO_HTTP; sigmatch_table[DETECT_FILESIZE].alproto = ALPROTO_HTTP;
sigmatch_table[DETECT_FILESIZE].AppLayerMatch = DetectFilesizeMatch; sigmatch_table[DETECT_FILESIZE].FileMatch = DetectFilesizeMatch;
sigmatch_table[DETECT_FILESIZE].Setup = DetectFilesizeSetup; sigmatch_table[DETECT_FILESIZE].Setup = DetectFilesizeSetup;
sigmatch_table[DETECT_FILESIZE].Free = DetectFilesizeFree; sigmatch_table[DETECT_FILESIZE].Free = DetectFilesizeFree;
sigmatch_table[DETECT_FILESIZE].RegisterTests = DetectFilesizeRegisterTests; sigmatch_table[DETECT_FILESIZE].RegisterTests = DetectFilesizeRegisterTests;
@ -109,12 +109,11 @@ error:
* \retval 1 match * \retval 1 match
*/ */
static int DetectFilesizeMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Flow *f, static int DetectFilesizeMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Flow *f,
uint8_t flags, void *state, Signature *s, SigMatch *m) uint8_t flags, File *file, Signature *s, SigMatch *m)
{ {
SCEnter(); SCEnter();
DetectFilesizeData *fsd = m->ctx; DetectFilesizeData *fsd = m->ctx;
File *file = (File *)state;
int ret = 0; int ret = 0;
SCLogDebug("file size %"PRIu64", check %"PRIu64, file->size, fsd->size1); SCLogDebug("file size %"PRIu64", check %"PRIu64, file->size, fsd->size1);

Loading…
Cancel
Save