Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-23 05:44:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bug causing GXS sync to fail and crash

Browse source
This commit is contained in:
csoler 2020-12-30 20:16:25 +01:00
parent a40c54950c
commit 1fe3664007
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libretroshare/src/gxs/rsgxsdataaccess.cc
View file

@ -339,7 +339,7 @@ bool RsGxsDataAccess::cancelRequest(const uint32_t& token)
{ {
RsStackMutex stack(mDataMutex); /****** LOCKED *****/ RsStackMutex stack(mDataMutex); /****** LOCKED *****/
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if (!req) if (!req)
{ {
return false; return false;
@ -377,7 +377,7 @@ bool RsGxsDataAccess::getGroupSummary(const uint32_t& token, std::list<std::shar
{ {
RS_STACK_MUTEX(mDataMutex); RS_STACK_MUTEX(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -406,7 +406,7 @@ bool RsGxsDataAccess::getGroupData(const uint32_t& token, std::list<RsNxsGrp*>&
{ {
RS_STACK_MUTEX(mDataMutex); RS_STACK_MUTEX(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -442,7 +442,7 @@ bool RsGxsDataAccess::getMsgData(const uint32_t& token, NxsMsgDataResult& msgDat
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -468,12 +468,12 @@ bool RsGxsDataAccess::getMsgData(const uint32_t& token, NxsMsgDataResult& msgDat
return true; return true;
} }
bool RsGxsDataAccess::getMsgRelatedData(const uint32_t &token, NxsMsgRelatedDataResult &msgData) bool RsGxsDataAccess::getMsgRelatedData(const uint32_t& token, NxsMsgRelatedDataResult& msgData)
{ {
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -506,7 +506,7 @@ bool RsGxsDataAccess::getMsgSummary(const uint32_t& token, GxsMsgMetaResult& msg
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -533,7 +533,7 @@ bool RsGxsDataAccess::getMsgRelatedSummary(const uint32_t &token, MsgRelatedMeta
{ {
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -564,7 +564,7 @@ bool RsGxsDataAccess::getMsgRelatedList(const uint32_t &token, MsgRelatedIdResul
{ {
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -594,7 +594,7 @@ bool RsGxsDataAccess::getMsgIdList(const uint32_t& token, GxsMsgIdResult& msgIds
{ {
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -621,7 +621,7 @@ bool RsGxsDataAccess::getGroupList(const uint32_t& token, std::list<RsGxsGroupId
{ {
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -648,7 +648,7 @@ bool RsGxsDataAccess::getGroupStatistic(const uint32_t &token, GxsGroupStatistic
{ {
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -672,7 +672,7 @@ bool RsGxsDataAccess::getServiceStatistic(const uint32_t &token, GxsServiceStati
{ {
RsStackMutex stack(mDataMutex); RsStackMutex stack(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req == nullptr) if(req == nullptr)
{ {
@ -691,7 +691,7 @@ bool RsGxsDataAccess::getServiceStatistic(const uint32_t &token, GxsServiceStati
locked_clearRequest(token); locked_clearRequest(token);
return true; return true;
} }
GxsRequest* RsGxsDataAccess::locked_retrieveCompetedRequest(const uint32_t& token) GxsRequest* RsGxsDataAccess::locked_retrieveCompletedRequest(const uint32_t& token)
{ {
auto it = mCompletedRequests.find(token) ; auto it = mCompletedRequests.find(token) ;
@ -1439,7 +1439,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
else if(req->Options.mReqType == GXS_REQUEST_TYPE_MSG_RELATED_DATA) else if(req->Options.mReqType == GXS_REQUEST_TYPE_MSG_RELATED_DATA)
{ {
GxsMsgResult msgResult; GxsMsgResult msgResult;
mDataStore->retrieveNxsMsgs(filteredOutMsgIds, msgResult, false, true); mDataStore->retrieveNxsMsgs(filteredOutMsgIds, msgResult, true, true);
req->mMsgDataResult[grpMsgIdPair] = msgResult[grpId]; req->mMsgDataResult[grpMsgIdPair] = msgResult[grpId];
} }
} }
@ -1637,7 +1637,7 @@ bool RsGxsDataAccess::checkRequestStatus( uint32_t token, GxsRequestStatus& stat
{ {
RS_STACK_MUTEX(mDataMutex); RS_STACK_MUTEX(mDataMutex);
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
#ifdef DATA_DEBUG #ifdef DATA_DEBUG
RsDbg() << "CheckRequestStatus: token=" << token ; RsDbg() << "CheckRequestStatus: token=" << token ;
@ -1733,7 +1733,7 @@ void RsGxsDataAccess::tokenList(std::list<uint32_t>& tokens)
bool RsGxsDataAccess::locked_updateRequestStatus( uint32_t token, RsTokenService::GxsRequestStatus status ) bool RsGxsDataAccess::locked_updateRequestStatus( uint32_t token, RsTokenService::GxsRequestStatus status )
{ {
GxsRequest* req = locked_retrieveCompetedRequest(token); GxsRequest* req = locked_retrieveCompletedRequest(token);
if(req) req->status = status; if(req) req->status = status;
else return false; else return false;