]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
file: convert filesize to new FileMatch api.
authorVictor Julien <victor@inliniac.net>
Thu, 30 Aug 2012 15:17:28 +0000 (17:17 +0200)
committerVictor Julien <victor@inliniac.net>
Thu, 30 Aug 2012 15:17:28 +0000 (17:17 +0200)
src/detect-filesize.c

index e40f20cfc72e9aff2d0333af21fbc0414cd46e3f..1b7c77cee91eb0ae4707939900c925b169e123e7 100644 (file)
@@ -49,7 +49,7 @@ static pcre_extra *parse_regex_study;
 
 /*prototypes*/
 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 void DetectFilesizeFree (void *);
 static void DetectFilesizeRegisterTests (void);
@@ -62,7 +62,7 @@ void DetectFilesizeRegister(void)
 {
     sigmatch_table[DETECT_FILESIZE].name = "filesize";
     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].Free = DetectFilesizeFree;
     sigmatch_table[DETECT_FILESIZE].RegisterTests = DetectFilesizeRegisterTests;
@@ -109,12 +109,11 @@ error:
  * \retval 1 match
  */
 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();
 
     DetectFilesizeData *fsd = m->ctx;
-    File *file = (File *)state;
     int ret = 0;
     SCLogDebug("file size %"PRIu64", check %"PRIu64, file->size, fsd->size1);