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

fixed remembering flags for own id, tentatively fixed service perm bug

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6292 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-04-05 21:11:27 +00:00
parent 9a37bde4c8
commit bc463a0f81
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1514,7 +1514,7 @@ bool p3PeerMgrIMPL::loadList(std::list<RsItem *>& load)
std::cerr << "Loaded service permission item: " << std::endl; std::cerr << "Loaded service permission item: " << std::endl;
for(uint32_t i=0;i<sitem->pgp_ids.size();++i) for(uint32_t i=0;i<sitem->pgp_ids.size();++i)
if(AuthGPG::getAuthGPG()->isGPGAccepted(sitem->pgp_ids[i])) if(AuthGPG::getAuthGPG()->isGPGAccepted(sitem->pgp_ids[i]) || sitem->pgp_ids[i] == AuthGPG::getAuthGPG()->getGPGOwnId())
{ {
mFriendsPermissionFlags[sitem->pgp_ids[i]] = sitem->service_flags[i] ; mFriendsPermissionFlags[sitem->pgp_ids[i]] = sitem->service_flags[i] ;
std::cerr << " " << sitem->pgp_ids[i] << " - " << sitem->service_flags[i] << std::endl; std::cerr << " " << sitem->pgp_ids[i] << " - " << sitem->service_flags[i] << std::endl;

1
libretroshare/src/retroshare/rspeers.h
View File

@ -68,6 +68,7 @@ const uint32_t RS_PEER_STATE_UNREACHABLE= 0x0008;
// Service permission flags. // Service permission flags.
// //
const ServicePermissionFlags RS_SERVICE_PERM_NONE ( 0x00000000 ) ;
const ServicePermissionFlags RS_SERVICE_PERM_TURTLE ( 0x00000001 ) ; const ServicePermissionFlags RS_SERVICE_PERM_TURTLE ( 0x00000001 ) ;
const ServicePermissionFlags RS_SERVICE_PERM_DISCOVERY ( 0x00000002 ) ; const ServicePermissionFlags RS_SERVICE_PERM_DISCOVERY ( 0x00000002 ) ;
const ServicePermissionFlags RS_SERVICE_PERM_DISTRIB ( 0x00000004 ) ; const ServicePermissionFlags RS_SERVICE_PERM_DISTRIB ( 0x00000004 ) ;

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

@ -265,10 +265,12 @@ bool p3Peers::getPeerDetails(const std::string &id, RsPeerDetails &d)
#ifdef P3PEERS_DEBUG #ifdef P3PEERS_DEBUG
std::cerr << "p3Peers::getPeerDetails() ERROR not an SSL Id: " << id << std::endl; std::cerr << "p3Peers::getPeerDetails() ERROR not an SSL Id: " << id << std::endl;
#endif #endif
d.isOnlyGPGdetail = true; bool res = getGPGDetails(id, d);
d.service_perm_flags = mPeerMgr->servicePermissionFlags_sslid(id) ;
return getGPGDetails(id, d); d.isOnlyGPGdetail = true;
d.service_perm_flags = mPeerMgr->servicePermissionFlags(id) ;
return res ;
} }
} }