detect/tcp: add tcp.<field> notation variants

diff --git a/src/detect-ack.c b/src/detect-ack.c
index 095a44dc7e29c20e88f46b03562e9d092cd0cb42..bd3f92ded16a7a880cfd00d5f496f29e36bcc1cb 100644 (file)
--- a/src/detect-ack.c
+++ b/src/detect-ack.c
@@ -53,7 +53,8 @@ static _Bool PrefilterTcpAckIsPrefilterable(const Signature *s);
 
 void DetectAckRegister(void)
 {
-    sigmatch_table[DETECT_ACK].name = "ack";
+    sigmatch_table[DETECT_ACK].name = "tcp.ack";
+    sigmatch_table[DETECT_ACK].alias = "ack";
     sigmatch_table[DETECT_ACK].desc = "check for a specific TCP acknowledgement number";
     sigmatch_table[DETECT_ACK].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ack";
     sigmatch_table[DETECT_ACK].Match = DetectAckMatch;

diff --git a/src/detect-flags.c b/src/detect-flags.c
index 4eceee086efef9509269a14b66ad0012a4ceef7e..0ba28e8f902daa1782317c6cb4e6007507b29e5b 100644 (file)
--- a/src/detect-flags.c
+++ b/src/detect-flags.c
@@ -72,7 +72,8 @@ static int PrefilterSetupTcpFlags(DetectEngineCtx *de_ctx, SigGroupHead *sgh);
 
 void DetectFlagsRegister (void)
 {
-    sigmatch_table[DETECT_FLAGS].name = "flags";
+    sigmatch_table[DETECT_FLAGS].name = "tcp.flags";
+    sigmatch_table[DETECT_FLAGS].alias = "flags";
     sigmatch_table[DETECT_FLAGS].Match = DetectFlagsMatch;
     sigmatch_table[DETECT_FLAGS].Setup = DetectFlagsSetup;
     sigmatch_table[DETECT_FLAGS].Free  = DetectFlagsFree;

diff --git a/src/detect-seq.c b/src/detect-seq.c
index 972482724f818c3236fdeafe8ef33c4c114d0e4c..f3dde3b002c1999a2902291fb089acb465fa628b 100644 (file)
--- a/src/detect-seq.c
+++ b/src/detect-seq.c
@@ -50,7 +50,8 @@ static _Bool PrefilterTcpSeqIsPrefilterable(const Signature *s);
 
 void DetectSeqRegister(void)
 {
-    sigmatch_table[DETECT_SEQ].name = "seq";
+    sigmatch_table[DETECT_SEQ].name = "tcp.seq";
+    sigmatch_table[DETECT_SEQ].alias = "seq";
     sigmatch_table[DETECT_SEQ].desc = "check for a specific TCP sequence number";
     sigmatch_table[DETECT_SEQ].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#seq";
     sigmatch_table[DETECT_SEQ].Match = DetectSeqMatch;

diff --git a/src/detect-window.c b/src/detect-window.c
index bd1b2f28f6cbc3f1989b8251b27c12f5fd922611..6fede1552faef0d14147d59bbacb764e244fbe32 100644 (file)
--- a/src/detect-window.c
+++ b/src/detect-window.c
@@ -58,7 +58,8 @@ void DetectWindowFree(void *);
  */
 void DetectWindowRegister (void)
 {
-    sigmatch_table[DETECT_WINDOW].name = "window";
+    sigmatch_table[DETECT_WINDOW].name = "tcp.window";
+    sigmatch_table[DETECT_WINDOW].alias = "window";
     sigmatch_table[DETECT_WINDOW].desc = "check for a specific TCP window size";
     sigmatch_table[DETECT_WINDOW].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#window";
     sigmatch_table[DETECT_WINDOW].Match = DetectWindowMatch;