From 2c857cd82a4f0676cda764a824408f2569e80f57 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sat, 26 Oct 2024 18:56:04 -0700 Subject: [PATCH] [ntcore] Use NT3 client identity in front of unique id (#7293) This way all NT3 clients are not identified as just NT3. --- ntcore/src/main/native/cpp/net/ServerImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntcore/src/main/native/cpp/net/ServerImpl.cpp b/ntcore/src/main/native/cpp/net/ServerImpl.cpp index 016929bbae..a33c58019b 100644 --- a/ntcore/src/main/native/cpp/net/ServerImpl.cpp +++ b/ntcore/src/main/native/cpp/net/ServerImpl.cpp @@ -873,8 +873,8 @@ void ServerImpl::ClientData3::ClientHello(std::string_view self_id, fmt::format("unsupported protocol version {:04x}", proto_rev)); return; } - // create a unique name (just ignore provided client id) - m_name = fmt::format("NT3@{}", m_connInfo); + // create a unique name including client id + m_name = fmt::format("{}-NT3@{}", self_id, m_connInfo); m_connected(m_name, 0x0300); m_connected = nullptr; // no longer required