From c0201b8dd279203a2f007a2722040e4fb3e40228 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 5 Feb 2011 20:44:41 +0000 Subject: [PATCH] corrected bug of not sending info to own location (tracker 3104190) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4016 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/services/p3disc.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/services/p3disc.cc b/libretroshare/src/services/p3disc.cc index fe3d62b6b..95e117d2c 100644 --- a/libretroshare/src/services/p3disc.cc +++ b/libretroshare/src/services/p3disc.cc @@ -269,7 +269,7 @@ void p3disc::sendAllInfoToJustConnectedPeer(const std::string &id) RsPeerDetails 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 #ifdef P3DISC_DEBUG @@ -358,7 +358,8 @@ RsDiscReply *p3disc::createDiscReply(const std::string &to, const std::string &a RsPeerDetails 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 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