Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed sendign of msg list from unsubscribed groups

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-01-29 20:47:09 +00:00
parent 7cfd50f860
commit be6c17fe5f
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libretroshare/src/gxs/rsgxsnetservice.cc
View File

@ -37,7 +37,7 @@
/*** /***
* #define NXS_NET_DEBUG 1 * #define NXS_NET_DEBUG 1
***/ ***/
// #define NXS_NET_DEBUG_0 1 //#define NXS_NET_DEBUG_0 1
// #define NXS_NET_DEBUG_1 1 // #define NXS_NET_DEBUG_1 1
#define GIXS_CUT_OFF 0 #define GIXS_CUT_OFF 0
@ -1805,7 +1805,7 @@ void RsGxsNetService::locked_pushMsgTransactionFromList(std::list<RsNxsItem*>& r
void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr) void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
{ {
#ifdef NXS_NET_DEBUG #ifdef NXS_NET_DEBUG_0
std::cerr << "RsGxsNetService::genReqMsgTransaction()" << std::endl; std::cerr << "RsGxsNetService::genReqMsgTransaction()" << std::endl;
#endif #endif
@ -1831,7 +1831,7 @@ void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
#endif #endif
} }
} }
#ifdef NXS_NET_DEBUG #ifdef NXS_NET_DEBUG_0
std::cerr << " found " << msgItemL.size()<< " messages in this transaction." << std::endl; std::cerr << " found " << msgItemL.size()<< " messages in this transaction." << std::endl;
#endif #endif
@ -2914,12 +2914,12 @@ bool RsGxsNetService::locked_CanReceiveUpdate(const RsNxsSyncMsg *item)
#ifdef NXS_NET_DEBUG_0 #ifdef NXS_NET_DEBUG_0
std::cerr << " local time stamp: " << std::dec<< time(NULL) - msui->msgUpdateTS << " secs ago. Update sent: " << std::cerr << " local time stamp: " << std::dec<< time(NULL) - msui->msgUpdateTS << " secs ago. Update sent: " <<
(item->updateTS == 0 || item->updateTS < msui->msgUpdateTS) << std::endl; (item->updateTS == 0 || item->updateTS < msui->msgUpdateTS) ;
#endif #endif
return (item->updateTS < msui->msgUpdateTS || item->updateTS == 0) ; return (item->updateTS < msui->msgUpdateTS || item->updateTS == 0) ;
} }
#ifdef NXS_NET_DEBUG_0 #ifdef NXS_NET_DEBUG_0
std::cerr << " no local time stamp for this grp. Client wants to receive the grp list. " << std::endl; std::cerr << " no local time stamp for this grp. " ;
#endif #endif
return true; return true;
} }
@ -2934,11 +2934,16 @@ void RsGxsNetService::handleRecvSyncMessage(RsNxsSyncMsg* item)
const RsPeerId& peer = item->PeerId(); const RsPeerId& peer = item->PeerId();
#ifdef NXS_NET_DEBUG_0 #ifdef NXS_NET_DEBUG_0
std::cerr << "handleRecvSyncMsg(): from " << peer << ", grpId=" << item->grpId << ", TS = " << time(NULL) - item->updateTS << " secs ago" << std::endl; std::cerr << "handleRecvSyncMsg(): from " << peer << ", grpId=" << item->grpId << ", TS = " << time(NULL) - item->updateTS << " secs ago." ;
#endif #endif
if(!locked_CanReceiveUpdate(item)) if(!locked_CanReceiveUpdate(item))
{
#ifdef NXS_NET_DEBUG_0
std::cerr << std::endl;
#endif
return; return;
}
GxsMsgMetaResult metaResult; GxsMsgMetaResult metaResult;
GxsMsgReq req; GxsMsgReq req;
@ -2948,8 +2953,21 @@ void RsGxsNetService::handleRecvSyncMessage(RsNxsSyncMsg* item)
mDataStore->retrieveGxsGrpMetaData(grpMetas); mDataStore->retrieveGxsGrpMetaData(grpMetas);
RsGxsGrpMetaData* grpMeta = grpMetas[item->grpId]; RsGxsGrpMetaData* grpMeta = grpMetas[item->grpId];
if(grpMeta == NULL) if(grpMeta == NULL)
return; {
#ifdef NXS_NET_DEBUG_0
std::cerr << " Grp is unknown." << std::endl;
#endif
return;
}
if(!(grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED ))
{
#ifdef NXS_NET_DEBUG_0
std::cerr << " Grp is not subscribed." << std::endl;
#endif
delete(grpMeta);
return ;
}
req[item->grpId] = std::vector<RsGxsMessageId>(); req[item->grpId] = std::vector<RsGxsMessageId>();
mDataStore->retrieveGxsMsgMetaData(req, metaResult); mDataStore->retrieveGxsMsgMetaData(req, metaResult);
@ -2957,9 +2975,15 @@ void RsGxsNetService::handleRecvSyncMessage(RsNxsSyncMsg* item)
if(req.empty()) if(req.empty())
{ {
delete(grpMeta); #ifdef NXS_NET_DEBUG_0
std::cerr << " No msg meta data.." << std::endl;
#endif
delete(grpMeta);
return; return;
} }
#ifdef NXS_NET_DEBUG_0
std::cerr << " Sending MSG meta data!" << std::endl;
#endif
std::list<RsNxsItem*> itemL; std::list<RsNxsItem*> itemL;