From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 25 Jul 2016 07:31:38 +0000 (+0200)
Subject: Include IP address and port in the "New connection" log message
X-Git-Tag: v2.5.0~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45dd027101fb946ff0b8074f155cc06ce9153be3;p=icinga2

Include IP address and port in the "New connection" log message

fixes #12215
---

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index de2a4f7a9..cb8669793 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -330,6 +330,15 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
 	Endpoint::Ptr endpoint;
 	bool verify_ok = false;
 
+	String conninfo;
+
+	if (role == RoleClient)
+		conninfo = "to";
+	else
+		conninfo = "from";
+
+	conninfo += " " + client->GetPeerAddress();
+
 	if (cert) {
 		try {
 			identity = GetCertificateCN(cert);
@@ -360,7 +369,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
 		{
 			Log log(LogInformation, "ApiListener");
 
-			log << "New client connection for identity '" << identity << "'";
+			log << "New client connection for identity '" << identity << "' " << conninfo;
 
 			if (!verify_ok)
 				log << " (certificate validation failed: " << tlsStream->GetVerifyError() << ")";
@@ -369,7 +378,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
 		}
 	} else {
 		Log(LogInformation, "ApiListener")
-		    << "New client connection (no client certificate)";
+		    << "New client connection " << conninfo << " (no client certificate)";
 	}
 
 	ClientType ctype;