Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Copy name of the location from the cert to RsPeerDetails in p3Peers::loadDetailsFromStringCert.

Browse Source 
The name of the location was missing in ConnectFriendWizard, only the id was shown.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6665 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-09-01 12:11:21 +00:00
parent 2212293493
commit 5dee253030
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/pgp/rscertificate.h
View File

@ -34,6 +34,7 @@ class RsCertificate
std::string ext_ip_string() const ;
std::string loc_ip_string() const ;
std::string location_name_string() const { return location_name; }
std::string dns_string() const { return dns_name ; }
std::string sslid_string() const;
std::string armouredPGPKey() const ;

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

@ -944,6 +944,7 @@ bool p3Peers::loadDetailsFromStringCert(const std::string &certstr, RsPeerDetai
#endif
pd.id = cert.sslid_string() ;
pd.location = cert.location_name_string();
pd.localAddr = cert.loc_ip_string();
pd.localPort = cert.loc_port_us();
pd.extAddr = cert.ext_ip_string();