|
|
|
@ -96,6 +96,10 @@ static int JsonSmtpLogger(ThreadVars *tv, void *thread_data, const Packet *p, Fl
|
|
|
|
/* reset */
|
|
|
|
/* reset */
|
|
|
|
MemBufferReset(jhl->buffer);
|
|
|
|
MemBufferReset(jhl->buffer);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (jhl->emaillog_ctx->include_metadata) {
|
|
|
|
|
|
|
|
JsonAddMetadata(p, f, js);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
sjs = JsonSmtpDataLogger(f, state, tx, tx_id);
|
|
|
|
sjs = JsonSmtpDataLogger(f, state, tx, tx_id);
|
|
|
|
if (sjs) {
|
|
|
|
if (sjs) {
|
|
|
|
json_object_set_new(js, "smtp", sjs);
|
|
|
|
json_object_set_new(js, "smtp", sjs);
|
|
|
|
@ -207,6 +211,7 @@ static OutputInitResult OutputSmtpLogInitSub(ConfNode *conf, OutputCtx *parent_c
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
email_ctx->file_ctx = ojc->file_ctx;
|
|
|
|
email_ctx->file_ctx = ojc->file_ctx;
|
|
|
|
|
|
|
|
email_ctx->include_metadata = ojc->include_metadata;
|
|
|
|
|
|
|
|
|
|
|
|
OutputEmailInitConf(conf, email_ctx);
|
|
|
|
OutputEmailInitConf(conf, email_ctx);
|
|
|
|
|
|
|
|
|
|
|
|
|