From: Francis Dupont <fdupont@isc.org>
Date: Thu, 31 Mar 2022 16:48:28 +0000 (+0200)
Subject: [#687] Added the remote address in the json
X-Git-Tag: Kea-2.1.5~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d61acebd6c1dcbfc8014e574deea46a6d2a425e;p=thirdparty%2Fkea.git

[#687] Added the remote address in the json
---

diff --git a/src/lib/http/connection.cc b/src/lib/http/connection.cc
index b1e57bddbe..ba0b8f7a20 100644
--- a/src/lib/http/connection.cc
+++ b/src/lib/http/connection.cc
@@ -401,11 +401,13 @@ HttpConnection::socketReadCallback(HttpConnection::TransactionPtr transaction,
     // Receiving is in progress, so push back the timeout.
     setupRequestTimer(transaction);
 
+    const std::string& remote = getRemoteEndpointAddressAsText();
+
     if (length != 0) {
         LOG_DEBUG(http_logger, isc::log::DBGLVL_TRACE_DETAIL_DATA,
                   HTTP_DATA_RECEIVED)
             .arg(length)
-            .arg(getRemoteEndpointAddressAsText());
+            .arg(remote);
 
         transaction->getParser()->postBuffer(static_cast<void*>(transaction->getInputBufData()),
                                              length);
@@ -420,6 +422,7 @@ HttpConnection::socketReadCallback(HttpConnection::TransactionPtr transaction,
     } else {
         try {
             // The whole message has been received, so let's finalize it.
+            transaction->getRequest()->setRemote(remote);
             transaction->getRequest()->finalize();
 
             LOG_DEBUG(http_logger, isc::log::DBGLVL_TRACE_BASIC,
@@ -428,18 +431,18 @@ HttpConnection::socketReadCallback(HttpConnection::TransactionPtr transaction,
 
             LOG_DEBUG(http_logger, isc::log::DBGLVL_TRACE_BASIC_DATA,
                       HTTP_CLIENT_REQUEST_RECEIVED_DETAILS)
-                .arg(getRemoteEndpointAddressAsText())
+                .arg(remote)
                 .arg(transaction->getParser()->getBufferAsString(MAX_LOGGED_MESSAGE_SIZE));
 
         } catch (const std::exception& ex) {
             LOG_DEBUG(http_logger, isc::log::DBGLVL_TRACE_BASIC,
                       HTTP_BAD_CLIENT_REQUEST_RECEIVED)
-                .arg(getRemoteEndpointAddressAsText())
+                .arg(remote)
                 .arg(ex.what());
 
             LOG_DEBUG(http_logger, isc::log::DBGLVL_TRACE_BASIC_DATA,
                       HTTP_BAD_CLIENT_REQUEST_RECEIVED_DETAILS)
-                .arg(getRemoteEndpointAddressAsText())
+                .arg(remote)
                 .arg(transaction->getParser()->getBufferAsString(MAX_LOGGED_MESSAGE_SIZE));
         }
 
@@ -452,7 +455,7 @@ HttpConnection::socketReadCallback(HttpConnection::TransactionPtr transaction,
         LOG_DEBUG(http_logger, isc::log::DBGLVL_TRACE_BASIC,
                   HTTP_SERVER_RESPONSE_SEND)
             .arg(response->toBriefString())
-            .arg(getRemoteEndpointAddressAsText());
+            .arg(remote);
 
         LOG_DEBUG(http_logger, isc::log::DBGLVL_TRACE_BASIC_DATA,
                   HTTP_SERVER_RESPONSE_SEND_DETAILS)