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

Added: tokens in PeersHandler

Browse Source
This commit is contained in:
Konrad 2017-03-28 11:20:51 +02:00
parent efd6ce3ed5
commit 6e530027f8
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libresapi/src/api/PeersHandler.cpp
View File

@ -116,9 +116,9 @@ PeersHandler::PeersHandler(StateTokenServer* sts, RsNotify* notify, RsPeers *pee
mStateTokenServer->registerTickClient(this);
addResourceHandler("*", this, &PeersHandler::handleWildcard);
addResourceHandler("get_state_string", this, &PeersHandler::handleGetStateString);
addResourceHandler("set_state_string", this, &PeersHandler::handleSetStateString);
addResourceHandler("get_custom_state_string", this, &PeersHandler::handleGetCustomStateString);
addResourceHandler("set_custom_state_string", this, &PeersHandler::handleSetCustomStateString);
addResourceHandler("set_state_string", this, &PeersHandler::handleSetStateString);
addResourceHandler("get_custom_state_string", this, &PeersHandler::handleGetCustomStateString);
addResourceHandler("set_custom_state_string", this, &PeersHandler::handleSetCustomStateString);
addResourceHandler("examine_cert", this, &PeersHandler::handleExamineCert);
}
@ -156,6 +156,27 @@ void PeersHandler::tick()
mStateTokenServer->discardToken(mStateToken);
mStateToken = mStateTokenServer->getNewToken();
}
StatusInfo statusInfo;
rsStatus->getOwnStatus(statusInfo);
if(statusInfo.status != status)
{
status = statusInfo.status;
RsStackMutex stack(mMtx); /********** STACK LOCKED MTX ******/
mStateTokenServer->discardToken(mStringStateToken);
mStringStateToken = mStateTokenServer->getNewToken();
}
std::string custom_state = rsMsgs->getCustomStateString();
if(custom_state != custom_state_string)
{
custom_state_string = custom_state;
RsStackMutex stack(mMtx); /********** STACK LOCKED MTX ******/
mStateTokenServer->discardToken(mCustomStateToken);
mCustomStateToken = mStateTokenServer->getNewToken();
}
}
void PeersHandler::notifyUnreadMsgCountChanged(const RsPeerId &peer, uint32_t count)
@ -181,6 +202,7 @@ void PeersHandler::handleGetStateString(Request& req, Response& resp)
{
{
RS_STACK_MUTEX(mMtx);
resp.mStateToken = mStringStateToken;
}
std::string state_string;
@ -207,10 +229,6 @@ void PeersHandler::handleGetStateString(Request& req, Response& resp)
void PeersHandler::handleSetStateString(Request& req, Response& resp)
{
{
RS_STACK_MUTEX(mMtx);
}
std::string state_string;
req.mStream << makeKeyValueReference("state_string", state_string);
@ -230,6 +248,7 @@ void PeersHandler::handleGetCustomStateString(Request& req, Response& resp)
{
{
RS_STACK_MUTEX(mMtx);
resp.mStateToken = mCustomStateToken;
}
std::string custom_state_string = rsMsgs->getCustomStateString();
@ -239,10 +258,6 @@ void PeersHandler::handleGetCustomStateString(Request& req, Response& resp)
void PeersHandler::handleSetCustomStateString(Request& req, Response& resp)
{
{
RS_STACK_MUTEX(mMtx);
}
std::string custom_state_string;
req.mStream << makeKeyValueReference("custom_state_string", custom_state_string);

5
libresapi/src/api/PeersHandler.h
View File

@ -50,9 +50,14 @@ private:
RsMsgs* mRsMsgs; // required for avatar data
std::list<RsPeerId> mOnlinePeers;
uint32_t status;
std::string custom_state_string;
RsMutex mMtx;
StateToken mStateToken; // mutex protected
StateToken mStringStateToken; // mutex protected
StateToken mCustomStateToken; // mutex protected
std::map<RsPeerId, uint32_t> mUnreadMsgsCounts;
};
} // namespace resource_api