From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Thu, 28 Feb 2019 09:03:17 +0000 (+0100)
Subject: lib: connection - Add generic event fields for local and remote addresses.
X-Git-Tag: 2.3.9~713
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a28d402cdbd36269fceb98fd2ca51b2731f1cac;p=thirdparty%2Fdovecot%2Fcore.git

lib: connection - Add generic event fields for local and remote addresses.
---

diff --git a/src/lib/connection.c b/src/lib/connection.c
index 8947b817a6..21cd9a0efe 100644
--- a/src/lib/connection.c
+++ b/src/lib/connection.c
@@ -351,6 +351,23 @@ void connection_update_event(struct connection *conn)
 	}
 	str_append(prefix, ": ");
 	event_set_append_log_prefix(conn->event, str_c(prefix));
+
+	if (conn->local_ip.family > 0) {
+		event_add_str(conn->event, "local_ip",
+			      net_ip2addr(&conn->local_ip));
+	}
+
+	if (conn->remote_ip.family > 0) {
+		event_add_str(conn->event, "remote_ip",
+			      net_ip2addr(&conn->remote_ip));
+	}
+	if (conn->remote_port > 0)
+		event_add_int(conn->event, "remote_port", conn->remote_port);
+
+	if (conn->remote_pid != (pid_t)-1)
+		event_add_int(conn->event, "remote_pid", conn->remote_pid);
+	if (conn->remote_uid != (uid_t)-1)
+		event_add_int(conn->event, "remote_uid", conn->remote_uid);
 }
 
 static void