mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-15 19:04:25 -05:00
add more explicit param names
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a38799a98e
commit
810481c8b7
@ -153,13 +153,13 @@ virtual bool getGPGSignedList(std::list<std::string> &gpg_ids) = 0;//friend
|
|||||||
virtual bool getGPGValidList(std::list<std::string> &gpg_ids) = 0;
|
virtual bool getGPGValidList(std::list<std::string> &gpg_ids) = 0;
|
||||||
virtual bool getGPGAllList(std::list<std::string> &gpg_ids) = 0;
|
virtual bool getGPGAllList(std::list<std::string> &gpg_ids) = 0;
|
||||||
virtual bool getGPGDetails(std::string gpg_id, RsPeerDetails &d) = 0;
|
virtual bool getGPGDetails(std::string gpg_id, RsPeerDetails &d) = 0;
|
||||||
virtual bool getSSLChildListOfGPGId(std::string gpg_id, std::list<std::string> &ids) = 0;
|
virtual bool getSSLChildListOfGPGId(std::string gpg_id, std::list<std::string> &ssl_ids) = 0;
|
||||||
|
|
||||||
/* Add/Remove Friends */
|
/* Add/Remove Friends */
|
||||||
virtual bool addFriend(std::string ssl_id, std::string gpg_id) = 0;
|
virtual bool addFriend(std::string ssl_id, std::string gpg_id) = 0;
|
||||||
virtual bool addDummyFriend(std::string gpg_id) = 0; //we want to add a empty ssl friend for this gpg id
|
virtual bool addDummyFriend(std::string gpg_id) = 0; //we want to add a empty ssl friend for this gpg id
|
||||||
virtual bool isDummyFriend(std::string ssl_id) = 0;
|
virtual bool isDummyFriend(std::string ssl_id) = 0;
|
||||||
virtual bool removeFriend(std::string id) = 0;
|
virtual bool removeFriend(std::string ssl_or_gpg_id) = 0;
|
||||||
|
|
||||||
/* Network Stuff */
|
/* Network Stuff */
|
||||||
virtual bool connectAttempt(std::string ssl_id) = 0;
|
virtual bool connectAttempt(std::string ssl_id) = 0;
|
||||||
@ -178,8 +178,8 @@ virtual bool getAllowTunnelConnection() = 0 ;
|
|||||||
/* Auth Stuff */
|
/* Auth Stuff */
|
||||||
virtual std::string GetRetroshareInvite() = 0;
|
virtual std::string GetRetroshareInvite() = 0;
|
||||||
|
|
||||||
virtual bool loadCertificateFromFile(std::string fname, std::string &id, std::string &gpg_id) = 0;
|
virtual bool loadCertificateFromFile(std::string fname, std::string &ssl_id, std::string &gpg_id) = 0;
|
||||||
virtual bool loadDetailsFromStringCert(std::string cert, RsPeerDetails &pd) = 0;
|
virtual bool loadDetailsFromStringCert(std::string certGPG, RsPeerDetails &pd) = 0;
|
||||||
virtual bool saveCertificateToFile(std::string id, std::string fname) = 0;
|
virtual bool saveCertificateToFile(std::string id, std::string fname) = 0;
|
||||||
virtual std::string saveCertificateToString(std::string id) = 0;
|
virtual std::string saveCertificateToString(std::string id) = 0;
|
||||||
|
|
||||||
|
@ -634,7 +634,7 @@ bool p3Peers::isDummyFriend(std::string ssl_id) {
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool p3Peers::removeFriend(std::string id)
|
bool p3Peers::removeFriend(std::string ssl_or_gpgid)
|
||||||
{
|
{
|
||||||
#ifdef P3PEERS_DEBUG
|
#ifdef P3PEERS_DEBUG
|
||||||
std::cerr << "p3Peers::removeFriend() " << id;
|
std::cerr << "p3Peers::removeFriend() " << id;
|
||||||
|
Loading…
Reference in New Issue
Block a user