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

added seperated limit for discovery (30 days)

Browse Source
This commit is contained in:
sehraf 2016-02-19 16:32:57 +01:00
parent 841299d077
commit 4140969fcb
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/pqi/p3peermgr.cc
View File

@ -2749,7 +2749,7 @@ bool p3PeerMgrIMPL::removeUnusedLocations()
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
for(it = mFriendList.begin(); it != mFriendList.end(); ++it) for(it = mFriendList.begin(); it != mFriendList.end(); ++it)
{ {
if (now - it->second.lastcontact > RS_PEER_OLD_PEER) if (now > it->second.lastcontact + RS_PEER_OFFLINE_DELETE)
{ {
toRemove.push_back(it->first); toRemove.push_back(it->first);

8
libretroshare/src/pqi/p3peermgr.h
View File

@ -65,8 +65,12 @@ const uint32_t RS_NET_FLAGS_EXTERNAL_ADDR = 0x0008;
const uint32_t RS_NET_FLAGS_STABLE_UDP = 0x0010; const uint32_t RS_NET_FLAGS_STABLE_UDP = 0x0010;
const uint32_t RS_NET_FLAGS_TRUSTS_ME = 0x0020; const uint32_t RS_NET_FLAGS_TRUSTS_ME = 0x0020;
/* remove locations offline since 90 days */ /*
const time_t RS_PEER_OLD_PEER = (90 * 24 * 3600); * remove locations offline since 90 days
* stopt sending locations via discovery when offline for +30 days
*/
const time_t RS_PEER_OFFLINE_DELETE = (90 * 24 * 3600);
const time_t RS_PEER_OFFLINE_NO_DISC = (30 * 24 * 3600);
class peerState class peerState
{ {

6
libretroshare/src/services/p3discovery2.cc
View File

@ -931,10 +931,10 @@ void p3discovery2::processContactInfo(const SSLID &fromId, const RsDiscContactIt
// We pass RS_NODE_PERM_ALL because the PGP id is already a friend, so we should keep the existing // We pass RS_NODE_PERM_ALL because the PGP id is already a friend, so we should keep the existing
// permission flags. Therefore the mask needs to be 0xffff. // permission flags. Therefore the mask needs to be 0xffff.
// set last seen to RS_PEER_OLD_PEER minus 1 day so that the DHT has a fair chance to establish a connection // set last seen to RS_PEER_OFFLINE_NO_DISC minus 1 so that it won't be shared with other friends
// before the location gets automatically removed again // until a first connection is established
mPeerMgr->addFriend(item->sslId, item->pgpId, item->netMode, RS_VS_DISC_OFF, RS_VS_DHT_FULL, time(NULL) - RS_PEER_OLD_PEER + (24 * 3600), RS_NODE_PERM_ALL); mPeerMgr->addFriend(item->sslId, item->pgpId, item->netMode, RS_VS_DISC_OFF, RS_VS_DHT_FULL, time(NULL) - RS_PEER_OFFLINE_NO_DISC - 1, RS_NODE_PERM_ALL);
updatePeerAddresses(item); updatePeerAddresses(item);
} }
} }