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

enlabled distant messaging by default. Added lock protection in some places. Removed debug info in distant messaging.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-08-09 17:02:29 +00:00
parent 57ed22910d
commit 0a23f93877
2 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@
#include <iomanip> #include <iomanip>
#include <map> #include <map>
#define DEBUG_DISTANT_MSG //#define DEBUG_DISTANT_MSG
//#define DISABLE_DISTANT_MESSAGES //#define DISABLE_DISTANT_MESSAGES
const int msgservicezone = 54319; const int msgservicezone = 54319;
@ -396,6 +396,14 @@ bool p3MsgService::saveList(bool& cleanup, std::list<RsItem*>& itemList)
itemList.push_back(item) ; itemList.push_back(item) ;
} }
RsConfigKeyValueSet *vitem = new RsConfigKeyValueSet ;
RsTlvKeyValue kv;
kv.key = "DISTANT_MESSAGES_ENABLED" ;
kv.value = mDistantMessagingEnabled?"YES":"NO" ;
vitem->tlvkvs.pairs.push_back(kv) ;
itemList.push_back(vitem) ;
return true; return true;
} }
@ -408,7 +416,10 @@ void p3MsgService::saveDone()
RsSerialiser* p3MsgService::setupSerialiser() RsSerialiser* p3MsgService::setupSerialiser()
{ {
RsSerialiser *rss = new RsSerialiser ; RsSerialiser *rss = new RsSerialiser ;
rss->addSerialType(new RsMsgSerialiser(true)); rss->addSerialType(new RsMsgSerialiser(true));
rss->addSerialType(new RsGeneralConfigSerialiser());
return rss; return rss;
} }
@ -468,6 +479,7 @@ bool p3MsgService::loadList(std::list<RsItem*>& load)
std::map<uint32_t, std::string> srcIdMsgMap; std::map<uint32_t, std::string> srcIdMsgMap;
std::map<uint32_t, std::string>::iterator srcIt; std::map<uint32_t, std::string>::iterator srcIt;
bool distant_messaging_set = false ;
// load items and calculate next unique msgId // load items and calculate next unique msgId
for(it = load.begin(); it != load.end(); it++) for(it = load.begin(); it != load.end(); it++)
@ -513,6 +525,25 @@ bool p3MsgService::loadList(std::list<RsItem*>& load)
{ {
_messenging_invites[msv->hash].time_of_validity = msv->time_stamp ; _messenging_invites[msv->hash].time_of_validity = msv->time_stamp ;
} }
RsConfigKeyValueSet *vitem = NULL ;
if(NULL != (vitem = dynamic_cast<RsConfigKeyValueSet*>(*it)))
for(std::list<RsTlvKeyValue>::const_iterator kit = vitem->tlvkvs.pairs.begin(); kit != vitem->tlvkvs.pairs.end(); ++kit)
if(kit->key == "DISTANT_MESSAGES_ENABLED")
{
#ifdef CHAT_DEBUG
std::cerr << "Loaded config default nick name for distant chat: " << kit->value << std::endl ;
#endif
enableDistantMessaging(kit->value == "YES") ;
distant_messaging_set = true ;
}
}
if(!distant_messaging_set)
{
std::cerr << "No config value for distant messaging. Setting it to true." << std::endl;
enableDistantMessaging(true) ;
} }
// sort items into lists // sort items into lists
@ -1943,9 +1974,14 @@ void p3MsgService::enableDistantMessaging(bool b)
if(!getDistantMessageHash(AuthGPG::getAuthGPG()->getGPGOwnId(),hash)) if(!getDistantMessageHash(AuthGPG::getAuthGPG()->getGPGOwnId(),hash))
return ; return ;
bool cchanged = false ;
#ifdef DEBUG_DISTANT_MSG #ifdef DEBUG_DISTANT_MSG
std::cerr << (b?"Enabling":"Disabling") << " distant messaging, with hash = " << hash << std::endl; std::cerr << (b?"Enabling":"Disabling") << " distant messaging, with hash = " << hash << std::endl;
#endif #endif
{
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
std::map<std::string,DistantMessengingInvite>::iterator it = _messenging_invites.find(hash) ; std::map<std::string,DistantMessengingInvite>::iterator it = _messenging_invites.find(hash) ;
if(b && it == _messenging_invites.end()) if(b && it == _messenging_invites.end())
@ -1953,14 +1989,21 @@ void p3MsgService::enableDistantMessaging(bool b)
DistantMessengingInvite invite ; DistantMessengingInvite invite ;
invite.time_of_validity = time(NULL) + 10*365*86400; // 10 years from now invite.time_of_validity = time(NULL) + 10*365*86400; // 10 years from now
_messenging_invites[hash] = invite ; _messenging_invites[hash] = invite ;
mDistantMessagingEnabled = true ;
IndicateConfigChanged() ; cchanged = true ;
} }
if((!b) && it != _messenging_invites.end()) if((!b) && it != _messenging_invites.end())
{ {
_messenging_invites.erase(it) ; _messenging_invites.erase(it) ;
IndicateConfigChanged() ; mDistantMessagingEnabled = false ;
cchanged = true ;
} }
}
if(cchanged)
IndicateConfigChanged() ;
#ifdef DEBUG_DISTANT_MSG #ifdef DEBUG_DISTANT_MSG
std::cerr << "List of distant message invites: " << std::endl; std::cerr << "List of distant message invites: " << std::endl;
@ -1977,7 +2020,12 @@ bool p3MsgService::distantMessagingEnabled()
if(!getDistantMessageHash(AuthGPG::getAuthGPG()->getGPGOwnId(),hash)) if(!getDistantMessageHash(AuthGPG::getAuthGPG()->getGPGOwnId(),hash))
return false; return false;
return _messenging_invites.find(hash) != _messenging_invites.end() ; bool res ;
{
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
res = _messenging_invites.find(hash) != _messenging_invites.end() ;
}
return res ;
} }
bool p3MsgService::getDistantMessageHash(const std::string& pgp_id,std::string& hash) bool p3MsgService::getDistantMessageHash(const std::string& pgp_id,std::string& hash)
{ {

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

@ -193,6 +193,8 @@ void initStandardTagTypes();
std::map<uint32_t, RsMsgParentId*> mParentId; std::map<uint32_t, RsMsgParentId*> mParentId;
std::string config_dir; std::string config_dir;
bool mDistantMessagingEnabled ;
}; };
#endif // MESSAGE_SERVICE_HEADER #endif // MESSAGE_SERVICE_HEADER