detect/file: add file.data, small cleanups

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index 9ab1518707e617b5d667e18c4edae7225eac7a1f..9237120cb97b772017ebc66e71a3d0b6a9f458bd 100644 (file)
--- 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 aea104c371e0cd6464e421d2eab07adbd856cb95..e3c550c2e0bdef917b5b35c90cd2c30e9f973479 100644 (file)
--- 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 2b5fb90285a5a62ddad93a830044983402a873e2..3538e9206808c10bc8e2553a46b7d3c7b15a3ae7 100644 (file)
--- 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";