file: make fileext, filename and filemagic use the same rule parsing function as...

diff --git a/src/detect-fileext.c b/src/detect-fileext.c
index c669b5e41cb01bec4c1e279e3140a77978ea096d..3b971dd5d76047e776ccadf21c43fa6aee48688a 100644 (file)
--- a/src/detect-fileext.c
+++ b/src/detect-fileext.c
@@ -146,7 +146,7 @@ static DetectFileextData *DetectFileextParse (char *str)
 
     memset(fileext, 0x00, sizeof(DetectFileextData));
 
-    if (DetectParseContentString (str, &fileext->ext, &fileext->len, &fileext->flags) == -1) {
+    if (DetectContentDataParse("fileext", str, (char **)&fileext->ext, &fileext->len, (int *)&fileext->flags) == -1) {
         goto error;
     }
 
@@ -246,7 +246,7 @@ static void DetectFileextFree(void *ptr) {
  * \test DetectFileextTestParse01
  */
 int DetectFileextTestParse01 (void) {
-    DetectFileextData *dfd = DetectFileextParse("doc");
+    DetectFileextData *dfd = DetectFileextParse("\"doc\"");
     if (dfd != NULL) {
         DetectFileextFree(dfd);
         return 1;

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index a3f8b07203af4e786164eba2c04c88f248347e3a..593d6c08b17d3c186bb5012149f936fe8270deaa 100644 (file)
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -265,7 +265,7 @@ static DetectFilemagicData *DetectFilemagicParse (char *str)
 
     memset(filemagic, 0x00, sizeof(DetectFilemagicData));
 
-    if (DetectParseContentString (str, &filemagic->name, &filemagic->len, &filemagic->flags) == -1) {
+    if (DetectContentDataParse ("filemagic", str, (char **)&filemagic->name, &filemagic->len, (int *)&filemagic->flags) == -1) {
         goto error;
     }
 
@@ -433,7 +433,7 @@ static void DetectFilemagicFree(void *ptr) {
  * \test DetectFilemagicTestParse01
  */
 int DetectFilemagicTestParse01 (void) {
-    DetectFilemagicData *dnd = DetectFilemagicParse("secret.pdf");
+    DetectFilemagicData *dnd = DetectFilemagicParse("\"secret.pdf\"");
     if (dnd != NULL) {
         DetectFilemagicFree(dnd);
         return 1;
@@ -465,7 +465,7 @@ int DetectFilemagicTestParse02 (void) {
 int DetectFilemagicTestParse03 (void) {
     int result = 0;
 
-    DetectFilemagicData *dnd = DetectFilemagicParse("cmd.exe");
+    DetectFilemagicData *dnd = DetectFilemagicParse("\"cmd.exe\"");
     if (dnd != NULL) {
         if (dnd->len == 7 && memcmp(dnd->name, "cmd.exe", 7) == 0) {
             result = 1;

diff --git a/src/detect-filename.c b/src/detect-filename.c
index adae57b177e738b300d768c6fcc1d2f6c55f4008..d9294ffeefa0fe386b4926adb4033a9ac04140c5 100644 (file)
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -151,7 +151,7 @@ static DetectFilenameData *DetectFilenameParse (char *str)
 
     memset(filename, 0x00, sizeof(DetectFilenameData));
 
-    if (DetectParseContentString (str, &filename->name, &filename->len, &filename->flags) == -1) {
+    if (DetectContentDataParse ("filename", str, (char **)&filename->name, &filename->len, (int *)&filename->flags) == -1) {
         goto error;
     }
 
@@ -259,7 +259,7 @@ static void DetectFilenameFree(void *ptr) {
  * \test DetectFilenameTestParse01
  */
 int DetectFilenameTestParse01 (void) {
-    DetectFilenameData *dnd = DetectFilenameParse("secret.pdf");
+    DetectFilenameData *dnd = DetectFilenameParse("\"secret.pdf\"");
     if (dnd != NULL) {
         DetectFilenameFree(dnd);
         return 1;
@@ -291,7 +291,7 @@ int DetectFilenameTestParse02 (void) {
 int DetectFilenameTestParse03 (void) {
     int result = 0;
 
-    DetectFilenameData *dnd = DetectFilenameParse("cmd.exe");
+    DetectFilenameData *dnd = DetectFilenameParse("\"cmd.exe\"");
     if (dnd != NULL) {
         if (dnd->len == 7 && memcmp(dnd->name, "cmd.exe", 7) == 0) {
             result = 1;