From 36e063160cd584d9b197984e4e75f9b7d50ce1d2 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 20 Feb 2021 20:29:30 +0100 Subject: [PATCH] removed some debug messages --- libretroshare/src/gxs/rsgxsnetutils.cc | 8 ++++++-- libretroshare/src/pqi/p3linkmgr.cc | 2 ++ libretroshare/src/services/p3postbase.cc | 4 +--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libretroshare/src/gxs/rsgxsnetutils.cc b/libretroshare/src/gxs/rsgxsnetutils.cc index 41402c9eb..b74abcb0f 100644 --- a/libretroshare/src/gxs/rsgxsnetutils.cc +++ b/libretroshare/src/gxs/rsgxsnetutils.cc @@ -287,16 +287,20 @@ bool MsgCircleIdsRequestVetting::cleared() return false ; } + uint32_t filtered_out_msgs=0; + for(uint32_t i=0;iisRecipient(mCircleId,mGrpId,mMsgs[i].mAuthorId)) { - std::cerr << "(WW) MsgCircleIdsRequestVetting::cleared() filtering out message " << mMsgs[i].mMsgId << " because it's signed by author " << mMsgs[i].mAuthorId << " which is not in circle " << mCircleId << std::endl; - + ++filtered_out_msgs; mMsgs[i] = mMsgs[mMsgs.size()-1] ; mMsgs.pop_back(); } else ++i ; + + if(filtered_out_msgs>0) + std::cerr << "(WW) " << filtered_out_msgs << " messages not sent because they are signed by author(s) not member of that circle " << mCircleId << std::endl; RsPgpId pgpId = mPgpUtils->getPGPId(mPeerId); bool can_send_res = mCircles->canSend(mCircleId, pgpId,mShouldEncrypt); diff --git a/libretroshare/src/pqi/p3linkmgr.cc b/libretroshare/src/pqi/p3linkmgr.cc index 5ce4008aa..97a889b79 100644 --- a/libretroshare/src/pqi/p3linkmgr.cc +++ b/libretroshare/src/pqi/p3linkmgr.cc @@ -799,7 +799,9 @@ bool p3LinkMgrIMPL::connectResult(const RsPeerId &id, bool success, bool isIncom bool updatePeerAddr = false; bool updateLastContact = false; +#ifdef LINKMGR_DEBUG std::cerr << "Connection result with peer " << id << ": " << success << ". Is incoming: " << isIncomingConnection << ", remote addr: " << sockaddr_storage_tostring(remote_peer_address) << std::endl; +#endif { RsStackMutex stack(mLinkMtx); /****** STACK LOCK MUTEX *******/ diff --git a/libretroshare/src/services/p3postbase.cc b/libretroshare/src/services/p3postbase.cc index dd4d9f684..6792255a4 100644 --- a/libretroshare/src/services/p3postbase.cc +++ b/libretroshare/src/services/p3postbase.cc @@ -38,7 +38,6 @@ /**** * #define POSTBASE_DEBUG 1 ****/ -#define POSTBASE_DEBUG 1 #define POSTBASE_BACKGROUND_PROCESSING 0x0002 #define PROCESSING_START_PERIOD 30 @@ -630,8 +629,7 @@ void p3PostBase::background_loadMsgs(const uint32_t &token, bool unprocessed) else { /* unknown! */ - std::cerr << "p3PostBase::background_processNewMessages() ERROR Strange NEW Message:"; - std::cerr << std::endl; + std::cerr << "p3PostBase::background_processNewMessages() ERROR Strange NEW Message:" << std::endl; std::cerr << "\t" << (*vit)->meta; std::cerr << std::endl;