From: Victor Julien <victor@inliniac.net>
Date: Wed, 19 Jun 2019 12:00:18 +0000 (+0200)
Subject: detect/tcp: add tcp.<field> notation variants
X-Git-Tag: suricata-5.0.0-rc1~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47919fd0e468e49354c7ca513bc1620149c96cc2;p=thirdparty%2Fsuricata.git

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

diff --git a/src/detect-ack.c b/src/detect-ack.c
index 095a44dc7e..bd3f92ded1 100644
--- 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 4eceee086e..0ba28e8f90 100644
--- 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 972482724f..f3dde3b002 100644
--- 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 bd1b2f28f6..6fede1552f 100644
--- 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;