dhcp: move to app-layer

jasonish · Dec 4, 2023 · 3aa8bd1 · 3aa8bd1
1 parent f6034d2
commit 3aa8bd1
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -298,9 +298,9 @@ noinst_HEADERS = \
 	app-layer/snmp/detect-pdu_type.h \
 	app-layer/snmp/detect-usm.h \
 	app-layer/snmp/detect-version.h \
-	detect-dhcp-leasetime.h \
-	detect-dhcp-rebinding-time.h \
-	detect-dhcp-renewal-time.h \
+	app-layer/dhcp/detect-leasetime.h \
+	app-layer/dhcp/detect-rebinding-time.h \
+	app-layer/dhcp/detect-renewal-time.h \
 	app-layer/ssh/detect-hassh.h \
 	app-layer/ssh/detect-hassh-server.h \
 	app-layer/ssh/detect-hassh-server-string.h \
@@ -399,7 +399,7 @@ noinst_HEADERS = \
 	output-json-anomaly.h \
 	app-layer/bittorrent-dht/logger.h \
 	app-layer/dcerpc/logger.h \
-	output-json-dhcp.h \
+	app-layer/dhcp/logger.h \
 	app-layer/dnp3/logger.h \
 	app-layer/dnp3/logger-objects.h \
 	app-layer/dns/logger.h \
@@ -911,9 +911,9 @@ libsuricata_c_a_SOURCES = \
 	app-layer/snmp/detect-pdu_type.c \
 	app-layer/snmp/detect-usm.c \
 	app-layer/snmp/detect-version.c \
-	detect-dhcp-leasetime.c \
-	detect-dhcp-rebinding-time.c \
-	detect-dhcp-renewal-time.c \
+	app-layer/dhcp/detect-leasetime.c \
+	app-layer/dhcp/detect-rebinding-time.c \
+	app-layer/dhcp/detect-renewal-time.c \
 	app-layer/ssh/detect-hassh.c \
 	app-layer/ssh/detect-hassh-server.c \
 	app-layer/ssh/detect-hassh-server-string.c \
@@ -1012,7 +1012,7 @@ libsuricata_c_a_SOURCES = \
 	output-json.c \
 	output-json-common.c \
 	app-layer/dcerpc/logger.c \
-	output-json-dhcp.c \
+	app-layer/dhcp/logger.c \
 	app-layer/dnp3/logger.c \
 	app-layer/dnp3/logger-objects.c \
 	app-layer/dns/logger.c \

diff --git a/src/detect-dhcp-leasetime.c → src/app-layer/dhcp/detect-leasetime.c b/src/detect-dhcp-leasetime.c → src/app-layer/dhcp/detect-leasetime.c
@@ -17,7 +17,7 @@
 
 #include "suricata-common.h"
 #include "rust.h"
-#include "detect-dhcp-leasetime.h"
+#include "app-layer/dhcp/detect-leasetime.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-dhcp-leasetime.h → src/app-layer/dhcp/detect-leasetime.h b/src/detect-dhcp-leasetime.h → src/app-layer/dhcp/detect-leasetime.h
diff --git a/src/detect-dhcp-rebinding-time.c → src/app-layer/dhcp/detect-rebinding-time.c b/src/detect-dhcp-rebinding-time.c → src/app-layer/dhcp/detect-rebinding-time.c
@@ -17,7 +17,7 @@
 
 #include "suricata-common.h"
 #include "rust.h"
-#include "detect-dhcp-rebinding-time.h"
+#include "app-layer/dhcp/detect-rebinding-time.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-dhcp-rebinding-time.h → src/app-layer/dhcp/detect-rebinding-time.h b/src/detect-dhcp-rebinding-time.h → src/app-layer/dhcp/detect-rebinding-time.h
diff --git a/src/detect-dhcp-renewal-time.c → src/app-layer/dhcp/detect-renewal-time.c b/src/detect-dhcp-renewal-time.c → src/app-layer/dhcp/detect-renewal-time.c
@@ -17,7 +17,7 @@
 
 #include "suricata-common.h"
 #include "rust.h"
-#include "detect-dhcp-renewal-time.h"
+#include "app-layer/dhcp/detect-renewal-time.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-dhcp-renewal-time.h → src/app-layer/dhcp/detect-renewal-time.h b/src/detect-dhcp-renewal-time.h → src/app-layer/dhcp/detect-renewal-time.h
diff --git a/src/output-json-dhcp.c → src/app-layer/dhcp/logger.c b/src/output-json-dhcp.c → src/app-layer/dhcp/logger.c
@@ -22,7 +22,7 @@
  */
 
 #include "suricata-common.h"
-#include "detect.h"
+#include "../../detect.h"
 #include "pkt-var.h"
 #include "conf.h"
 
@@ -41,7 +41,7 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 
-#include "output-json-dhcp.h"
+#include "app-layer/dhcp/logger.h"
 #include "rust.h"
 
 typedef struct LogDHCPFileCtx_ {

diff --git a/src/output-json-dhcp.h → src/app-layer/dhcp/logger.h b/src/output-json-dhcp.h → src/app-layer/dhcp/logger.h
diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
@@ -203,9 +203,9 @@
 #include "app-layer/rfb/detect-name.h"
 #include "detect-target.h"
 #include "app-layer/template/detect-rust-buffer.h"
-#include "detect-dhcp-leasetime.h"
-#include "detect-dhcp-rebinding-time.h"
-#include "detect-dhcp-renewal-time.h"
+#include "app-layer/dhcp/detect-leasetime.h"
+#include "app-layer/dhcp/detect-rebinding-time.h"
+#include "app-layer/dhcp/detect-renewal-time.h"
 #include "app-layer/snmp/detect-usm.h"
 #include "app-layer/snmp/detect-version.h"
 #include "app-layer/snmp/detect-community.h"

diff --git a/src/output.c b/src/output.c
@@ -74,7 +74,7 @@
 #include "app-layer/ike/logger.h"
 #include "app-layer/krb5/logger.h"
 #include "app-layer/quic/logger.h"
-#include "output-json-dhcp.h"
+#include "app-layer/dhcp/logger.h"
 #include "app-layer/snmp/logger.h"
 #include "app-layer/sip/logger.h"
 #include "app-layer/rfb/logger.h"