output-json-smtp: output RCPT TO fields

This patch uses an array to output the RCPT TO fields to the
JSON message.
pull/1667/head
Eric Leblond 12 years ago
parent 752fdba957
commit 0f3979cc81

@ -58,6 +58,7 @@ static json_t *JsonSmtpDataLogger(ThreadVars *tv, void *thread_data, const Packe
{ {
json_t *sjs = json_object(); json_t *sjs = json_object();
SMTPTransaction *tx = vtx; SMTPTransaction *tx = vtx;
SMTPString *rcptto_str;
if (sjs == NULL) { if (sjs == NULL) {
return NULL; return NULL;
} }
@ -69,6 +70,15 @@ static json_t *JsonSmtpDataLogger(ThreadVars *tv, void *thread_data, const Packe
json_object_set_new(sjs, "mail_from", json_object_set_new(sjs, "mail_from",
json_string((const char *)tx->mail_from)); json_string((const char *)tx->mail_from));
} }
if (!TAILQ_EMPTY(&tx->rcpt_to_list)) {
json_t *js_rcptto = json_array();
if (likely(js_rcptto != NULL)) {
TAILQ_FOREACH(rcptto_str, &tx->rcpt_to_list, next) {
json_array_append_new(js_rcptto, json_string((char *)rcptto_str->str));
}
json_object_set_new(sjs, "rcpt_to", js_rcptto);
}
}
return sjs; return sjs;
} }

Loading…
Cancel
Save