From 6626e371a34d558f2a8aeb3f6488ceb7aca52d75 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Wed, 7 May 2025 00:06:52 +0200 Subject: [PATCH] fix: bad merge --- src/ripple/overlay/impl/Handshake.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/ripple/overlay/impl/Handshake.cpp b/src/ripple/overlay/impl/Handshake.cpp index 5aa6ade58..8d161be5f 100644 --- a/src/ripple/overlay/impl/Handshake.cpp +++ b/src/ripple/overlay/impl/Handshake.cpp @@ -241,18 +241,12 @@ verifyHandshake( if (auto const iter = headers.find("Network-ID"); iter != headers.end()) { - uint32_t peer_nid = 0; - if (auto const iter = headers.find("Network-ID"); iter != headers.end()) - { - if (!beast::lexicalCastChecked( - peer_nid, std::string(iter->value()))) - throw std::runtime_error("Invalid peer network identifier"); - } + std::uint32_t nid; - if (!beast::lexicalCastChecked(peer_nid, std::string(iter->value()))) + if (!beast::lexicalCastChecked(nid, iter->value())) throw std::runtime_error("Invalid peer network identifier"); - if (networkID && peer_nid != *networkID) + if (networkID && nid != *networkID) throw std::runtime_error("Peer is on a different network"); }