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

prevent discovery and p3PeerMgr::loadList() from erasing service permission flags. Now the existing pgp-based values are kept.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8122 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-04-04 21:18:43 +00:00
parent a15b69f5e9
commit 059a0b3bf7
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/pqi/p3peermgr.cc
View file

@ -1699,8 +1699,9 @@ bool p3PeerMgrIMPL::loadList(std::list<RsItem *>& load)
pitem->print(std::cerr, 10);
std::cerr << std::endl;
#endif
/* ************* */
addFriend(peer_id, peer_pgp_id, pitem->netMode, pitem->vs_disc, pitem->vs_dht, pitem->lastContact, RS_NODE_PERM_DEFAULT);
/* ************* */
// permission flags is used as a mask for the existing perms, so we set it to 0xffff
addFriend(peer_id, peer_pgp_id, pitem->netMode, pitem->vs_disc, pitem->vs_dht, pitem->lastContact, RS_NODE_PERM_ALL);
setLocation(pitem->peerId, pitem->location);
}