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 8f06fa19489c140b50ee87d9b7f84351ee58b14e..84333cb4df5bc2850b70a5ab1fb88915e9f0b685 100644 (file)
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -75,6 +75,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 4e84a931b08cf4476be962074f69f0ae97b16d53..694f4d297d1d97a588fe62ecca3787cd9446a39b 100644 (file)
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -59,6 +59,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 39e4b9913f591e6fdee4a81c7c20df0dd741b5a4..6ec5b5f8e546d23c9394ff103dc07fa055b37734 100644 (file)
--- a/src/detect-filestore.c
+++ b/src/detect-filestore.c
@@ -77,6 +77,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 74ab43445b9ec1dc6adf68313c14dc4bed75f440..39e1c5a2a027ff7035c72b497e82350a7c793f0d 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 d29dc23b006c5086b382d4fb9f6c4cf61356afb5..112e11efef53bbe5b70b362e426db1e5157481bd 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 facf64ad71cbf1f1e875c1991c4ecf487c37b5d2..94f76765ad173ad5ea9ff503a687a9a4ec771f66 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 9c419e3345f995d63d8266558c69f1fb602e625f..f398de44837a6623b832a24f2ad5969c9d6efe80 100644 (file)
--- a/src/detect-http-method.c
+++ b/src/detect-http-method.c
@@ -78,6 +78,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 882c81e418ef53b21d6d9c049fa370de02cda091..01a9def8f2fd1f508a1fdf285950cb284c4a6853 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 5510549568c6912405c0a3ad08dfb95c6d3a8caf..0237009f81c6d0fc9fe2cd6087d234fec6da658d 100644 (file)
--- a/src/detect-http-stat-code.c
+++ b/src/detect-http-stat-code.c
@@ -84,6 +84,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 ff97651261374bc8a0026d1dc20f38bdf904bc38..d2d7685edd0e9c1b4c5a3a7917ecb784834e31d4 100644 (file)
--- a/src/detect-http-stat-msg.c
+++ b/src/detect-http-stat-msg.c
@@ -84,6 +84,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 4620c1a22ded1100671012a929b163e30d3ab13c..a4a4782d7924d37bfd8e85a40eb7c0d361cc8703 100644 (file)
--- a/src/detect-http-uri.c
+++ b/src/detect-http-uri.c
@@ -73,6 +73,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 9c39b52d71e1f72077b1cf64dc70ec2f95e0acdb..332ac4ccdce6e6c113a8260b13b5d8ba91026730 100644 (file)
--- a/src/detect-pkt-data.c
+++ b/src/detect-pkt-data.c
@@ -58,6 +58,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;
 }
 
 /**