detect/tcp: rename tcp keyword files

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-tcp-ack.c detect-tcp-ack.h \
-detect-template2.c detect-template2.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 \

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;

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"
 

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-tcp-ack.h"
-#include "detect-seq.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"

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"

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 */
 }
-

src/detect-tcp-ack.h

@@ -37,4 +37,3 @@ typedef struct DetectAckData_ {
 void DetectAckRegister(void);
 
 #endif /* __DETECT_ACK_H__ */
-

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"

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 */
 }
-

src/detect-tcp-seq.h

@@ -37,4 +37,3 @@ typedef struct DetectSeqData_ {
 void DetectSeqRegister(void);
 
 #endif /* __DETECT_SEQ_H__ */
-

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"
 

src/detect-tcp-window.h

@@ -30,4 +30,3 @@ typedef struct DetectWindowData_ {
 void DetectWindowRegister (void);
 
 #endif /* __DETECT_WINDOW_H__ */
-