Include less v8

.github/workflows/builds.yml

@@ -390,7 +390,7 @@ jobs:
           chmod 755 $HOME/.cargo/bin/cbindgen
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - run: ./autogen.sh
-      - run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow -fsanitize=address -fno-omit-frame-pointer" ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis
+      - run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow -fsanitize=address -fno-omit-frame-pointer" ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis --enable-nfqueue
         env:
           LDFLAGS: "-fsanitize=address"
           ac_cv_func_realloc_0_nonnull: "yes"
@@ -602,6 +602,7 @@ jobs:
                 libnfnetlink0 \
                 libnuma-dev \
                 libhiredis-dev \
+                libhyperscan-dev \
                 liblua5.1-dev \
                 libjansson-dev \
                 libevent-dev \
@@ -1267,6 +1268,7 @@ jobs:
                 libjansson-dev \
                 libgeoip-dev \
                 liblua5.1-dev \
+                libluajit-5.1-dev \
                 libhiredis-dev \
                 libevent-dev \
                 libtool \
@@ -1293,7 +1295,7 @@ jobs:
           cp prep/cbindgen $HOME/.cargo/bin
           chmod 755 $HOME/.cargo/bin/cbindgen
       - run: ./autogen.sh
-      - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests
+      - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --enable-luajit
       - run: make -j2
       - run: make check
       - run: tar xf prep/suricata-verify.tar.gz

scripts/mininc.py

@@ -0,0 +1,48 @@
+import sys
+import shutil
+import subprocess
+import os
+
+includes = []
+cfile = sys.argv[1]
+basename = os.path.basename(cfile)[:-2]
+f = open(cfile, "r")
+needsSuricataH = False
+for l in f.readlines():
+    if l.startswith('#include "'):
+        included = l.split('"')[1]
+        if included == "suricata-common.h":
+            continue
+        if included == basename+".h":
+            continue
+        if included[-2:] == ".c":
+            continue
+        includes.append(included)
+    if "RunmodeIsUnittests" in l:
+        needsSuricataH = True
+f.close()
+
+for i in includes:
+    if i == "suricata.h" and needsSuricataH:
+        continue
+    f = open(cfile, "r")
+    f2 = open(cfile+".test", "w")
+    for l in f.readlines():
+        if l.startswith('#include "'):
+            if l.split('"')[1] == i:
+                continue
+        f2.write(l)
+    f2.close()
+    f.close()
+    shutil.copyfile(cfile, cfile+".bak")
+    shutil.copyfile(cfile+".test", cfile)
+    try:
+        os.remove(cfile[:-2]+".o")
+    except:
+        pass
+    cp = subprocess.run(["make", "-C", "src", basename+".o"])
+    if cp.returncode != 0:
+        shutil.copyfile(cfile+".bak", cfile)
+        print("Needs", i)
+    else:
+        print("Removes", i)

src/Makefile.am

@@ -14,7 +14,6 @@ noinst_HEADERS = \
 	alert-debuglog.h \
 	alert-fastlog.h \
 	alert-syslog.h \
-	app-layer-dcerpc-common.h \
 	app-layer-detect-proto.h \
 	app-layer-dnp3.h \
 	app-layer-dnp3-objects.h \

src/alert-debuglog.c

@@ -22,36 +22,16 @@
  */
 
 #include "suricata-common.h"
-#include "suricata.h"
-
-#include "debug.h"
-#include "detect.h"
-#include "flow.h"
-#include "conf.h"
 #include "stream.h"
-#include "app-layer-protos.h"
-
-#include "threads.h"
-#include "threadvars.h"
-#include "tm-threads.h"
 
 #include "util-print.h"
-
-#include "pkt-var.h"
-
-#include "util-unittest.h"
-
-#include "util-debug.h"
 #include "util-validate.h"
-#include "util-buffer.h"
 
 #include "output.h"
 #include "alert-debuglog.h"
-#include "util-privs.h"
 #include "flow-var.h"
 #include "flow-bit.h"
 #include "util-var-name.h"
-#include "util-optimize.h"
 #include "util-logopenfile.h"
 #include "util-time.h"
 

src/alert-fastlog.c

@@ -25,33 +25,14 @@
  */
 
 #include "suricata-common.h"
-#include "debug.h"
-#include "detect.h"
-#include "flow.h"
-#include "conf.h"
 
-#include "threads.h"
-#include "tm-threads.h"
-#include "threadvars.h"
-#include "util-debug.h"
-
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
-
-#include "detect-parse.h"
 #include "detect-engine.h"
-#include "detect-engine-build.h"
-#include "detect-engine-mpm.h"
-#include "detect-reference.h"
-#include "util-classification-config.h"
 
 #include "output.h"
 #include "alert-fastlog.h"
 
-#include "util-privs.h"
 #include "util-print.h"
 #include "util-proto-name.h"
-#include "util-optimize.h"
 #include "util-logopenfile.h"
 #include "util-time.h"
 
@@ -262,6 +243,12 @@ static void AlertFastLogDeInitCtx(OutputCtx *output_ctx)
 
 #ifdef UNITTESTS
 
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
+#include "util-classification-config.h"
+#include "detect-parse.h"
+#include "detect-engine-build.h"
+
 static int AlertFastLogTest01(void)
 {
     uint8_t *buf = (uint8_t *) "GET /one/ HTTP/1.1\r\n"

src/alert-syslog.c

@@ -25,29 +25,15 @@
  */
 
 #include "suricata-common.h"
-#include "debug.h"
-#include "flow.h"
-#include "conf.h"
 
-#include "threads.h"
-#include "tm-threads.h"
-#include "threadvars.h"
-
-#include "detect.h"
-#include "detect-parse.h"
 #include "detect-engine.h"
-#include "detect-engine-mpm.h"
-#include "detect-reference.h"
 
 #include "output.h"
 #include "alert-syslog.h"
 
-#include "util-classification-config.h"
-#include "util-debug.h"
 #include "util-print.h"
 #include "util-proto-name.h"
 #include "util-syslog.h"
-#include "util-optimize.h"
 #include "util-logopenfile.h"
 
 #ifndef OS_WIN32

src/app-layer-detect-proto.c

@@ -23,50 +23,25 @@
  */
 
 #include "suricata-common.h"
-#include "debug.h"
-#include "decode.h"
-#include "threads.h"
-#include "threadvars.h"
-#include "tm-threads.h"
 
-#include "detect.h"
 #include "detect-engine-port.h"
-#include "detect-engine-build.h"
-#include "detect-parse.h"
-#include "detect-engine.h"
 #include "detect-content.h"
 #include "detect-engine-mpm.h"
-#include "detect-engine-state.h"
 
-#include "util-print.h"
-#include "util-pool.h"
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
 #include "util-validate.h"
 
-#include "flow.h"
 #include "flow-util.h"
 #include "flow-private.h"
 
-#include "stream-tcp-private.h"
-#include "stream-tcp-reassemble.h"
 #include "stream-tcp.h"
-#include "stream.h"
 
-#include "app-layer.h"
-#include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer-expectation.h"
 
-#include "conf.h"
 #include "util-memcmp.h"
-#include "util-spm.h"
-#include "util-debug.h"
 #include "util-validate.h"
 
-#include "runmodes.h"
-
 typedef struct AppLayerProtoDetectProbingParserElement_ {
     AppProto alproto;
     /* \todo don't really need it.  See if you can get rid of it */
@@ -2260,7 +2235,12 @@ void AppLayerRegisterExpectationProto(uint8_t proto, AppProto alproto)
 
 #ifdef UNITTESTS
 
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
 #include "app-layer-htp.h"
+#include "detect-engine.h"
+#include "detect-engine-build.h"
+#include "detect-parse.h"
 
 static AppLayerProtoDetectCtx alpd_ctx_ut;
 

src/app-layer-dnp3.c

@@ -17,26 +17,17 @@
 
 #include "suricata-common.h"
 #include "suricata.h"
-#include "stream.h"
-#include "util-byte.h"
 #include "util-unittest.h"
-#include "util-hashlist.h"
 
-#include "util-print.h"
-#include "util-spm-bs.h"
 #include "util-enum.h"
 
 #include "app-layer.h"
-#include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-detect-proto.h"
 
 #include "app-layer-dnp3.h"
 #include "app-layer-dnp3-objects.h"
 
-/* For hexdump(). */
-#include "app-layer-dcerpc-common.h"
-
 /* Default number of unreplied requests to be considered a flood. */
 #define DNP3_DEFAULT_REQ_FLOOD_COUNT 500
 

src/app-layer-enip-common.c

@@ -25,13 +25,7 @@
  */
 
 #include "suricata-common.h"
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
-#include "detect-parse.h"
-#include "detect-engine.h"
 #include "util-byte.h"
-#include "pkt-var.h"
-#include "util-profiling.h"
 
 #include "app-layer-enip-common.h"
 

src/app-layer-enip.c

@@ -25,34 +25,20 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 
-#include "util-debug.h"
 #include "util-byte.h"
 #include "util-enum.h"
-#include "util-mem.h"
-#include "util-misc.h"
-
-#include "stream.h"
 
 #include "app-layer.h"
-#include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-enip.h"
 #include "app-layer-enip-common.h"
 
 #include "app-layer-detect-proto.h"
 
-#include "conf.h"
-#include "decode.h"
-
-#include "detect-parse.h"
-#include "detect-engine.h"
 #include "util-byte.h"
 #include "util-unittest.h"
-#include "util-unittest-helper.h"
-#include "pkt-var.h"
-#include "util-profiling.h"
-
 
 SCEnumCharMap enip_decoder_event_table[ ] = {
     { NULL,                         -1 },
@@ -599,12 +585,9 @@ void RegisterENIPTCPParsers(void)
 /* UNITTESTS */
 #ifdef UNITTESTS
 #include "app-layer-parser.h"
-#include "detect-parse.h"
-#include "detect-engine.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
 #include "util-unittest.h"
-#include "util-unittest-helper.h"
 
 static uint8_t listIdentity[] = {/* List ID */    0x63, 0x00,
                                  /* Length */     0x00, 0x00,

src/app-layer-events.c

@@ -23,10 +23,7 @@
  */
 
 #include "suricata-common.h"
-#include "decode.h"
-#include "flow.h"
 #include "app-layer-events.h"
-#include "app-layer-parser.h"
 #include "util-enum.h"
 
 /* events raised during protocol detection are stored in the