From 45dd027101fb946ff0b8074f155cc06ce9153be3 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 25 Jul 2016 09:31:38 +0200 Subject: [PATCH] Include IP address and port in the "New connection" log message fixes #12215 --- lib/remote/apilistener.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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; -- 2.40.0