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

patch from Henry Morgan to avoid removing peer permission flags when removing locations

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-04-16 20:10:31 +00:00
parent 6590167475
commit c2fcd8bc71
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,7 +576,7 @@ bool p3PeerMgrIMPL::addFriend(const std::string& input_id, const std::string& in
} }
bool p3PeerMgrIMPL::removeFriend(const std::string &id) bool p3PeerMgrIMPL::removeFriend(const std::string &id, bool removePgpId)
{ {
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
@ -605,7 +605,8 @@ bool p3PeerMgrIMPL::removeFriend(const std::string &id)
peerState peer = it->second; peerState peer = it->second;
sslid_toRemove.push_back(it->second.id); sslid_toRemove.push_back(it->second.id);
pgpid_toRemove.push_back(it->second.gpg_id); if(removePgpId)
pgpid_toRemove.push_back(it->second.gpg_id);
mOthersList[id] = peer; mOthersList[id] = peer;
mStatusChanged = true; mStatusChanged = true;
@ -1889,7 +1890,7 @@ bool p3PeerMgrIMPL::removeAllFriendLocations(const std::string &gpgid)
std::list<std::string>::iterator it; std::list<std::string>::iterator it;
for(it = sslIds.begin(); it != sslIds.end(); it++) for(it = sslIds.begin(); it != sslIds.end(); it++)
{ {
removeFriend(*it); removeFriend(*it, true);
} }
return true; return true;
@ -1979,7 +1980,7 @@ bool p3PeerMgrIMPL::removeUnusedLocations()
for(it = toRemove.begin(); it != toRemove.end(); it++) for(it = toRemove.begin(); it != toRemove.end(); it++)
{ {
removeFriend(*it); removeFriend(*it,false);
} }
return true; return true;

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

@ -124,7 +124,7 @@ virtual ~p3PeerMgr() { return; }
virtual bool addFriend(const std::string &ssl_id, const std::string &gpg_id, uint32_t netMode = RS_NET_MODE_UDP, virtual bool addFriend(const std::string &ssl_id, const std::string &gpg_id, uint32_t netMode = RS_NET_MODE_UDP,
uint32_t visState = RS_VIS_STATE_STD , time_t lastContact = 0,ServicePermissionFlags = ServicePermissionFlags(RS_SERVICE_PERM_ALL)) = 0; uint32_t visState = RS_VIS_STATE_STD , time_t lastContact = 0,ServicePermissionFlags = ServicePermissionFlags(RS_SERVICE_PERM_ALL)) = 0;
virtual bool removeFriend(const std::string &ssl_id) = 0; virtual bool removeFriend(const std::string &ssl_id, bool removePgpId) = 0;
virtual bool isFriend(const std::string &ssl_id) = 0; virtual bool isFriend(const std::string &ssl_id) = 0;
@ -215,7 +215,7 @@ class p3PeerMgrIMPL: public p3PeerMgr, public p3Config
virtual bool addFriend(const std::string &ssl_id, const std::string &gpg_id, uint32_t netMode = RS_NET_MODE_UDP, virtual bool addFriend(const std::string &ssl_id, const std::string &gpg_id, uint32_t netMode = RS_NET_MODE_UDP,
uint32_t visState = RS_VIS_STATE_STD , time_t lastContact = 0,ServicePermissionFlags = ServicePermissionFlags(RS_SERVICE_PERM_ALL)); uint32_t visState = RS_VIS_STATE_STD , time_t lastContact = 0,ServicePermissionFlags = ServicePermissionFlags(RS_SERVICE_PERM_ALL));
virtual bool removeFriend(const std::string &ssl_id); virtual bool removeFriend(const std::string &ssl_id, bool removePgpId);
virtual bool isFriend(const std::string &ssl_id); virtual bool isFriend(const std::string &ssl_id);

2
libretroshare/src/rsserver/p3peers.cc
View File

@ -630,7 +630,7 @@ bool p3Peers::removeFriendLocation(const std::string &sslId)
std::cerr << "p3Peers::removeFriendLocation() " << sslId << std::endl; std::cerr << "p3Peers::removeFriendLocation() " << sslId << std::endl;
#endif #endif
//will remove if it's a ssl id //will remove if it's a ssl id
mPeerMgr->removeFriend(sslId); mPeerMgr->removeFriend(sslId, false);
return true; return true;
} }