The_Great_Archive/libretroshare
1
0
Fork 0
mirror of https://github.com/RetroShare/libretroshare.git synced 2026-09-12 19:50:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308 from jolavillette/fix/gxstrans

Browse Source 
fix issues in gxstrans
This commit is contained in:
csoler 2026-06-13 19:55:41 +02:00 committed by GitHub
commit aa8832f70c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gxs/rsgenexchange.cc
View File

@ -3094,6 +3094,7 @@ void RsGenExchange::computeHash(const RsTlvBinaryData& data, RsFileHash& hash)
void RsGenExchange::processRecvdMessages()
{
std::list<RsGxsMessageId> messages_to_reject ;
std::set<RsGxsGroupId> grps_with_new_msgs ; // groups that received new messages, to stamp their server update TS off-mutex below
{
RS_STACK_MUTEX(mGenMtx) ;
@ -3273,6 +3274,12 @@ void RsGenExchange::processRecvdMessages()
for(auto& nxs_msg: msgs_to_store)
{
// msgs_to_store is now post-deduplication (removeDeleteExistingMessages above), so this only
// contains genuinely new messages. Mark their groups for the server-TS stamp here, NOT from
// groups_last_post_update (which is populated pre-dedup and would also fire for already-known
// messages re-received via sync, causing redundant stamps/advertisements).
grps_with_new_msgs.insert(nxs_msg->grpId);
RsGxsMsgItem *item = dynamic_cast<RsGxsMsgItem*>(mSerialiser->deserialise(nxs_msg->msg.bin_data,&nxs_msg->msg.bin_len));
if(!item)
@ -3305,8 +3312,18 @@ void RsGenExchange::processRecvdMessages()
// Done off-mutex to avoid cross deadlocks in the netservice that might call the RsGenExchange as an observer..
if(mNetService != NULL)
{
for(std::list<RsGxsMessageId>::const_iterator it(messages_to_reject.begin());it!=messages_to_reject.end();++it)
mNetService->rejectMessage(*it) ;
// Stamp the server-side msg update TS for groups that received new messages, so that friends get
// notified and re-synchronise. For messages received through the regular netservice transaction path
// this is already done in RsGxsNetService::processCompletedTransactions(), but messages injected
// directly via receiveNewMessages() (e.g. presigned receipts) bypass that path and would otherwise be
// stored but never advertised to friends.
for(const RsGxsGroupId& grpId : grps_with_new_msgs)
mNetService->stampMsgServerUpdateTS(grpId) ;
}
}
bool RsGenExchange::acceptNewGroup(const RsGxsGrpMetaData* /*grpMeta*/ ) { return true; }

25
src/services/p3msgservice.cc
View File

@ -440,6 +440,7 @@ int p3MsgService::checkOutgoingMessages()
{
if(to.toRsPeerId() == ownId || mServiceCtrl->isPeerConnected(getServiceInfo().mServiceType, to.toRsPeerId()) )
{
auto msg_item = createOutgoingMessageItem(*sit->second,to);
// Use the msg_id of the outgoing message copy.
@ -476,7 +477,6 @@ int p3MsgService::checkOutgoingMessages()
changed = true;
#ifdef DEBUG_DISTANT_MSG
RsDbg() << "Message id " << mit->first << " is distant: kept in outgoing, and marked as ROUTED" << std::endl;
#endif
Dbg3() << __PRETTY_FUNCTION__ << " Sending out message" << std::endl;
auto msg_item = createOutgoingMessageItem(*sit->second,to);
@ -510,6 +510,7 @@ int p3MsgService::checkOutgoingMessages()
if(mit->second.empty())
{
sit->second->msg.msgFlags &= ~RS_MSG_FLAGS_PENDING;
pEvent->mChangedMsgIds.insert(std::to_string(sit->first));
auto tmp = mit;
++tmp;
msgOutgoing.erase(mit);
@ -526,7 +527,6 @@ int p3MsgService::checkOutgoingMessages()
if(changed)
{
// RsDbg() << "MAIL: checkOutgoingMessages() triggering IndicateConfigChanged(SAVE_NOW)" << std::endl;
IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
}
@ -2474,6 +2474,8 @@ void p3MsgService::notifyDataStatus( const GRouterMsgPropagationId& id,
<< " could not be delivered on time to " << signer_id << ". Message id: "
<< msg_id << std::endl;
bool found = false;
for(auto it=msgOutgoing.begin();it!=msgOutgoing.end();++it)
{
auto mit = it->second.find(msg_id);
@ -2482,9 +2484,12 @@ void p3MsgService::notifyDataStatus( const GRouterMsgPropagationId& id,
{
std::cerr << " reseting the ROUTED flag so that the message is requested again" << std::endl;
mit->second.flags &= ~RS_MSG_FLAGS_ROUTED;
found = true;
break;
}
else
}
if(!found)
{
std::cerr << "(ii) message has been notified as delivered, but it's"
<< " not in outgoing list. probably it has been delivered"
@ -2492,7 +2497,6 @@ void p3MsgService::notifyDataStatus( const GRouterMsgPropagationId& id,
return;
}
}
}
else if(data_status == GROUTER_CLIENT_SERVICE_DATA_STATUS_RECEIVED)
{
RS_STACK_MUTEX(mMsgMtx);
@ -2579,6 +2583,7 @@ bool p3MsgService::receiveGxsTransMail( const RsGxsId& authorId,
const RsGxsId& recipientId,
const uint8_t* data, uint32_t dataSize )
{
Dbg2() << __PRETTY_FUNCTION__ << " " << authorId << ", " << recipientId
<< ",, " << dataSize << std::endl;
@ -2660,7 +2665,6 @@ bool p3MsgService::notifyGxsTransSendStatus( RsGxsTransId mailId,
}
std::cerr << " message id = " << msg_id << std::endl;
if( status == GxsTransSendStatus::RECEIPT_RECEIVED )
{
pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_RECEIVED_ACK;
@ -2679,12 +2683,11 @@ bool p3MsgService::notifyGxsTransSendStatus( RsGxsTransId mailId,
{
it->second.erase(mit);
pEvent->mChangedMsgIds.insert(std::to_string(msg_id));
pEvent->mChangedMsgIds.insert(std::to_string(it->first));
found = true;
}
break;
}
}
if(!found)
RsInfo() << __PRETTY_FUNCTION__ << " " << mailId
@ -2710,11 +2713,11 @@ bool p3MsgService::notifyGxsTransSendStatus( RsGxsTransId mailId,
{
mit->second.flags &= ~RS_MSG_FLAGS_ROUTED; // forces re-send.
pEvent->mChangedMsgIds.insert(std::to_string(msg_id));
pEvent->mChangedMsgIds.insert(std::to_string(it->first));
found = true;
}
break;
}
}
if(!found)
RsWarn() << __PRETTY_FUNCTION__ << " " << mailId
@ -2737,6 +2740,7 @@ void p3MsgService::receiveGRouterData( const RsGxsId &destination_key,
GRouterServiceId &/*client_id*/,
uint8_t *data, uint32_t data_size )
{
std::cerr << "p3MsgService::receiveGRouterData(): received message item of"
<< " size " << data_size << ", for key " << destination_key
<< std::endl;
@ -2822,6 +2826,7 @@ void p3MsgService::locked_sendDistantMsgItem(RsMsgItem *msgitem,const RsGxsId& s
mGRouter->sendData( destination_key_id, GROUTER_CLIENT_ID_MESSAGES,
msg_serialized_data, msg_serialized_rssize,
signing_key_id, grouter_message_id );
RsGxsTransId gxsMailId;
mGxsTransServ.sendData( gxsMailId, GxsTransSubServices::P3_MSG_SERVICE,
signing_key_id, destination_key_id,