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

removed soem dead code

Browse source
This commit is contained in:
csoler 2021-02-06 17:31:43 +01:00
parent 894570e2b7
commit 1f1a226f87
2 changed files with 12 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/gxs/rsgxsnetservice.cc
View file

@ -5368,14 +5368,13 @@ void RsGxsNetService::receiveTurtleSearchResults(TurtleRequestId req,const unsig
#endif #endif
uint32_t used_size = clear_group_data_len; uint32_t used_size = clear_group_data_len;
RsItem *item = RsNxsSerialiser(mServType).deserialise(clear_group_data,&used_size) ; RsItem *item = RsNxsSerialiser(mServType).deserialise(clear_group_data,&used_size) ;
RsNxsGrp *nxs_identity_grp=nullptr;
if(used_size < clear_group_data_len) if(used_size < clear_group_data_len)
{ {
uint32_t remaining_size = clear_group_data_len-used_size ; uint32_t remaining_size = clear_group_data_len-used_size ;
RsItem *item2 = RsNxsSerialiser(RS_SERVICE_GXS_TYPE_GXSID).deserialise(clear_group_data+used_size,&remaining_size) ; RsItem *item2 = RsNxsSerialiser(RS_SERVICE_GXS_TYPE_GXSID).deserialise(clear_group_data+used_size,&remaining_size) ;
nxs_identity_grp = dynamic_cast<RsNxsGrp*>(item2); auto nxs_identity_grp = dynamic_cast<RsNxsGrp*>(item2);
if(!nxs_identity_grp) if(!nxs_identity_grp)
std::cerr << "(EE) decrypted item contains more data that cannot be deserialized as a GxsId. Unexpected!" << std::endl; std::cerr << "(EE) decrypted item contains more data that cannot be deserialized as a GxsId. Unexpected!" << std::endl;
@ -5383,6 +5382,9 @@ void RsGxsNetService::receiveTurtleSearchResults(TurtleRequestId req,const unsig
// We should probably check that the identity that is sent corresponds to the group author and don't add // We should probably check that the identity that is sent corresponds to the group author and don't add
// it otherwise. But in any case, this won't harm to add a new public identity. If that identity is banned, // it otherwise. But in any case, this won't harm to add a new public identity. If that identity is banned,
// the group will be discarded in RsGenExchange anyway. // the group will be discarded in RsGenExchange anyway.
if(nxs_identity_grp)
mGixs->receiveNewIdentity(nxs_identity_grp);
} }
free(clear_group_data); free(clear_group_data);
@ -5413,9 +5415,6 @@ void RsGxsNetService::receiveTurtleSearchResults(TurtleRequestId req,const unsig
#endif #endif
mObserver->receiveNewGroups(new_grps); mObserver->receiveNewGroups(new_grps);
mObserver->receiveDistantSearchResults(req, grpId); mObserver->receiveDistantSearchResults(req, grpId);
if(nxs_identity_grp)
mGixs->receiveNewIdentity(nxs_identity_grp);
} }
bool RsGxsNetService::search( const std::string& substring, bool RsGxsNetService::search( const std::string& substring,

104
libretroshare/src/services/p3gxschannels.cc
View file

@ -2654,90 +2654,9 @@ void p3GxsChannels::receiveDistantSearchResults( TurtleRequestId id, const RsGxs
// So we put some data in there and will send an event with all of them at once every 1 sec at most. // So we put some data in there and will send an event with all of them at once every 1 sec at most.
mSearchResultsToNotify[id].insert(grpId); mSearchResultsToNotify[id].insert(grpId);
#ifdef TO_REMOVE
std::cerr << __PRETTY_FUNCTION__ << "(" << id << ", " << grpId << ")" << std::endl;
{
RsGenExchange::receiveDistantSearchResults(id, grpId);
RsGxsGroupSearchResults gs;
netService()->retrieveDistantGroupSummary(grpId, gs);
{
RS_STACK_MUTEX(mSearchCallbacksMapMutex);
auto cbpt = mSearchCallbacksMap.find(id);
if(cbpt != mSearchCallbacksMap.end())
{
cbpt->second.first(gs);
return;
}
} // end RS_STACK_MUTEX(mSearchCallbacksMapMutex);
}
{
RS_STACK_MUTEX(mDistantChannelsCallbacksMapMutex);
auto cbpt = mDistantChannelsCallbacksMap.find(id);
if(cbpt != mDistantChannelsCallbacksMap.end())
{
std::function<void (const RsGxsChannelGroup&)> callback =
cbpt->second.first;
RsThread::async([this, callback, grpId]()
{
std::list<RsGxsGroupId> chanIds({grpId});
std::vector<RsGxsChannelGroup> channelsInfo;
if(!getChannelsInfo(chanIds, channelsInfo))
{
std::cerr << __PRETTY_FUNCTION__ << " Error! Received "
<< "distant channel result grpId: " << grpId
<< " but failed getting channel info"
<< std::endl;
return;
}
for(const RsGxsChannelGroup& chan : channelsInfo)
callback(chan);
} );
return;
}
} // RS_STACK_MUTEX(mDistantChannelsCallbacksMapMutex);
#endif
} }
#ifdef TO_REMOVE bool p3GxsChannels::exportChannelLink( std::string& link, const RsGxsGroupId& chanId, bool includeGxsData, const std::string& baseUrl, std::string& errMsg )
void p3GxsChannels::cleanTimedOutCallbacks()
{
auto now = std::chrono::system_clock::now();
{
RS_STACK_MUTEX(mSearchCallbacksMapMutex);
for( auto cbpt = mSearchCallbacksMap.begin();
cbpt != mSearchCallbacksMap.end(); )
if(cbpt->second.second <= now)
{
clearDistantSearchResults(cbpt->first);
cbpt = mSearchCallbacksMap.erase(cbpt);
}
else ++cbpt;
} // RS_STACK_MUTEX(mSearchCallbacksMapMutex);
{
RS_STACK_MUTEX(mDistantChannelsCallbacksMapMutex);
for( auto cbpt = mDistantChannelsCallbacksMap.begin();
cbpt != mDistantChannelsCallbacksMap.end(); )
if(cbpt->second.second <= now)
{
clearDistantSearchResults(cbpt->first);
cbpt = mDistantChannelsCallbacksMap.erase(cbpt);
}
else ++cbpt;
} // RS_STACK_MUTEX(mDistantChannelsCallbacksMapMutex)
}
#endif
bool p3GxsChannels::exportChannelLink(
std::string& link, const RsGxsGroupId& chanId, bool includeGxsData,
const std::string& baseUrl, std::string& errMsg )
{ {
constexpr auto fname = __PRETTY_FUNCTION__; constexpr auto fname = __PRETTY_FUNCTION__;
const auto failure = [&](const std::string& err) const auto failure = [&](const std::string& err)
@ -2773,8 +2692,7 @@ bool p3GxsChannels::exportChannelLink(
return true; return true;
} }
bool p3GxsChannels::importChannelLink( bool p3GxsChannels::importChannelLink( const std::string& link, RsGxsGroupId& chanId, std::string& errMsg )
const std::string& link, RsGxsGroupId& chanId, std::string& errMsg )
{ {
constexpr auto fname = __PRETTY_FUNCTION__; constexpr auto fname = __PRETTY_FUNCTION__;
const auto failure = [&](const std::string& err) const auto failure = [&](const std::string& err)
@ -2801,18 +2719,12 @@ bool p3GxsChannels::importChannelLink(
return true; return true;
} }
/*static*/ const std::string RsGxsChannels::DEFAULT_CHANNEL_BASE_URL = /*static*/ const std::string RsGxsChannels::DEFAULT_CHANNEL_BASE_URL = "retroshare:///channels";
"retroshare:///channels"; /*static*/ const std::string RsGxsChannels::CHANNEL_URL_NAME_FIELD = "chanName";
/*static*/ const std::string RsGxsChannels::CHANNEL_URL_NAME_FIELD = /*static*/ const std::string RsGxsChannels::CHANNEL_URL_ID_FIELD = "chanId";
"chanName"; /*static*/ const std::string RsGxsChannels::CHANNEL_URL_DATA_FIELD = "chanData";
/*static*/ const std::string RsGxsChannels::CHANNEL_URL_ID_FIELD = /*static*/ const std::string RsGxsChannels::CHANNEL_URL_MSG_TITLE_FIELD = "chanMsgTitle";
"chanId"; /*static*/ const std::string RsGxsChannels::CHANNEL_URL_MSG_ID_FIELD = "chanMsgId";
/*static*/ const std::string RsGxsChannels::CHANNEL_URL_DATA_FIELD =
"chanData";
/*static*/ const std::string RsGxsChannels::CHANNEL_URL_MSG_TITLE_FIELD =
"chanMsgTitle";
/*static*/ const std::string RsGxsChannels::CHANNEL_URL_MSG_ID_FIELD =
"chanMsgId";
RsGxsChannelGroup::~RsGxsChannelGroup() = default; RsGxsChannelGroup::~RsGxsChannelGroup() = default;
RsGxsChannelPost::~RsGxsChannelPost() = default; RsGxsChannelPost::~RsGxsChannelPost() = default;