detect/tcp: rename tcp keyword files

diff --git a/src/Makefile.am b/src/Makefile.am
index 4376047498f38055a03fdfa0a72c51c03e2a4e9a..b589dbf52664be5e942bb91862344964b8598854 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,7 +83,6 @@ defrag.c defrag.h \
 defrag-hash.c defrag-hash.h \
 defrag-queue.c defrag-queue.h \
 defrag-timeout.c defrag-timeout.h \
-detect-ack.c detect-ack.h \
 detect-app-layer-event.c detect-app-layer-event.h \
 detect-app-layer-protocol.c detect-app-layer-protocol.h \
 detect-asn1.c detect-asn1.h \
@@ -157,7 +156,6 @@ detect-filesha256.c detect-filesha256.h \
 detect-filename.c detect-filename.h \
 detect-filesize.c detect-filesize.h \
 detect-filestore.c detect-filestore.h \
-detect-flags.c detect-flags.h \
 detect-flowbits.c detect-flowbits.h \
 detect-flow.c detect-flow.h \
 detect-flowint.c detect-flowint.h \
@@ -231,7 +229,6 @@ detect-replace.c detect-replace.h \
 detect-rev.c detect-rev.h \
 detect-rpc.c detect-rpc.h \
 detect-sameip.c detect-sameip.h \
-detect-seq.c detect-seq.h \
 detect-sid.c detect-sid.h \
 detect-snmp-community.c detect-snmp-community.h \
 detect-snmp-pdu_type.c detect-snmp-pdu_type.h \
@@ -246,10 +243,14 @@ detect-ssl-version.c detect-ssl-version.h \
 detect-stream_size.c detect-stream_size.h \
 detect-tag.c detect-tag.h \
 detect-target.c detect-target.h \
-detect-template.c detect-template.h \
-detect-template2.c detect-template2.h \
+detect-tcp-ack.c detect-tcp-ack.h \
+detect-tcp-flags.c detect-tcp-flags.h \
+detect-tcp-seq.c detect-tcp-seq.h \
+detect-tcp-window.c detect-tcp-window.h \
 detect-tcphdr.c detect-tcphdr.h \
 detect-tcpmss.c detect-tcpmss.h \
+detect-template.c detect-template.h \
+detect-template2.c detect-template2.h \
 detect-ftpdata.c detect-ftpdata.h \
 detect-template-rust-buffer.c detect-template-rust-buffer.h \
 detect-template-buffer.c detect-template-buffer.h \
@@ -266,7 +267,6 @@ detect-transform-sha256.c detect-transform-sha256.h \
 detect-ttl.c detect-ttl.h \
 detect-uricontent.c detect-uricontent.h \
 detect-urilen.c detect-urilen.h \
-detect-window.c detect-window.h \
 detect-within.c detect-within.h \
 detect-modbus.c detect-modbus.h \
 detect-xbits.c detect-xbits.h \

diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index fb58bc9e5cbdd931745891642413573b5a27e014..006c30d7e899fadf944f4dd68165eaa37f6d60e5 100644 (file)
--- a/src/detect-engine-analyzer.c
+++ b/src/detect-engine-analyzer.c
@@ -34,7 +34,7 @@
 #include "conf.h"
 #include "detect-content.h"
 #include "detect-flow.h"
-#include "detect-flags.h"
+#include "detect-tcp-flags.h"
 #include "util-print.h"
 
 static int rule_warnings_only = 0;

diff --git a/src/detect-engine-build.c b/src/detect-engine-build.c
index 849f1bda330fadb8c227f791dde3240190dc3d48..604310d02f04fe8313182838a5e40218f0ae87da 100644 (file)
--- a/src/detect-engine-build.c
+++ b/src/detect-engine-build.c
@@ -30,7 +30,7 @@
 #include "detect-engine-proto.h"
 
 #include "detect-dsize.h"
-#include "detect-flags.h"
+#include "detect-tcp-flags.h"
 #include "detect-flow.h"
 #include "detect-flowbits.h"
 

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
index 7e74e025b148549eefb45165115f6e382c86ff06..3f67b8757bf6ad9e1a92befbb7c2819b6e20d367 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -75,12 +75,12 @@
 #include "detect-base64-decode.h"
 #include "detect-base64-data.h"
 #include "detect-ipopts.h"
-#include "detect-flags.h"
+#include "detect-tcp-flags.h"
 #include "detect-fragbits.h"
 #include "detect-fragoffset.h"
 #include "detect-gid.h"
-#include "detect-ack.h"
-#include "detect-seq.h"
+#include "detect-tcp-ack.h"
+#include "detect-tcp-seq.h"
 #include "detect-content.h"
 #include "detect-uricontent.h"
 #include "detect-pcre.h"
@@ -106,7 +106,7 @@
 #include "detect-msg.h"
 #include "detect-rev.h"
 #include "detect-flow.h"
-#include "detect-window.h"
+#include "detect-tcp-window.h"
 #include "detect-ftpbounce.h"
 #include "detect-isdataat.h"
 #include "detect-id.h"

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index 9502ef80f1b08a26522d9777d6c8d551e3f57b40..4951b99bf8c10a286b70716e4869345d7c7014c6 100644 (file)
--- a/src/detect-engine-siggroup.c
+++ b/src/detect-engine-siggroup.c
@@ -40,7 +40,7 @@
 
 #include "detect-content.h"
 #include "detect-uricontent.h"
-#include "detect-flags.h"
+#include "detect-tcp-flags.h"
 
 #include "util-hash.h"
 #include "util-hashlist.h"

diff --git a/src/detect-ack.c b/src/detect-tcp-ack.c
similarity index 99%
rename from src/detect-ack.c
rename to src/detect-tcp-ack.c
index bd3f92ded16a7a880cfd00d5f496f29e36bcc1cb..94d8b1a0218622ab4c80f55d110a5084b7efbec8 100644 (file)
--- a/src/detect-ack.c
+++ b/src/detect-tcp-ack.c
@@ -35,7 +35,7 @@
 #include "detect-engine-prefilter.h"
 #include "detect-engine-prefilter-common.h"
 
-#include "detect-ack.h"
+#include "detect-tcp-ack.h"
 
 #include "util-byte.h"
 #include "util-unittest.h"
@@ -335,4 +335,3 @@ static void DetectAckRegisterTests(void)
     UtRegisterTest("DetectAckSigTest01", DetectAckSigTest01);
 #endif /* UNITTESTS */
 }
-

diff --git a/src/detect-ack.h b/src/detect-tcp-ack.h
similarity index 99%
rename from src/detect-ack.h
rename to src/detect-tcp-ack.h
index 6a8465b8180d4baaf76142b71e1de7cb5d873cc6..e1bb7c710c77f125e345f4239877a55962422349 100644 (file)
--- a/src/detect-ack.h
+++ b/src/detect-tcp-ack.h
@@ -37,4 +37,3 @@ typedef struct DetectAckData_ {
 void DetectAckRegister(void);
 
 #endif /* __DETECT_ACK_H__ */
-

diff --git a/src/detect-flags.c b/src/detect-tcp-flags.c
similarity index 99%
rename from src/detect-flags.c
rename to src/detect-tcp-flags.c
index 0ba28e8f902daa1782317c6cb4e6007507b29e5b..c8055b3395ade16048a1f1e5f6522dd5bea61c04 100644 (file)
--- a/src/detect-flags.c
+++ b/src/detect-tcp-flags.c
@@ -35,7 +35,7 @@
 #include "flow-var.h"
 #include "decode-events.h"
 
-#include "detect-flags.h"
+#include "detect-tcp-flags.h"
 #include "util-unittest.h"
 
 #include "util-debug.h"

diff --git a/src/detect-flags.h b/src/detect-tcp-flags.h
similarity index 100%
rename from src/detect-flags.h
rename to src/detect-tcp-flags.h

diff --git a/src/detect-seq.c b/src/detect-tcp-seq.c
similarity index 99%
rename from src/detect-seq.c
rename to src/detect-tcp-seq.c
index f3dde3b002c1999a2902291fb089acb465fa628b..63c5242f34c1603434b6330fb0314a56d8e65215 100644 (file)
--- a/src/detect-seq.c
+++ b/src/detect-tcp-seq.c
@@ -33,7 +33,7 @@
 #include "detect-engine-prefilter.h"
 #include "detect-engine-prefilter-common.h"
 
-#include "detect-seq.h"
+#include "detect-tcp-seq.h"
 
 #include "util-byte.h"
 #include "util-unittest.h"
@@ -300,4 +300,3 @@ static void DetectSeqRegisterTests(void)
     UtRegisterTest("DetectSeqSigTest02", DetectSeqSigTest02);
 #endif /* UNITTESTS */
 }
-

diff --git a/src/detect-seq.h b/src/detect-tcp-seq.h
similarity index 99%
rename from src/detect-seq.h
rename to src/detect-tcp-seq.h
index 813e8fab3672904fe3f8a176778140b4dab361ad..688b6c2c39da832c91898a623620f66e158ce191 100644 (file)
--- a/src/detect-seq.h
+++ b/src/detect-tcp-seq.h
@@ -37,4 +37,3 @@ typedef struct DetectSeqData_ {
 void DetectSeqRegister(void);
 
 #endif /* __DETECT_SEQ_H__ */
-

diff --git a/src/detect-window.c b/src/detect-tcp-window.c
similarity index 99%
rename from src/detect-window.c
rename to src/detect-tcp-window.c
index 6fede1552faef0d14147d59bbacb764e244fbe32..2e3fbd962cf7fc2631140f66fff310daa0e035b4 100644 (file)
--- a/src/detect-window.c
+++ b/src/detect-tcp-window.c
@@ -30,7 +30,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 
-#include "detect-window.h"
+#include "detect-tcp-window.h"
 #include "flow.h"
 #include "flow-var.h"
 

diff --git a/src/detect-window.h b/src/detect-tcp-window.h
similarity index 99%
rename from src/detect-window.h
rename to src/detect-tcp-window.h
index c51bbae38816360e962eaf24e72d27082c9d97b4..780f9ab386775fa1c7f5ae516890651d0c6dbc75 100644 (file)
--- a/src/detect-window.h
+++ b/src/detect-tcp-window.h
@@ -30,4 +30,3 @@ typedef struct DetectWindowData_ {
 void DetectWindowRegister (void);
 
 #endif /* __DETECT_WINDOW_H__ */
-