From f54c4cdf71749aec629f53a7a8cfd0b7bf758771 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Sat, 23 Jul 2016 18:16:13 -0700 Subject: [PATCH] Base route matching on first address segment only. --- include/bitcoin/server/messages/route.hpp | 4 ++-- src/messages/route.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/bitcoin/server/messages/route.hpp b/include/bitcoin/server/messages/route.hpp index 49a6db4c..99c79391 100644 --- a/include/bitcoin/server/messages/route.hpp +++ b/include/bitcoin/server/messages/route.hpp @@ -68,9 +68,9 @@ namespace std { size_t seed = 0; boost::hash_combine(seed, value.secure); - boost::hash_combine(seed, value.delimited); + ////boost::hash_combine(seed, value.delimited); boost::hash_combine(seed, value.address1); - boost::hash_combine(seed, value.address2); + ////boost::hash_combine(seed, value.address2); return seed; } }; diff --git a/src/messages/route.cpp b/src/messages/route.cpp index 9416593c..22c1602c 100644 --- a/src/messages/route.cpp +++ b/src/messages/route.cpp @@ -33,13 +33,14 @@ route::route() std::string route::display() const { - return "[" + encode_base16(address1) + ":" + encode_base16(address2) + "]"; + return "[" + encode_base16(address1) + + /*":" + encode_base16(address2) +*/ "]"; } bool route::operator==(const route& other) const { - return secure == other.secure && delimited == other.delimited && - address1 == other.address1 && address2 == other.address2; + return secure == other.secure && /*delimited == other.delimited &&*/ + address1 == other.address1 /*&& address2 == other.address2*/; } } // namespace server