From 8910ddac69b3fb5a61b87eff631b6f17fed15ccb Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Tue, 12 Feb 2019 00:09:21 +0100 Subject: [PATCH] lib-smtp: smtp-server-reply - Add smtp_server_reply_add_to_event(). --- src/lib-smtp/smtp-server-private.h | 3 +++ src/lib-smtp/smtp-server-reply.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/lib-smtp/smtp-server-private.h b/src/lib-smtp/smtp-server-private.h index 96e50b16d6..e1b20b5765 100644 --- a/src/lib-smtp/smtp-server-private.h +++ b/src/lib-smtp/smtp-server-private.h @@ -225,6 +225,9 @@ smtp_server_reply_get_one_line(const struct smtp_server_reply *reply); const char * smtp_server_reply_get_message(const struct smtp_server_reply *reply); +void smtp_server_reply_add_to_event(const struct smtp_server_reply *reply, + struct event_passthrough *e); + /* * Command */ diff --git a/src/lib-smtp/smtp-server-reply.c b/src/lib-smtp/smtp-server-reply.c index 23c4949da9..c111b19998 100644 --- a/src/lib-smtp/smtp-server-reply.c +++ b/src/lib-smtp/smtp-server-reply.c @@ -495,6 +495,16 @@ bool smtp_server_reply_is_success(const struct smtp_server_reply *reply) return (reply->content->status / 100 == 2); } +void smtp_server_reply_add_to_event(const struct smtp_server_reply *reply, + struct event_passthrough *e) +{ + i_assert(reply->content != NULL); + e->add_int("status_code", reply->content->status); + e->add_str("enhanced_code", reply->content->enhanced_code); + if (!smtp_server_reply_is_success(reply)) + e->add_str("error", smtp_server_reply_get_message(reply)); +} + /* * EHLO reply */