From 245fb047d7d6d992ab12dd1c02c9932de323f0ec Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 13 Jul 2026 07:41:45 +0200 Subject: [PATCH] u --- jtlsrv-cpp/src/main.cpp | 11 ++++++----- jtlsrv-cpp/src/tls_server.cpp | 3 +-- jtlsrv-cpp/src/tls_server.hpp | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jtlsrv-cpp/src/main.cpp b/jtlsrv-cpp/src/main.cpp index c2e9fb0..0a539d1 100644 --- a/jtlsrv-cpp/src/main.cpp +++ b/jtlsrv-cpp/src/main.cpp @@ -83,18 +83,19 @@ static void handle_request(tls_session* sess) { size_t resp_size = resp_body.size(); // Console log with response size and truncated body + const char* ip = sess->peer_ip.c_str(); if (resp_size > 0) { std::string preview = resp_body.substr(0, std::min(resp_size, (size_t)200)); - logc::info("127.0.0.1 %s %s %d %dms [%zu bytes] %s", - req.method.c_str(), url.c_str(), resp.status_code, + logc::info("%s %s %s %d %dms [%zu bytes] %s", + ip, req.method.c_str(), url.c_str(), resp.status_code, (int)elapsed, resp_size, preview.c_str()); } else { - logc::info("127.0.0.1 %s %s %d %dms", - req.method.c_str(), url.c_str(), resp.status_code, (int)elapsed); + logc::info("%s %s %s %d %dms", + ip, req.method.c_str(), url.c_str(), resp.status_code, (int)elapsed); } // Request log - request_log.log("127.0.0.1", req.method, url, resp.status_code, (int)elapsed, resp_body); + request_log.log(ip, req.method, url, resp.status_code, (int)elapsed, resp_body); } // --------------------------------------------------------------------------- diff --git a/jtlsrv-cpp/src/tls_server.cpp b/jtlsrv-cpp/src/tls_server.cpp index 22c9c2a..c6be699 100644 --- a/jtlsrv-cpp/src/tls_server.cpp +++ b/jtlsrv-cpp/src/tls_server.cpp @@ -197,7 +197,6 @@ static void on_read(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) { int ret = SSL_do_handshake(sess->ssl); if (ret == 1) { sess->handshake_done = true; - logc::info("TLS handshake complete"); flush_encrypted(sess); } else { int err = SSL_get_error(sess->ssl, ret); @@ -276,7 +275,7 @@ static void on_connection(uv_stream_t* server, int status) { uv_ip4_name(reinterpret_cast(&saddr), addr_buf, sizeof(addr_buf)); else uv_ip6_name(reinterpret_cast(&saddr), addr_buf, sizeof(addr_buf)); - logc::info("TLS connection from %s", addr_buf); + sess->peer_ip = addr_buf; // Read encrypted data uv_read_start(reinterpret_cast(&sess->tcp_handle), on_alloc, on_read); diff --git a/jtlsrv-cpp/src/tls_server.hpp b/jtlsrv-cpp/src/tls_server.hpp index d836909..02f40a0 100644 --- a/jtlsrv-cpp/src/tls_server.hpp +++ b/jtlsrv-cpp/src/tls_server.hpp @@ -35,6 +35,7 @@ struct tls_session { bool handshake_done = false; uint32_t body_length = 0; + std::string peer_ip; }; // ---------------------------------------------------------------------------