From: Victor Julien <victor@inliniac.net>
Date: Thu, 2 May 2019 09:45:46 +0000 (+0200)
Subject: detect/file: add file.data, small cleanups
X-Git-Tag: suricata-5.0.0-rc1~531
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d64fbb71ae66759c7ffccbcd2c46dd883438164f;p=thirdparty%2Fsuricata.git

detect/file: add file.data, small cleanups
---

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index 9ab1518707..9237120cb9 100644
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -80,7 +80,8 @@ int PrefilterMpmFiledataRegister(DetectEngineCtx *de_ctx,
  */
 void DetectFiledataRegister(void)
 {
-    sigmatch_table[DETECT_FILE_DATA].name = "file_data";
+    sigmatch_table[DETECT_FILE_DATA].name = "file.data";
+    sigmatch_table[DETECT_FILE_DATA].alias = "file_data";
     sigmatch_table[DETECT_FILE_DATA].desc = "make content keywords match on file data";
     sigmatch_table[DETECT_FILE_DATA].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#file-data";
     sigmatch_table[DETECT_FILE_DATA].Setup = DetectFiledataSetup;
diff --git a/src/detect-fileext.c b/src/detect-fileext.c
index aea104c371..e3c550c2e0 100644
--- a/src/detect-fileext.c
+++ b/src/detect-fileext.c
@@ -71,6 +71,7 @@ void DetectFileextRegister(void)
     sigmatch_table[DETECT_FILEEXT].Free  = DetectFileextFree;
     sigmatch_table[DETECT_FILEEXT].RegisterTests = DetectFileextRegisterTests;
     sigmatch_table[DETECT_FILEEXT].flags = SIGMATCH_QUOTES_OPTIONAL|SIGMATCH_HANDLE_NEGATION;
+    sigmatch_table[DETECT_FILEEXT].alternative = DETECT_FILE_NAME;
 
     g_file_match_list_id = DetectBufferTypeRegister("files");
 
diff --git a/src/detect-filename.c b/src/detect-filename.c
index 2b5fb90285..3538e92068 100644
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -85,6 +85,7 @@ void DetectFilenameRegister(void)
     sigmatch_table[DETECT_FILENAME].Free  = DetectFilenameFree;
     sigmatch_table[DETECT_FILENAME].RegisterTests = DetectFilenameRegisterTests;
     sigmatch_table[DETECT_FILENAME].flags = SIGMATCH_QUOTES_OPTIONAL|SIGMATCH_HANDLE_NEGATION;
+    sigmatch_table[DETECT_FILENAME].alternative = DETECT_FILE_NAME;
 
     sigmatch_table[DETECT_FILE_NAME].name = "file.name";
     sigmatch_table[DETECT_FILE_NAME].desc = "sticky buffer to match on the file name";