Skip to content

Commit

Permalink
output: move output files to output/
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasonish
jasonish committed Dec 4, 2023
1 parent 3aa8bd1 commit 5718a92
Show file tree
Hide file tree
Showing 120 changed files with 243 additions and 243 deletions.
2 changes: 1 addition & 1 deletion doc/userguide/devguide/extending/app-layer/transactions.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ likely happen once per transaction, by the time of its completion. In other case

In ``OutputTxLog``, the engine will compare current state with the value defined for the logging to happen, per flow
direction (``logger->tc_log_progress``, ``logger->ts_log_progress``). If state is less than that value, the engine skips to
the next logger. Code snippet from: suricata/src/output-tx.c:
the next logger. Code snippet from: suricata/src/output/output-tx.c:

.. code-block:: c
Expand Down
98 changes: 49 additions & 49 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,37 +388,37 @@ noinst_HEADERS = \
log-tcp-data.h \
app-layer/tls/log-tlslog.h \
app-layer/tls/log-tlsstore.h \
output-eve-stream.h \
output-eve-null.h \
output-filedata.h \
output-file.h \
output-filestore.h \
output-flow.h \
output.h \
output-json-alert.h \
output-json-anomaly.h \
output/eve/output-eve-stream.h \
output/eve/output-eve-null.h \
output/output-filedata.h \
output/output-file.h \
output/output-filestore.h \
output/output-flow.h \
output/output.h \
output/eve/output-json-alert.h \
output/eve/output-json-anomaly.h \
app-layer/bittorrent-dht/logger.h \
app-layer/dcerpc/logger.h \
app-layer/dhcp/logger.h \
app-layer/dnp3/logger.h \
app-layer/dnp3/logger-objects.h \
app-layer/dns/logger.h \
output-json-drop.h \
output-json-email-common.h \
output-json-file.h \
output-json-flow.h \
output-json-frame.h \
output/eve/output-json-drop.h \
output/eve/output-json-email-common.h \
output/eve/output-json-file.h \
output/eve/output-json-flow.h \
output/eve/output-json-frame.h \
app-layer/ftp/logger.h \
output-json.h \
output/eve/output-json.h \
app-layer/http2/logger.h \
app-layer/http/logger.h \
app-layer/ike/logger.h \
app-layer/krb5/logger.h \
output-json-metadata.h \
output/eve/output-json-metadata.h \
app-layer/modbus/logger.h \
app-layer/quic/logger.h \
app-layer/mqtt/logger.h \
output-json-netflow.h \
output/eve/output-json-netflow.h \
app-layer/nfs/logger.h \
app-layer/pgsql/logger.h \
app-layer/rdp/logger.h \
Expand All @@ -428,16 +428,16 @@ noinst_HEADERS = \
app-layer/smtp/logger.h \
app-layer/snmp/logger.h \
app-layer/ssh/logger.h \
output-json-stats.h \
output/eve/output-json-stats.h \
app-layer/template/logger.h \
app-layer/tftp/logger.h \
app-layer/tls/logger.h \
output-eve-syslog.h \
output-lua.h \
output-packet.h \
output-stats.h \
output-streaming.h \
output-tx.h \
output/eve/output-eve-syslog.h \
output/output-lua.h \
output/output-packet.h \
output/output-stats.h \
output/output-streaming.h \
output/output-tx.h \
packet.h \
packet-queue.h \
pkt-var.h \
Expand Down Expand Up @@ -1000,37 +1000,37 @@ libsuricata_c_a_SOURCES = \
log-tcp-data.c \
app-layer/tls/log-tlslog.c \
app-layer/tls/log-tlsstore.c \
output.c \
output-eve-stream.c \
output-file.c \
output-filedata.c \
output-filestore.c \
output-flow.c \
output-json-alert.c \
output-json-anomaly.c \
output/output.c \
output/eve/output-eve-stream.c \
output/output-file.c \
output/output-filedata.c \
output/output-filestore.c \
output/output-flow.c \
output/eve/output-json-alert.c \
output/eve/output-json-anomaly.c \
app-layer/bittorrent-dht/logger.c \
output-json.c \
output-json-common.c \
output/eve/output-json.c \
output/eve/output-json-common.c \
app-layer/dcerpc/logger.c \
app-layer/dhcp/logger.c \
app-layer/dnp3/logger.c \
app-layer/dnp3/logger-objects.c \
app-layer/dns/logger.c \
output-json-drop.c \
output-json-email-common.c \
output-json-file.c \
output-json-flow.c \
output-json-frame.c \
output/eve/output-json-drop.c \
output/eve/output-json-email-common.c \
output/eve/output-json-file.c \
output/eve/output-json-flow.c \
output/eve/output-json-frame.c \
app-layer/ftp/logger.c \
app-layer/http2/logger.c \
app-layer/http/logger.c \
app-layer/ike/logger.c \
app-layer/krb5/logger.c \
output-json-metadata.c \
output/eve/output-json-metadata.c \
app-layer/modbus/logger.c \
app-layer/quic/logger.c \
app-layer/mqtt/logger.c \
output-json-netflow.c \
output/eve/output-json-netflow.c \
app-layer/nfs/logger.c \
app-layer/pgsql/logger.c \
app-layer/rdp/logger.c \
Expand All @@ -1040,17 +1040,17 @@ libsuricata_c_a_SOURCES = \
app-layer/smtp/logger.c \
app-layer/snmp/logger.c \
app-layer/ssh/logger.c \
output-json-stats.c \
output/eve/output-json-stats.c \
app-layer/template/logger.c \
app-layer/tftp/logger.c \
app-layer/tls/logger.c \
output-eve-syslog.c \
output-eve-null.c \
output-lua.c \
output-packet.c \
output-stats.c \
output-streaming.c \
output-tx.c \
output/eve/output-eve-syslog.c \
output/eve/output-eve-null.c \
output/output-lua.c \
output/output-packet.c \
output/output-stats.c \
output/output-streaming.c \
output/output-tx.c \
packet.c \
packet-queue.c \
pkt-var.c \
Expand Down
2 changes: 1 addition & 1 deletion src/alert-debuglog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "util-validate.h"
#include "util-buffer.h"

#include "output.h"
#include "output/output.h"
#include "alert-debuglog.h"
#include "util-privs.h"
#include "flow-var.h"
Expand Down
2 changes: 1 addition & 1 deletion src/alert-fastlog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "detect-reference.h"
#include "util-classification-config.h"

#include "output.h"
#include "output/output.h"
#include "alert-fastlog.h"

#include "util-privs.h"
Expand Down
2 changes: 1 addition & 1 deletion src/alert-syslog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "detect-engine-mpm.h"
#include "detect-reference.h"

#include "output.h"
#include "output/output.h"
#include "alert-syslog.h"

#include "util-classification-config.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/bittorrent-dht/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "util-debug.h"
#include "util-byte.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"

#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/dcerpc/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include "suricata-common.h"
#include "util-buffer.h"
#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"
#include "app-layer-parser.h"
#include "app-layer/dcerpc/logger.h"
#include "rust.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/dhcp/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "util-debug.h"
#include "util-byte.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"

#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
2 changes: 1 addition & 1 deletion src/app-layer/dnp3/logger-objects.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "app-layer/dnp3/parser.h"
#include "app-layer/dnp3/parser-objects.h"
#include "app-layer/dnp3/logger-objects.h"
#include "output-json.h"
#include "output/eve/output-json.h"

// clang-format off
void OutputJsonDNP3SetItem(JsonBuilder *js, DNP3Object *object,
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/dnp3/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@

#include "app-layer/dnp3/detect.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"
#include "app-layer/dnp3/logger.h"
#include "app-layer/dnp3/logger-objects.h"

Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/dns/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
#include "util-debug.h"
#include "util-mem.h"
#include "app-layer-parser.h"
#include "output.h"
#include "output/output.h"
#include "app-layer.h"
#include "util-privs.h"
#include "util-buffer.h"
#include "util-proto-name.h"
#include "util-logopenfile.h"
#include "util-time.h"

#include "output-json.h"
#include "output/eve/output-json.h"
#include "app-layer/dns/logger.h"
#include "rust.h"

Expand Down
2 changes: 1 addition & 1 deletion src/app-layer/dns/lua.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include "util-debug.h"

#include "output.h"
#include "output/output.h"
#include "app-layer.h"
#include "app-layer-parser.h"
#include "util-privs.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/ftp/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
#include "util-debug.h"
#include "util-mem.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"

#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
2 changes: 1 addition & 1 deletion src/app-layer/http/log-httplog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#include "util-debug.h"

#include "output.h"
#include "output/output.h"
#include "app-layer/http/log-httplog.h"
#include "app-layer/http/parser.h"
#include "app-layer.h"
Expand Down
6 changes: 3 additions & 3 deletions src/app-layer/http/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

#include "util-debug.h"

#include "output.h"
#include "output/output.h"
#include "app-layer/http/parser.h"
#include "app-layer/http/parser-file.h"
#include "app-layer/http/parser-xff.h"
Expand All @@ -48,8 +48,8 @@
#include "util-proto-name.h"
#include "util-logopenfile.h"
#include "util-time.h"
#include "output-json.h"
#include "output-json-alert.h"
#include "output/eve/output-json.h"
#include "output/eve/output-json-alert.h"
#include "app-layer/http/logger.h"
#include "util-byte.h"

Expand Down
2 changes: 1 addition & 1 deletion src/app-layer/http/lua.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include "util-debug.h"

#include "output.h"
#include "output/output.h"
#include "app-layer/http/parser.h"
#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/http2/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@

#include "util-debug.h"
#include "app-layer-parser.h"
#include "output.h"
#include "output/output.h"
#include "app-layer/http2/parser.h"
#include "app-layer.h"
#include "util-privs.h"
#include "util-buffer.h"

#include "util-logopenfile.h"

#include "output-json.h"
#include "output/eve/output-json.h"
#include "app-layer/http2/logger.h"
#include "rust.h"

Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/ike/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#include "util-debug.h"
#include "util-byte.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"

#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/krb5/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
#include "util-debug.h"
#include "util-byte.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"

#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/modbus/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include "util-buffer.h"
#include "util-debug.h"
#include "util-byte.h"
#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"
#include "app-layer.h"
#include "app-layer-parser.h"
#include "app-layer/modbus/logger.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/mqtt/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "util-debug.h"
#include "util-byte.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"

#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app-layer/nfs/logger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
#include "util-debug.h"
#include "util-byte.h"

#include "output.h"
#include "output-json.h"
#include "output/output.h"
#include "output/eve/output-json.h"

#include "app-layer.h"
#include "app-layer-parser.h"
Expand Down
Loading

0 comments on commit 5718a92

Please sign in to comment.