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

corrected bug of not sending info to own location (tracker 3104190)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4016 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-02-05 20:44:41 +00:00
parent 198d61891e
commit c0201b8dd2
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/services/p3disc.cc
View file

@ -269,7 +269,7 @@ void p3disc::sendAllInfoToJustConnectedPeer(const std::string &id)
RsPeerDetails pd; RsPeerDetails pd;
rsPeers->getPeerDetails(id, pd); rsPeers->getPeerDetails(id, pd);
if (!pd.accept_connection || (!pd.ownsign && pd.gpg_id != rsPeers->getGPGOwnId())) if (pd.gpg_id != rsPeers->getGPGOwnId() && (!pd.accept_connection || !pd.ownsign) )
{ {
//only send info when connection is accepted and gpg key is signed or our own key //only send info when connection is accepted and gpg key is signed or our own key
#ifdef P3DISC_DEBUG #ifdef P3DISC_DEBUG
@ -358,7 +358,8 @@ RsDiscReply *p3disc::createDiscReply(const std::string &to, const std::string &a
RsPeerDetails pd; RsPeerDetails pd;
rsPeers->getPeerDetails(to, pd); rsPeers->getPeerDetails(to, pd);
if (!pd.accept_connection || !pd.ownsign) { if (pd.gpg_id != rsPeers->getGPGOwnId() && (!pd.accept_connection || !pd.ownsign) )
{
#ifdef P3DISC_DEBUG #ifdef P3DISC_DEBUG
std::cerr << "p3disc::createDiscReply() we're not sending the info because the destination gpg key is not signed or not accepted." << std::cerr << std::endl; std::cerr << "p3disc::createDiscReply() we're not sending the info because the destination gpg key is not signed or not accepted." << std::cerr << std::endl;
#endif #endif