|
|
|
/* vi: set et ts=4: */
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
/* Copyright (C) 2007-2014 Open Information Security Foundation
|
|
|
|
*
|
|
|
|
* You can copy, redistribute or modify this Program under the terms of
|
|
|
|
* the GNU General Public License version 2 as published by the Free
|
|
|
|
* Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* version 2 along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \file
|
|
|
|
*
|
|
|
|
* \author Mike Pomraning <mpomraning@qualys.com>
|
|
|
|
*
|
|
|
|
* File-like output for logging: regular files and sockets.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "suricata-common.h" /* errno.h, string.h, etc. */
|
|
|
|
#include "tm-modules.h" /* LogFileCtx */
|
|
|
|
#include "conf.h" /* ConfNode, etc. */
|
|
|
|
#include "output.h" /* DEFAULT_LOG_* */
|
|
|
|
#include "util-byte.h"
|
|
|
|
#include "util-path.h"
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
#include "util-logopenfile.h"
|
|
|
|
#include "util-logopenfile-tile.h"
|
|
|
|
|
|
|
|
#if defined(HAVE_SYS_UN_H) && defined(HAVE_SYS_SOCKET_H) && defined(HAVE_SYS_TYPES_H)
|
|
|
|
#define BUILD_WITH_UNIXSOCKET
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/un.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_LIBHIREDIS
|
|
|
|
#include "util-log-redis.h"
|
|
|
|
#endif /* HAVE_LIBHIREDIS */
|
|
|
|
|
|
|
|
#ifdef BUILD_WITH_UNIXSOCKET
|
|
|
|
/** \brief connect to the indicated local stream socket, logging any errors
|
|
|
|
* \param path filesystem path to connect to
|
|
|
|
* \param log_err, non-zero if connect failure should be logged.
|
|
|
|
* \retval FILE* on success (fdopen'd wrapper of underlying socket)
|
|
|
|
* \retval NULL on error
|
|
|
|
*/
|
|
|
|
static FILE *
|
|
|
|
SCLogOpenUnixSocketFp(const char *path, int sock_type, int log_err)
|
|
|
|
{
|
|
|
|
struct sockaddr_un saun;
|
|
|
|
int s = -1;
|
|
|
|
FILE * ret = NULL;
|
|
|
|
|
|
|
|
memset(&saun, 0x00, sizeof(saun));
|
|
|
|
|
|
|
|
s = socket(PF_UNIX, sock_type, 0);
|
|
|
|
if (s < 0) goto err;
|
|
|
|
|
|
|
|
saun.sun_family = AF_UNIX;
|
|
|
|
strlcpy(saun.sun_path, path, sizeof(saun.sun_path));
|
|
|
|
|
|
|
|
if (connect(s, (const struct sockaddr *)&saun, sizeof(saun)) < 0)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
ret = fdopen(s, "w");
|
|
|
|
if (ret == NULL)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (log_err)
|
|
|
|
SCLogWarning(SC_ERR_SOCKET,
|
|
|
|
"Error connecting to socket \"%s\": %s (will keep trying)",
|
|
|
|
path, strerror(errno));
|
|
|
|
|
|
|
|
if (s >= 0)
|
|
|
|
close(s);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \brief Attempt to reconnect a disconnected (or never-connected) Unix domain socket.
|
|
|
|
* \retval 1 if it is now connected; otherwise 0
|
|
|
|
*/
|
|
|
|
static int SCLogUnixSocketReconnect(LogFileCtx *log_ctx)
|
|
|
|
{
|
|
|
|
int disconnected = 0;
|
|
|
|
if (log_ctx->fp) {
|
|
|
|
SCLogWarning(SC_ERR_SOCKET,
|
|
|
|
"Write error on Unix socket \"%s\": %s; reconnecting...",
|
|
|
|
log_ctx->filename, strerror(errno));
|
|
|
|
fclose(log_ctx->fp);
|
|
|
|
log_ctx->fp = NULL;
|
|
|
|
log_ctx->reconn_timer = 0;
|
|
|
|
disconnected = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct timeval tv;
|
|
|
|
uint64_t now;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
now = (uint64_t)tv.tv_sec * 1000;
|
|
|
|
now += tv.tv_usec / 1000; /* msec resolution */
|
|
|
|
if (log_ctx->reconn_timer != 0 &&
|
|
|
|
(now - log_ctx->reconn_timer) < LOGFILE_RECONN_MIN_TIME) {
|
|
|
|
/* Don't bother to try reconnecting too often. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
log_ctx->reconn_timer = now;
|
|
|
|
|
|
|
|
log_ctx->fp = SCLogOpenUnixSocketFp(log_ctx->filename, log_ctx->sock_type, 0);
|
|
|
|
if (log_ctx->fp) {
|
|
|
|
/* Connected at last (or reconnected) */
|
|
|
|
SCLogNotice("Reconnected socket \"%s\"", log_ctx->filename);
|
|
|
|
} else if (disconnected) {
|
|
|
|
SCLogWarning(SC_ERR_SOCKET, "Reconnect failed: %s (will keep trying)",
|
|
|
|
strerror(errno));
|
|
|
|
}
|
|
|
|
|
|
|
|
return log_ctx->fp ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int SCLogFileWriteSocket(const char *buffer, int buffer_len,
|
|
|
|
LogFileCtx *ctx)
|
|
|
|
{
|
|
|
|
int tries = 0;
|
|
|
|
int ret = 0;
|
|
|
|
bool reopen = false;
|
|
|
|
#ifdef BUILD_WITH_UNIXSOCKET
|
|
|
|
if (ctx->fp == NULL && ctx->is_sock) {
|
|
|
|
SCLogUnixSocketReconnect(ctx);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
tryagain:
|
|
|
|
ret = -1;
|
|
|
|
reopen = 0;
|
|
|
|
errno = 0;
|
|
|
|
if (ctx->fp != NULL) {
|
|
|
|
int fd = fileno(ctx->fp);
|
|
|
|
ssize_t size = send(fd, buffer, buffer_len, ctx->send_flags);
|
|
|
|
if (size > -1) {
|
|
|
|
ret = 0;
|
|
|
|
} else {
|
|
|
|
if (errno == EAGAIN || errno == EWOULDBLOCK) {
|
|
|
|
SCLogDebug("Socket would block, dropping event.");
|
|
|
|
} else if (errno == EINTR) {
|
|
|
|
if (tries++ == 0) {
|
|
|
|
SCLogDebug("Interrupted system call, trying again.");
|
|
|
|
goto tryagain;
|
|
|
|
}
|
|
|
|
SCLogDebug("Too many interrupted system calls, "
|
|
|
|
"dropping event.");
|
|
|
|
} else {
|
|
|
|
/* Some other error. Assume badness and reopen. */
|
|
|
|
SCLogDebug("Send failed: %s", strerror(errno));
|
|
|
|
reopen = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reopen && tries++ == 0) {
|
|
|
|
if (SCLogUnixSocketReconnect(ctx)) {
|
|
|
|
goto tryagain;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == -1) {
|
|
|
|
ctx->dropped++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif /* BUILD_WITH_UNIXSOCKET */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \brief Write buffer to log file.
|
|
|
|
* \retval 0 on failure; otherwise, the return value of fwrite (number of
|
|
|
|
* characters successfully written).
|
|
|
|
*/
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
static int SCLogFileWrite(const char *buffer, int buffer_len, LogFileCtx *log_ctx)
|
|
|
|
{
|
|
|
|
SCMutexLock(&log_ctx->fp_mutex);
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
#ifdef BUILD_WITH_UNIXSOCKET
|
|
|
|
if (log_ctx->is_sock) {
|
|
|
|
ret = SCLogFileWriteSocket(buffer, buffer_len, log_ctx);
|
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
|
|
|
|
/* Check for rotation. */
|
|
|
|
if (log_ctx->rotation_flag) {
|
|
|
|
log_ctx->rotation_flag = 0;
|
|
|
|
SCConfLogReopen(log_ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (log_ctx->flags & LOGFILE_ROTATE_INTERVAL) {
|
|
|
|
time_t now = time(NULL);
|
|
|
|
if (now >= log_ctx->rotate_time) {
|
|
|
|
SCConfLogReopen(log_ctx);
|
|
|
|
log_ctx->rotate_time = now + log_ctx->rotate_interval;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (log_ctx->fp) {
|
|
|
|
clearerr(log_ctx->fp);
|
|
|
|
ret = fwrite(buffer, buffer_len, 1, log_ctx->fp);
|
|
|
|
fflush(log_ctx->fp);
|
|
|
|
}
|
|
|
|
}
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
|
|
|
|
SCMutexUnlock(&log_ctx->fp_mutex);
|
|
|
|
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \brief generate filename based on pattern
|
|
|
|
* \param pattern pattern to use
|
|
|
|
* \retval char* on success
|
|
|
|
* \retval NULL on error
|
|
|
|
*/
|
|
|
|
static char *SCLogFilenameFromPattern(const char *pattern)
|
|
|
|
{
|
|
|
|
char *filename = SCMalloc(PATH_MAX);
|
|
|
|
if (filename == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int rc = SCTimeToStringPattern(time(NULL), pattern, filename, PATH_MAX);
|
|
|
|
if (rc != 0) {
|
|
|
|
SCFree(filename);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return filename;
|
|
|
|
}
|
|
|
|
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
static void SCLogFileClose(LogFileCtx *log_ctx)
|
|
|
|
{
|
|
|
|
if (log_ctx->fp)
|
|
|
|
fclose(log_ctx->fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \brief open the indicated file, logging any errors
|
|
|
|
* \param path filesystem path to open
|
|
|
|
* \param append_setting open file with O_APPEND: "yes" or "no"
|
|
|
|
* \param mode permissions to set on file
|
|
|
|
* \retval FILE* on success
|
|
|
|
* \retval NULL on error
|
|
|
|
*/
|
|
|
|
static FILE *
|
|
|
|
SCLogOpenFileFp(const char *path, const char *append_setting, uint32_t mode)
|
|
|
|
{
|
|
|
|
FILE *ret = NULL;
|
|
|
|
|
|
|
|
char *filename = SCLogFilenameFromPattern(path);
|
|
|
|
if (filename == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int rc = SCCreateDirectoryTree(filename, false);
|
|
|
|
if (rc < 0) {
|
|
|
|
SCFree(filename);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ConfValIsTrue(append_setting)) {
|
|
|
|
ret = fopen(filename, "a");
|
|
|
|
} else {
|
|
|
|
ret = fopen(filename, "w");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == NULL) {
|
|
|
|
SCLogError(SC_ERR_FOPEN, "Error opening file: \"%s\": %s",
|
|
|
|
filename, strerror(errno));
|
|
|
|
} else {
|
|
|
|
if (mode != 0) {
|
|
|
|
int r = chmod(filename, mode);
|
|
|
|
if (r < 0) {
|
|
|
|
SCLogWarning(SC_WARN_CHMOD, "Could not chmod %s to %u: %s",
|
|
|
|
filename, mode, strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SCFree(filename);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
/** \brief open the indicated file remotely over PCIe to a host
|
|
|
|
* \param path filesystem path to open
|
|
|
|
* \param append_setting open file with O_APPEND: "yes" or "no"
|
|
|
|
* \retval FILE* on success
|
|
|
|
* \retval NULL on error
|
|
|
|
*/
|
|
|
|
static PcieFile *SCLogOpenPcieFp(LogFileCtx *log_ctx, const char *path,
|
|
|
|
const char *append_setting)
|
|
|
|
{
|
|
|
|
#ifndef __tile__
|
|
|
|
SCLogError(SC_ERR_INVALID_YAML_CONF_ENTRY,
|
|
|
|
"PCIe logging only supported on Tile-Gx Architecture.");
|
|
|
|
return NULL;
|
|
|
|
#else
|
|
|
|
return TileOpenPcieFp(log_ctx, path, append_setting);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \brief open a generic output "log file", which may be a regular file or a socket
|
|
|
|
* \param conf ConfNode structure for the output section in question
|
|
|
|
* \param log_ctx Log file context allocated by caller
|
|
|
|
* \param default_filename Default name of file to open, if not specified in ConfNode
|
|
|
|
* \param rotate Register the file for rotation in HUP.
|
|
|
|
* \retval 0 on success
|
|
|
|
* \retval -1 on error
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
SCConfLogOpenGeneric(ConfNode *conf,
|
|
|
|
LogFileCtx *log_ctx,
|
|
|
|
const char *default_filename,
|
|
|
|
int rotate)
|
|
|
|
{
|
|
|
|
char log_path[PATH_MAX];
|
|
|
|
const char *log_dir;
|
|
|
|
const char *filename, *filetype;
|
|
|
|
|
|
|
|
// Arg check
|
|
|
|
if (conf == NULL || log_ctx == NULL || default_filename == NULL) {
|
|
|
|
SCLogError(SC_ERR_INVALID_ARGUMENT,
|
|
|
|
"SCConfLogOpenGeneric(conf %p, ctx %p, default %p) "
|
|
|
|
"missing an argument",
|
|
|
|
conf, log_ctx, default_filename);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (log_ctx->fp != NULL) {
|
|
|
|
SCLogError(SC_ERR_INVALID_ARGUMENT,
|
|
|
|
"SCConfLogOpenGeneric: previously initialized Log CTX "
|
|
|
|
"encountered");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Resolve the given config
|
|
|
|
filename = ConfNodeLookupChildValue(conf, "filename");
|
|
|
|
if (filename == NULL)
|
|
|
|
filename = default_filename;
|
|
|
|
|
|
|
|
log_dir = ConfigGetLogDirectory();
|
|
|
|
|
|
|
|
if (PathIsAbsolute(filename)) {
|
|
|
|
snprintf(log_path, PATH_MAX, "%s", filename);
|
|
|
|
} else {
|
|
|
|
snprintf(log_path, PATH_MAX, "%s/%s", log_dir, filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Rotate log file based on time */
|
|
|
|
const char *rotate_int = ConfNodeLookupChildValue(conf, "rotate-interval");
|
|
|
|
if (rotate_int != NULL) {
|
|
|
|
time_t now = time(NULL);
|
|
|
|
log_ctx->flags |= LOGFILE_ROTATE_INTERVAL;
|
|
|
|
|
|
|
|
/* Use a specific time */
|
|
|
|
if (strcmp(rotate_int, "minute") == 0) {
|
|
|
|
log_ctx->rotate_time = now + SCGetSecondsUntil(rotate_int, now);
|
|
|
|
log_ctx->rotate_interval = 60;
|
|
|
|
} else if (strcmp(rotate_int, "hour") == 0) {
|
|
|
|
log_ctx->rotate_time = now + SCGetSecondsUntil(rotate_int, now);
|
|
|
|
log_ctx->rotate_interval = 3600;
|
|
|
|
} else if (strcmp(rotate_int, "day") == 0) {
|
|
|
|
log_ctx->rotate_time = now + SCGetSecondsUntil(rotate_int, now);
|
|
|
|
log_ctx->rotate_interval = 86400;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Use a timer */
|
|
|
|
else {
|
|
|
|
log_ctx->rotate_interval = SCParseTimeSizeString(rotate_int);
|
|
|
|
if (log_ctx->rotate_interval == 0) {
|
|
|
|
SCLogError(SC_ERR_INVALID_NUMERIC_VALUE,
|
|
|
|
"invalid rotate-interval value");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
log_ctx->rotate_time = now + log_ctx->rotate_interval;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
filetype = ConfNodeLookupChildValue(conf, "filetype");
|
|
|
|
if (filetype == NULL)
|
|
|
|
filetype = DEFAULT_LOG_FILETYPE;
|
|
|
|
|
|
|
|
const char *filemode = ConfNodeLookupChildValue(conf, "filemode");
|
|
|
|
uint32_t mode = 0;
|
|
|
|
if (filemode != NULL &&
|
|
|
|
ByteExtractStringUint32(&mode, 8, strlen(filemode),
|
|
|
|
filemode) > 0) {
|
|
|
|
log_ctx->filemode = mode;
|
|
|
|
}
|
|
|
|
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
const char *append = ConfNodeLookupChildValue(conf, "append");
|
|
|
|
if (append == NULL)
|
|
|
|
append = DEFAULT_LOG_MODE_APPEND;
|
|
|
|
|
|
|
|
/* JSON flags */
|
|
|
|
#ifdef HAVE_LIBJANSSON
|
|
|
|
log_ctx->json_flags = JSON_PRESERVE_ORDER|JSON_COMPACT|
|
|
|
|
JSON_ENSURE_ASCII|JSON_ESCAPE_SLASH;
|
|
|
|
|
|
|
|
ConfNode *json_flags = ConfNodeLookupChild(conf, "json");
|
|
|
|
|
|
|
|
if (json_flags != 0) {
|
|
|
|
const char *preserve_order = ConfNodeLookupChildValue(json_flags,
|
|
|
|
"preserve-order");
|
|
|
|
if (preserve_order != NULL && ConfValIsFalse(preserve_order))
|
|
|
|
log_ctx->json_flags &= ~(JSON_PRESERVE_ORDER);
|
|
|
|
|
|
|
|
const char *compact = ConfNodeLookupChildValue(json_flags, "compact");
|
|
|
|
if (compact != NULL && ConfValIsFalse(compact))
|
|
|
|
log_ctx->json_flags &= ~(JSON_COMPACT);
|
|
|
|
|
|
|
|
const char *ensure_ascii = ConfNodeLookupChildValue(json_flags,
|
|
|
|
"ensure-ascii");
|
|
|
|
if (ensure_ascii != NULL && ConfValIsFalse(ensure_ascii))
|
|
|
|
log_ctx->json_flags &= ~(JSON_ENSURE_ASCII);
|
|
|
|
|
|
|
|
const char *escape_slash = ConfNodeLookupChildValue(json_flags,
|
|
|
|
"escape-slash");
|
|
|
|
if (escape_slash != NULL && ConfValIsFalse(escape_slash))
|
|
|
|
log_ctx->json_flags &= ~(JSON_ESCAPE_SLASH);
|
|
|
|
}
|
|
|
|
#endif /* HAVE_LIBJANSSON */
|
|
|
|
|
|
|
|
// Now, what have we been asked to open?
|
|
|
|
if (strcasecmp(filetype, "unix_stream") == 0) {
|
|
|
|
#ifdef BUILD_WITH_UNIXSOCKET
|
|
|
|
/* Don't bail. May be able to connect later. */
|
|
|
|
log_ctx->is_sock = 1;
|
|
|
|
log_ctx->sock_type = SOCK_STREAM;
|
|
|
|
log_ctx->fp = SCLogOpenUnixSocketFp(log_path, SOCK_STREAM, 1);
|
|
|
|
#else
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
} else if (strcasecmp(filetype, "unix_dgram") == 0) {
|
|
|
|
#ifdef BUILD_WITH_UNIXSOCKET
|
|
|
|
/* Don't bail. May be able to connect later. */
|
|
|
|
log_ctx->is_sock = 1;
|
|
|
|
log_ctx->sock_type = SOCK_DGRAM;
|
|
|
|
log_ctx->fp = SCLogOpenUnixSocketFp(log_path, SOCK_DGRAM, 1);
|
|
|
|
#else
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
} else if (strcasecmp(filetype, DEFAULT_LOG_FILETYPE) == 0 ||
|
|
|
|
strcasecmp(filetype, "file") == 0) {
|
|
|
|
log_ctx->fp = SCLogOpenFileFp(log_path, append, log_ctx->filemode);
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
if (log_ctx->fp == NULL)
|
|
|
|
return -1; // Error already logged by Open...Fp routine
|
|
|
|
log_ctx->is_regular = 1;
|
|
|
|
if (rotate) {
|
|
|
|
OutputRegisterFileRotationFlag(&log_ctx->rotation_flag);
|
|
|
|
}
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
} else if (strcasecmp(filetype, "pcie") == 0) {
|
|
|
|
log_ctx->pcie_fp = SCLogOpenPcieFp(log_ctx, log_path, append);
|
|
|
|
if (log_ctx->pcie_fp == NULL)
|
|
|
|
return -1; // Error already logged by Open...Fp routine
|
|
|
|
#ifdef HAVE_LIBHIREDIS
|
|
|
|
} else if (strcasecmp(filetype, "redis") == 0) {
|
|
|
|
ConfNode *redis_node = ConfNodeLookupChild(conf, "redis");
|
|
|
|
if (SCConfLogOpenRedis(redis_node, log_ctx) < 0) {
|
|
|
|
SCLogError(SC_ERR_REDIS, "failed to open redis output");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
log_ctx->type = LOGFILE_TYPE_REDIS;
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
SCLogError(SC_ERR_INVALID_YAML_CONF_ENTRY, "Invalid entry for "
|
|
|
|
"%s.filetype. Expected \"regular\" (default), \"unix_stream\", "
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
"\"pcie\" "
|
|
|
|
"or \"unix_dgram\"",
|
|
|
|
conf->name);
|
|
|
|
}
|
|
|
|
log_ctx->filename = SCStrdup(log_path);
|
|
|
|
if (unlikely(log_ctx->filename == NULL)) {
|
|
|
|
SCLogError(SC_ERR_MEM_ALLOC,
|
|
|
|
"Failed to allocate memory for filename");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef BUILD_WITH_UNIXSOCKET
|
|
|
|
/* If a socket and running live, do non-blocking writes. */
|
|
|
|
if (log_ctx->is_sock && !IsRunModeOffline(RunmodeGetCurrent())) {
|
|
|
|
SCLogInfo("Setting logging socket of non-blocking in live mode.");
|
|
|
|
log_ctx->send_flags |= MSG_DONTWAIT;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
SCLogInfo("%s output device (%s) initialized: %s", conf->name, filetype,
|
|
|
|
filename);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
|
|
|
|
/**
|
|
|
|
* \brief Reopen a regular log file with the side-affect of truncating it.
|
|
|
|
*
|
|
|
|
* This is useful to clear the log file and start a new one, or to
|
|
|
|
* re-open the file after its been moved by something external
|
|
|
|
* (eg. logrotate).
|
|
|
|
*/
|
|
|
|
int SCConfLogReopen(LogFileCtx *log_ctx)
|
|
|
|
{
|
|
|
|
if (!log_ctx->is_regular) {
|
|
|
|
/* Not supported and not needed on non-regular files. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (log_ctx->filename == NULL) {
|
|
|
|
SCLogWarning(SC_ERR_INVALID_ARGUMENT,
|
|
|
|
"Can't re-open LogFileCtx without a filename.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(log_ctx->fp);
|
|
|
|
|
|
|
|
/* Reopen the file. Append is forced in case the file was not
|
|
|
|
* moved as part of a rotation process. */
|
|
|
|
SCLogDebug("Reopening log file %s.", log_ctx->filename);
|
|
|
|
log_ctx->fp = SCLogOpenFileFp(log_ctx->filename, "yes", log_ctx->filemode);
|
|
|
|
if (log_ctx->fp == NULL) {
|
|
|
|
return -1; // Already logged by Open..Fp routine.
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
/** \brief LogFileNewCtx() Get a new LogFileCtx
|
|
|
|
* \retval LogFileCtx * pointer if succesful, NULL if error
|
|
|
|
* */
|
|
|
|
LogFileCtx *LogFileNewCtx(void)
|
|
|
|
{
|
|
|
|
LogFileCtx* lf_ctx;
|
|
|
|
lf_ctx = (LogFileCtx*)SCMalloc(sizeof(LogFileCtx));
|
|
|
|
|
|
|
|
if (lf_ctx == NULL)
|
|
|
|
return NULL;
|
|
|
|
memset(lf_ctx, 0, sizeof(LogFileCtx));
|
|
|
|
|
|
|
|
SCMutexInit(&lf_ctx->fp_mutex,NULL);
|
|
|
|
|
|
|
|
// Default Write and Close functions
|
|
|
|
lf_ctx->Write = SCLogFileWrite;
|
|
|
|
lf_ctx->Close = SCLogFileClose;
|
|
|
|
|
|
|
|
return lf_ctx;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \brief LogFileFreeCtx() Destroy a LogFileCtx (Close the file and free memory)
|
|
|
|
* \param motcx pointer to the OutputCtx
|
|
|
|
* \retval int 1 if succesful, 0 if error
|
|
|
|
* */
|
|
|
|
int LogFileFreeCtx(LogFileCtx *lf_ctx)
|
|
|
|
{
|
|
|
|
if (lf_ctx == NULL) {
|
|
|
|
SCReturnInt(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lf_ctx->fp != NULL) {
|
|
|
|
SCMutexLock(&lf_ctx->fp_mutex);
|
|
|
|
lf_ctx->Close(lf_ctx);
|
|
|
|
SCMutexUnlock(&lf_ctx->fp_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
SCMutexDestroy(&lf_ctx->fp_mutex);
|
|
|
|
|
|
|
|
if (lf_ctx->prefix != NULL) {
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
SCFree(lf_ctx->prefix);
|
|
|
|
lf_ctx->prefix_len = 0;
|
|
|
|
}
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
|
|
|
|
if(lf_ctx->filename != NULL)
|
|
|
|
SCFree(lf_ctx->filename);
|
|
|
|
|
|
|
|
if (lf_ctx->sensor_name)
|
|
|
|
SCFree(lf_ctx->sensor_name);
|
|
|
|
|
|
|
|
OutputUnregisterFileRotationFlag(&lf_ctx->rotation_flag);
|
|
|
|
|
Add option on Tile-Gx for logging for fast.log alerts over PCIe
When running on a TILEncore-Gx PCIe card, setting the filetype of fast.log
to pcie, will open a connection over PCIe to a host application caleld
tile-pcie-logd, that receives the alert strings and writes them to a file
on the host. The file name to open is also passed over the PCIe link.
This allows running Suricata on the TILEncore-Gx PCIe card, but have the
alerts logged to the host system's file system efficiently. The PCIe API that
is used is the Tilera Packet Queue (PQ) API which can access PCIe from User
Space, thus avoiding system calls.
Created util-logopenfile-tile.c and util-logopen-tile.h for the TILE
specific PCIe logging functionality.
Using Write() and Close() function pointers in LogFileCtx, which
default to standard write and close for files and sockets, but are
changed to PCIe write and close functions when a PCIe channel is
openned for logging.
Moved Logging contex out of tm-modules.h into util-logopenfile.h,
where it makes more sense. This required including util-logopenfile.h
into a couple of alert-*.c files, which previously were getting the
definitions from tm-modules.h.
The source and Makefile for tile-pcie-logd are added in contrib/tile-pcie-logd.
By default, the file name for fast.log specified in suricata.yaml is used as
the filename on the host. An optional argument to tile-pcie-logd, --prefix=,
can be added to prepend the supplied file path. For example, is the file
in suricata.yaml is specified as "/var/log/fast.log" and --prefix="/tmp",
then the file will be written to "/tmp/var/log/fast.log".
Check for TILERA_ROOT environment variable before building tile_pcie_logd
Building tile_pcie_logd on x86 requires the Tilera MDE for its PCIe libraries
and API header files. Configure now checs for TILERA_ROOT before enabling
builing tile_pcie_logd in contrib/tile_pcie_logd
12 years ago
|
|
|
SCFree(lf_ctx);
|
|
|
|
|
|
|
|
SCReturnInt(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
int LogFileWrite(LogFileCtx *file_ctx, MemBuffer *buffer)
|
|
|
|
{
|
|
|
|
if (file_ctx->type == LOGFILE_TYPE_SYSLOG) {
|
|
|
|
syslog(file_ctx->syslog_setup.alert_syslog_level, "%s",
|
|
|
|
(const char *)MEMBUFFER_BUFFER(buffer));
|
|
|
|
} else if (file_ctx->type == LOGFILE_TYPE_FILE ||
|
|
|
|
file_ctx->type == LOGFILE_TYPE_UNIX_DGRAM ||
|
|
|
|
file_ctx->type == LOGFILE_TYPE_UNIX_STREAM)
|
|
|
|
{
|
|
|
|
/* append \n for files only */
|
|
|
|
MemBufferWriteString(buffer, "\n");
|
|
|
|
file_ctx->Write((const char *)MEMBUFFER_BUFFER(buffer),
|
|
|
|
MEMBUFFER_OFFSET(buffer), file_ctx);
|
|
|
|
}
|
|
|
|
#ifdef HAVE_LIBHIREDIS
|
|
|
|
else if (file_ctx->type == LOGFILE_TYPE_REDIS) {
|
|
|
|
SCMutexLock(&file_ctx->fp_mutex);
|
|
|
|
LogFileWriteRedis(file_ctx, (const char *)MEMBUFFER_BUFFER(buffer),
|
|
|
|
MEMBUFFER_OFFSET(buffer));
|
|
|
|
SCMutexUnlock(&file_ctx->fp_mutex);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|