Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-24 14:23:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the message service to save the receiver of the pending outgoing messages too.

Browse Source 
The saved peer id's are now removed, when the message is removed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3776 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-11-10 20:37:02 +00:00
parent e5ce0c5877
commit 50024e3f5e
2 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libretroshare/src/services/p3msgservice.cc
View File

@ -173,7 +173,7 @@ int p3MsgService::incomingMsgs()
RsMsgSrcId* msi = new RsMsgSrcId(); RsMsgSrcId* msi = new RsMsgSrcId();
msi->msgId = mi->msgId; msi->msgId = mi->msgId;
msi->srcId = mi->PeerId(); msi->srcId = mi->PeerId();
mSrcIdList.push_back(msi); mSrcIds.insert(std::pair<uint32_t, RsMsgSrcId*>(msi->msgId, msi));
msgChanged.IndicateChanged(); msgChanged.IndicateChanged();
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
@ -259,6 +259,12 @@ int p3MsgService::checkOutgoingMessages()
{ {
msgOutgoing.erase(mit); msgOutgoing.erase(mit);
} }
std::map<uint32_t, RsMsgSrcId*>::iterator srcIt = mSrcIds.find(*it);
if (srcIt != mSrcIds.end()) {
delete (srcIt->second);
mSrcIds.erase(srcIt);
}
} }
if (toErase.size() > 0) if (toErase.size() > 0)
@ -285,7 +291,7 @@ std::list<RsItem*> p3MsgService::saveList(bool& cleanup)
std::map<uint32_t, RsMsgItem *>::iterator mit; std::map<uint32_t, RsMsgItem *>::iterator mit;
std::map<uint32_t, RsMsgTagType* >::iterator mit2; std::map<uint32_t, RsMsgTagType* >::iterator mit2;
std::map<uint32_t, RsMsgTags* >::iterator mit3; std::map<uint32_t, RsMsgTags* >::iterator mit3;
std::list<RsMsgSrcId* >::iterator lit; std::map<uint32_t, RsMsgSrcId* >::iterator lit;
std::map<uint32_t, RsMsgParentId* >::iterator mit4; std::map<uint32_t, RsMsgParentId* >::iterator mit4;
MsgTagType stdTags; MsgTagType stdTags;
@ -297,8 +303,8 @@ std::list<RsItem*> p3MsgService::saveList(bool& cleanup)
for(mit = imsg.begin(); mit != imsg.end(); mit++) for(mit = imsg.begin(); mit != imsg.end(); mit++)
itemList.push_back(mit->second); itemList.push_back(mit->second);
for(lit = mSrcIdList.begin(); lit != mSrcIdList.end(); lit++) for(lit = mSrcIds.begin(); lit != mSrcIds.end(); lit++)
itemList.push_back(*lit); itemList.push_back(lit->second);
for(mit = msgOutgoing.begin(); mit != msgOutgoing.end(); mit++) for(mit = msgOutgoing.begin(); mit != msgOutgoing.end(); mit++)
@ -419,7 +425,7 @@ bool p3MsgService::loadList(std::list<RsItem*> load)
else if(NULL != (msi = dynamic_cast<RsMsgSrcId *>(*it))) else if(NULL != (msi = dynamic_cast<RsMsgSrcId *>(*it)))
{ {
srcIdMsgMap.insert(std::pair<uint32_t, std::string>(msi->msgId, msi->srcId)); srcIdMsgMap.insert(std::pair<uint32_t, std::string>(msi->msgId, msi->srcId));
mSrcIdList.push_back(msi); // does not need to be kept mSrcIds.insert(std::pair<uint32_t, RsMsgSrcId*>(msi->msgId, msi)); // does not need to be kept
} }
else if(NULL != (msp = dynamic_cast<RsMsgParentId *>(*it))) else if(NULL != (msp = dynamic_cast<RsMsgParentId *>(*it)))
{ {
@ -438,12 +444,19 @@ bool p3MsgService::loadList(std::list<RsItem*> load)
mitem->msgId = getNewUniqueMsgId(); mitem->msgId = getNewUniqueMsgId();
} }
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
srcIt = srcIdMsgMap.find(mitem->msgId);
if(srcIt != srcIdMsgMap.end()) {
mitem->PeerId(srcIt->second);
srcIdMsgMap.erase(srcIt);
}
/* switch depending on the PENDING /* switch depending on the PENDING
* flags * flags
*/ */
if (mitem -> msgFlags & RS_MSG_FLAGS_PENDING) if (mitem -> msgFlags & RS_MSG_FLAGS_PENDING)
{ {
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
//std::cerr << "MSG_PENDING"; //std::cerr << "MSG_PENDING";
//std::cerr << std::endl; //std::cerr << std::endl;
@ -453,16 +466,21 @@ bool p3MsgService::loadList(std::list<RsItem*> load)
} }
else else
{ {
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
srcIt = srcIdMsgMap.find(mitem->msgId);
if(srcIt != srcIdMsgMap.end())
mitem->PeerId(srcIt->second);
imsg[mitem->msgId] = mitem; imsg[mitem->msgId] = mitem;
} }
} }
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
/* remove missing msgId in mSrcIds */
for (srcIt = srcIdMsgMap.begin(); srcIt != srcIdMsgMap.end(); srcIt++) {
std::map<uint32_t, RsMsgSrcId*>::iterator it = mSrcIds.find(srcIt->first);
if (it != mSrcIds.end()) {
delete(it->second);
mSrcIds.erase(it);
}
}
/* remove missing msgId in mParentId */ /* remove missing msgId in mParentId */
std::map<uint32_t, RsMsgParentId *>::iterator mit = mParentId.begin(); std::map<uint32_t, RsMsgParentId *>::iterator mit = mParentId.begin();
while (mit != mParentId.end()) { while (mit != mParentId.end()) {
@ -647,6 +665,13 @@ bool p3MsgService::removeMsgId(const std::string &mid)
msgOutgoing.erase(mit); msgOutgoing.erase(mit);
delete mi; delete mi;
} }
std::map<uint32_t, RsMsgSrcId*>::iterator srcIt = mSrcIds.find(msgId);
if (srcIt != mSrcIds.end()) {
changed = true;
delete (srcIt->second);
mSrcIds.erase(srcIt);
}
} }
if(changed) { if(changed) {
@ -812,16 +837,22 @@ int p3MsgService::sendMessage(RsMsgItem *item)
item -> msgId = getNewUniqueMsgId(); /* grabs Mtx as well */ item -> msgId = getNewUniqueMsgId(); /* grabs Mtx as well */
{ {
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
/* add pending flag */ /* add pending flag */
item->msgFlags |= item->msgFlags |= (RS_MSG_FLAGS_OUTGOING | RS_MSG_FLAGS_PENDING);
(RS_MSG_FLAGS_OUTGOING | /* STORE MsgID */
RS_MSG_FLAGS_PENDING); msgOutgoing[item->msgId] = item;
/* STORE MsgID */
msgOutgoing[item->msgId] = item; if (item->PeerId() != mConnMgr->getOwnId()) {
} /* not to the loopback device */
RsMsgSrcId* msi = new RsMsgSrcId();
msi->msgId = item->msgId;
msi->srcId = item->PeerId();
mSrcIds.insert(std::pair<uint32_t, RsMsgSrcId*>(msi->msgId, msi));
}
}
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/

2
libretroshare/src/services/p3msgservice.h
View File

@ -136,7 +136,7 @@ void initStandardTagTypes();
uint32_t mMsgUniqueId; uint32_t mMsgUniqueId;
// used delete msgSrcIds after config save // used delete msgSrcIds after config save
std::list<RsMsgSrcId*> mSrcIdList; std::map<uint32_t, RsMsgSrcId*> mSrcIds;
// save the parent of the messages in draft for replied and forwarded // save the parent of the messages in draft for replied and forwarded
std::map<uint32_t, RsMsgParentId*> mParentId; std::map<uint32_t, RsMsgParentId*> mParentId;