rule parser: set flag for optionless keywords

If a keyword doesn't have an argument, it should set the SIGMATCH_NOOPT
flag so the parser knows.

diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c
index 2f6f31539e73daf013a054e8a12e00f3194a83e2..d5e660ebd442fd0ee2636173dd3e5915175dbade 100644 (file)
--- a/src/detect-dce-stub-data.c
+++ b/src/detect-dce-stub-data.c
@@ -66,6 +66,7 @@ void DetectDceStubDataRegister(void)
     sigmatch_table[DETECT_DCE_STUB_DATA].Free  = NULL;
     sigmatch_table[DETECT_DCE_STUB_DATA].RegisterTests = DetectDceStubDataRegisterTests;
 
+    sigmatch_table[DETECT_DCE_STUB_DATA].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_DCE_STUB_DATA].flags |= SIGMATCH_PAYLOAD;
 
     return;

diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index f1e739f658ee0562daa7063c7fb6a3a692258a11..6bac50f1eca0049de375d7c8d3641565afb0dfa5 100644 (file)
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -74,6 +74,7 @@ void DetectDnsQueryRegister (void) {
     sigmatch_table[DETECT_AL_DNS_QUERY].Free  = NULL;
     sigmatch_table[DETECT_AL_DNS_QUERY].RegisterTests = DetectDnsQueryRegisterTests;
 
+    sigmatch_table[DETECT_AL_DNS_QUERY].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_DNS_QUERY].flags |= SIGMATCH_PAYLOAD;
 }
 

diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c
index a71f23bbb42a9d5ac6c4fe6050298c55ec59734b..a54103e65e715222fe4982ab47534e078f4da07e 100644 (file)
--- a/src/detect-fast-pattern.c
+++ b/src/detect-fast-pattern.c
@@ -161,6 +161,7 @@ void DetectFastPatternRegister(void)
     sigmatch_table[DETECT_FAST_PATTERN].Free  = NULL;
     sigmatch_table[DETECT_FAST_PATTERN].RegisterTests = DetectFastPatternRegisterTests;
 
+    sigmatch_table[DETECT_FAST_PATTERN].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_FAST_PATTERN].flags |= SIGMATCH_PAYLOAD;
 
     const char *eb;

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index f1b805790671dbf6a30be50d92808f85598f2b9e..5838370d8c7a54b87b4d0e6b92b5b247dd783118 100644 (file)
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -58,6 +58,7 @@ void DetectFiledataRegister(void) {
     sigmatch_table[DETECT_FILE_DATA].Setup = DetectFiledataSetup;
     sigmatch_table[DETECT_FILE_DATA].Free  = NULL;
     sigmatch_table[DETECT_FILE_DATA].RegisterTests = NULL;
+    sigmatch_table[DETECT_FILE_DATA].flags = SIGMATCH_NOOPT;
 }
 
 /**

diff --git a/src/detect-filestore.c b/src/detect-filestore.c
index f4b046ce95080ee23c4ffbf65acf20c97dc6f955..bbbaa964b2bfe03f799a4f4fe1f106449bc89159 100644 (file)
--- a/src/detect-filestore.c
+++ b/src/detect-filestore.c
@@ -76,6 +76,7 @@ void DetectFilestoreRegister(void) {
     sigmatch_table[DETECT_FILESTORE].Setup = DetectFilestoreSetup;
     sigmatch_table[DETECT_FILESTORE].Free  = DetectFilestoreFree;
     sigmatch_table[DETECT_FILESTORE].RegisterTests = NULL;
+    sigmatch_table[DETECT_FILESTORE].flags = SIGMATCH_NOOPT;
 
     const char *eb;
     int eo;

diff --git a/src/detect-ftpbounce.c b/src/detect-ftpbounce.c
index c9942816b6ad3a0e9de7f9a33911d70181f2f709..0269f33f1b4fa733000d5930c77fb9bb34606026 100644 (file)
--- a/src/detect-ftpbounce.c
+++ b/src/detect-ftpbounce.c
@@ -70,6 +70,7 @@ void DetectFtpbounceRegister(void)
     sigmatch_table[DETECT_FTPBOUNCE].alproto = ALPROTO_FTP;
     sigmatch_table[DETECT_FTPBOUNCE].Free  = NULL;
     sigmatch_table[DETECT_FTPBOUNCE].RegisterTests = DetectFtpbounceRegisterTests;
+    sigmatch_table[DETECT_FTPBOUNCE].flags = SIGMATCH_NOOPT;
     return;
 }
 

diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c
index 33c0a8ecfc89a46b8a5892ebde213a9591dbe545..89e8fd1a933869c6b6e351ad99e3481893ce26e4 100644 (file)
--- a/src/detect-http-client-body.c
+++ b/src/detect-http-client-body.c
@@ -76,6 +76,7 @@ void DetectHttpClientBodyRegister(void)
     sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].RegisterTests = DetectHttpClientBodyRegisterTests;
     sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].alproto = ALPROTO_HTTP;
 
+    sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].flags |= SIGMATCH_NOOPT ;
     sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].flags |= SIGMATCH_PAYLOAD ;
 }
 

diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index 3a1e0c589a9bba7072e0ede9c96ac899845bd0aa..c870a196f212ca6f32f741fe4a62ed60f969ee56 100644 (file)
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -79,6 +79,7 @@ void DetectHttpCookieRegister(void)
     sigmatch_table[DETECT_AL_HTTP_COOKIE].Free  = DetectHttpCookieFree;
     sigmatch_table[DETECT_AL_HTTP_COOKIE].RegisterTests = DetectHttpCookieRegisterTests;
 
+    sigmatch_table[DETECT_AL_HTTP_COOKIE].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_COOKIE].flags |= SIGMATCH_PAYLOAD;
 }
 

diff --git a/src/detect-http-header.c b/src/detect-http-header.c
index 63935727e64c7ed6aa1e55c19c99dfbf5dd46694..8f902cc9ae3e37cc78e6a18915618313602d739b 100644 (file)
--- a/src/detect-http-header.c
+++ b/src/detect-http-header.c
@@ -78,6 +78,7 @@ void DetectHttpHeaderRegister(void)
     sigmatch_table[DETECT_AL_HTTP_HEADER].RegisterTests = DetectHttpHeaderRegisterTests;
     sigmatch_table[DETECT_AL_HTTP_HEADER].alproto = ALPROTO_HTTP;
 
+    sigmatch_table[DETECT_AL_HTTP_HEADER].flags |= SIGMATCH_NOOPT ;
     sigmatch_table[DETECT_AL_HTTP_HEADER].flags |= SIGMATCH_PAYLOAD ;
 
     return;

diff --git a/src/detect-http-hh.c b/src/detect-http-hh.c
index c5a052b637eb6e666144056164e5d801415614a4..4df0fe329a80c6f13f950253d214f5ff6e4430a7 100644 (file)
--- a/src/detect-http-hh.c
+++ b/src/detect-http-hh.c
@@ -76,6 +76,7 @@ void DetectHttpHHRegister(void)
     sigmatch_table[DETECT_AL_HTTP_HOST].RegisterTests = DetectHttpHHRegisterTests;
     sigmatch_table[DETECT_AL_HTTP_HOST].alproto = ALPROTO_HTTP;
 
+    sigmatch_table[DETECT_AL_HTTP_HOST].flags |= SIGMATCH_NOOPT ;
     sigmatch_table[DETECT_AL_HTTP_HOST].flags |= SIGMATCH_PAYLOAD ;
 
     return;

diff --git a/src/detect-http-hrh.c b/src/detect-http-hrh.c
index 0fc08b228add6a79af0924f2fb0fa7de2672e99d..fd15544c374d63d16676d9be63097741a79fd0c0 100644 (file)
--- a/src/detect-http-hrh.c
+++ b/src/detect-http-hrh.c
@@ -76,6 +76,7 @@ void DetectHttpHRHRegister(void)
     sigmatch_table[DETECT_AL_HTTP_RAW_HOST].RegisterTests = DetectHttpHRHRegisterTests;
     sigmatch_table[DETECT_AL_HTTP_RAW_HOST].alproto = ALPROTO_HTTP;
 
+    sigmatch_table[DETECT_AL_HTTP_RAW_HOST].flags |= SIGMATCH_NOOPT ;
     sigmatch_table[DETECT_AL_HTTP_RAW_HOST].flags |= SIGMATCH_PAYLOAD ;
 
     return;

diff --git a/src/detect-http-method.c b/src/detect-http-method.c
index 347131d44ac03504c8134b26222340a1ceb08754..68c3014b1cb583b09598a05940ca0f257ddc88ad 100644 (file)
--- a/src/detect-http-method.c
+++ b/src/detect-http-method.c
@@ -77,6 +77,7 @@ void DetectHttpMethodRegister(void) {
     sigmatch_table[DETECT_AL_HTTP_METHOD].Setup = DetectHttpMethodSetup;
     sigmatch_table[DETECT_AL_HTTP_METHOD].Free  = DetectHttpMethodFree;
     sigmatch_table[DETECT_AL_HTTP_METHOD].RegisterTests = DetectHttpMethodRegisterTests;
+    sigmatch_table[DETECT_AL_HTTP_METHOD].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_METHOD].flags |= SIGMATCH_PAYLOAD;
 
     SCLogDebug("registering http_method rule option");

diff --git a/src/detect-http-raw-header.c b/src/detect-http-raw-header.c
index c0672d610ab45d9d8f222e12c1b9b3ad0ae4ae9b..61e2f153c16e9b21e54f6cd889e9c84fa1da023d 100644 (file)
--- a/src/detect-http-raw-header.c
+++ b/src/detect-http-raw-header.c
@@ -76,6 +76,7 @@ void DetectHttpRawHeaderRegister(void)
     sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].RegisterTests = DetectHttpRawHeaderRegisterTests;
     sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].alproto = ALPROTO_HTTP;
 
+    sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].flags |= SIGMATCH_PAYLOAD;
 
     return;

diff --git a/src/detect-http-raw-uri.c b/src/detect-http-raw-uri.c
index 3e60f1ef530f8f1f017ec8dc19fb4a453d8c1a41..7cedd892712207a0f029776fce9d0ac1e443d729 100644 (file)
--- a/src/detect-http-raw-uri.c
+++ b/src/detect-http-raw-uri.c
@@ -71,6 +71,7 @@ void DetectHttpRawUriRegister(void)
     sigmatch_table[DETECT_AL_HTTP_RAW_URI].Setup = DetectHttpRawUriSetup;
     sigmatch_table[DETECT_AL_HTTP_RAW_URI].Free = NULL;
     sigmatch_table[DETECT_AL_HTTP_RAW_URI].RegisterTests = DetectHttpRawUriRegisterTests;
+    sigmatch_table[DETECT_AL_HTTP_RAW_URI].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_RAW_URI].flags |= SIGMATCH_PAYLOAD;
 
     return;

diff --git a/src/detect-http-server-body.c b/src/detect-http-server-body.c
index 4e74bfcdab2cbe3d9deef95ba30d747ed14a5be6..b15baa51d2ed9a18f38140b0514b034f55490067 100644 (file)
--- a/src/detect-http-server-body.c
+++ b/src/detect-http-server-body.c
@@ -78,6 +78,7 @@ void DetectHttpServerBodyRegister(void)
     sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].RegisterTests = DetectHttpServerBodyRegisterTests;
     sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].alproto = ALPROTO_HTTP;
 
+    sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].flags |= SIGMATCH_PAYLOAD ;
 }
 

diff --git a/src/detect-http-stat-code.c b/src/detect-http-stat-code.c
index e41cd16f897369eb2c46a4319ef9e96162cb4ff5..c686c082d292cde646b3b6bfe821a3ea0ea1a1ea 100644 (file)
--- a/src/detect-http-stat-code.c
+++ b/src/detect-http-stat-code.c
@@ -83,6 +83,7 @@ void DetectHttpStatCodeRegister (void) {
     sigmatch_table[DETECT_AL_HTTP_STAT_CODE].Free  = NULL;
     sigmatch_table[DETECT_AL_HTTP_STAT_CODE].RegisterTests = DetectHttpStatCodeRegisterTests;
 
+    sigmatch_table[DETECT_AL_HTTP_STAT_CODE].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_STAT_CODE].flags |= SIGMATCH_PAYLOAD;
 }
 

diff --git a/src/detect-http-stat-msg.c b/src/detect-http-stat-msg.c
index 1654915e3bbc39db46ec97d69f0364ae104f11b6..1ab3dc1053a175b5f84a6e968085c2089589b7ed 100644 (file)
--- a/src/detect-http-stat-msg.c
+++ b/src/detect-http-stat-msg.c
@@ -83,6 +83,7 @@ void DetectHttpStatMsgRegister (void) {
     sigmatch_table[DETECT_AL_HTTP_STAT_MSG].Free  = NULL;
     sigmatch_table[DETECT_AL_HTTP_STAT_MSG].RegisterTests = DetectHttpStatMsgRegisterTests;
 
+    sigmatch_table[DETECT_AL_HTTP_STAT_MSG].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_STAT_MSG].flags |= SIGMATCH_PAYLOAD;
 }
 

diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c
index ee92e4d712e3af50795e34608f8fecf312acdfe8..e335aeb101c45ced1e26f8982c88f85ffb028e60 100644 (file)
--- a/src/detect-http-ua.c
+++ b/src/detect-http-ua.c
@@ -77,6 +77,7 @@ void DetectHttpUARegister(void)
     sigmatch_table[DETECT_AL_HTTP_USER_AGENT].RegisterTests = DetectHttpUARegisterTests;
     sigmatch_table[DETECT_AL_HTTP_USER_AGENT].alproto = ALPROTO_HTTP;
 
+    sigmatch_table[DETECT_AL_HTTP_USER_AGENT].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_USER_AGENT].flags |= SIGMATCH_PAYLOAD ;
 
     return;

diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c
index 5747d5d56b7dc51210dc39fcf9de5093c895e4a3..1a322ae4637a693956039fb31760cfc8d370a26a 100644 (file)
--- a/src/detect-http-uri.c
+++ b/src/detect-http-uri.c
@@ -72,6 +72,7 @@ void DetectHttpUriRegister (void) {
     sigmatch_table[DETECT_AL_HTTP_URI].Free  = NULL;
     sigmatch_table[DETECT_AL_HTTP_URI].RegisterTests = DetectHttpUriRegisterTests;
 
+    sigmatch_table[DETECT_AL_HTTP_URI].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_HTTP_URI].flags |= SIGMATCH_PAYLOAD;
 }
 

diff --git a/src/detect-pkt-data.c b/src/detect-pkt-data.c
index c159a0ff1bac5c91a706fde238ab2efaf51262e2..dc34b554336943beece15ef909a3b2fd3497e979 100644 (file)
--- a/src/detect-pkt-data.c
+++ b/src/detect-pkt-data.c
@@ -57,6 +57,7 @@ void DetectPktDataRegister(void) {
     sigmatch_table[DETECT_PKT_DATA].Setup = DetectPktDataSetup;
     sigmatch_table[DETECT_PKT_DATA].Free  = NULL;
     sigmatch_table[DETECT_PKT_DATA].RegisterTests = DetectPktDataTestRegister;
+    sigmatch_table[DETECT_PKT_DATA].flags = SIGMATCH_NOOPT;
 }
 
 /**

diff --git a/src/detect-sameip.c b/src/detect-sameip.c
index 7cd71d3650e8ff52ca7b50c771dee8f2db6dfd5a..db17e21599e4338f74509626af635dd34ed168ee 100644 (file)
--- a/src/detect-sameip.c
+++ b/src/detect-sameip.c
@@ -55,6 +55,7 @@ void DetectSameipRegister(void)
     sigmatch_table[DETECT_SAMEIP].Setup = DetectSameipSetup;
     sigmatch_table[DETECT_SAMEIP].Free = NULL;
     sigmatch_table[DETECT_SAMEIP].RegisterTests = DetectSameipRegisterTests;
+    sigmatch_table[DETECT_SAMEIP].flags = SIGMATCH_NOOPT;
 }
 
 /**