From c727190041a7c6a601ee0de7b03d4bb5b0460584 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Tue, 16 Apr 2019 14:38:59 +0200 Subject: [PATCH] Remove extra debugging in Broadcast Discovery --- .../src/services/broadcastdiscoveryservice.cc | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/services/broadcastdiscoveryservice.cc b/libretroshare/src/services/broadcastdiscoveryservice.cc index 39fbc13f0..fb63e095e 100644 --- a/libretroshare/src/services/broadcastdiscoveryservice.cc +++ b/libretroshare/src/services/broadcastdiscoveryservice.cc @@ -31,6 +31,10 @@ #include "serialiser/rsserializer.h" #include "retroshare/rsevents.h" +#ifdef RS_BROADCAST_DISCOVERY_DEBUG +# include "util/radix64.h" +#endif + /*extern*/ std::shared_ptr rsBroadcastDiscovery(nullptr); RsBroadcastDiscovery::~RsBroadcastDiscovery() { /* Beware of Rs prefix! */ } RsBroadcastDiscoveryPeerFoundEvent::~RsBroadcastDiscoveryPeerFoundEvent() {} @@ -85,7 +89,6 @@ struct BroadcastDiscoveryPack : RsSerializable } }; - BroadcastDiscoveryService::BroadcastDiscoveryService( RsPeers& pRsPeers ) : mDiscoveredDataMutex("BroadcastDiscoveryService discovered data mutex"), @@ -155,9 +158,17 @@ void BroadcastDiscoveryService::data_tick() { for (auto&& pp : mChangedData) { - std::cerr << __PRETTY_FUNCTION__ << " Got >>>" << pp.second - << "<<< from: " << UDC::IpToString(pp.first.ip()) +#ifdef RS_BROADCAST_DISCOVERY_DEBUG + { + std::string b64Data; + Radix64::encode( + reinterpret_cast(pp.second.data()), + static_cast(pp.second.size()), b64Data ); + std::cerr << __PRETTY_FUNCTION__ << " Got: " << b64Data + << " Base64 from: " << UDC::IpToString(pp.first.ip()) << ":" << pp.first.port() << std::endl; + } +#endif // def RS_BROADCAST_DISCOVERY_DEBUG RsBroadcastDiscoveryResult rbdr = createResult(pp.first, pp.second);