From: Jeff Lucovsky <jeff@lucovsky.org>
Date: Mon, 12 Apr 2021 13:12:23 +0000 (-0400)
Subject: output/log: Removed pcie (Tilera) log vestiges
X-Git-Tag: suricata-6.0.3~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5394126b10c2173d29ee83cd37e303f8f8da0a16;p=thirdparty%2Fsuricata.git

output/log: Removed pcie (Tilera) log vestiges

This commit removes the last remnants of the Tilera log output mechanism
(unsupported since 5.0.x).

(cherry picked from commit aa9ad56a5b0faeb9528558f6197ff967c6714e94)
---

diff --git a/src/util-logopenfile.c b/src/util-logopenfile.c
index 102b96e748..0de413aaff 100644
--- a/src/util-logopenfile.c
+++ b/src/util-logopenfile.c
@@ -575,7 +575,6 @@ SCConfLogOpenGeneric(ConfNode *conf,
     } else {
         SCLogError(SC_ERR_INVALID_YAML_CONF_ENTRY, "Invalid entry for "
                    "%s.filetype.  Expected \"regular\" (default), \"unix_stream\", "
-                   "\"pcie\" "
                    "or \"unix_dgram\"",
                    conf->name);
     }
diff --git a/src/util-logopenfile.h b/src/util-logopenfile.h
index cc62802264..58d95d27a1 100644
--- a/src/util-logopenfile.h
+++ b/src/util-logopenfile.h
@@ -33,10 +33,6 @@
 
 #include "suricata-plugin.h"
 
-typedef struct {
-    uint16_t fileno;
-} PcieFile;
-
 enum LogFileType { LOGFILE_TYPE_FILE,
                    LOGFILE_TYPE_SYSLOG,
                    LOGFILE_TYPE_UNIX_DGRAM,
@@ -60,7 +56,6 @@ typedef struct LogThreadedFileCtx_ {
 typedef struct LogFileCtx_ {
     union {
         FILE *fp;
-        PcieFile *pcie_fp;
         LogThreadedFileCtx *threads;
         void *plugin_data;
 #ifdef HAVE_LIBHIREDIS