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

Discovery do not distribute addresses to hidden nodes

Browse Source 
As there is no consensus in takde advantage of hidden nodes for
  discovery do not spread ip address to them
This commit is contained in:
Gioacchino Mazzurco 2018-02-23 01:05:35 +01:00
parent e7facc122b
commit 9dd1aef2b7
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/services/p3discovery2.cc
View File

@ -387,7 +387,7 @@ void p3discovery2::sendOwnContactInfo(const SSLID &sslid)
RsDiscContactItem *pkt = new RsDiscContactItem();
/* Cyril: we dont send our own IP to an hidden node. It will not use it
* anyway. */
//populateContactInfo(detail, pkt, !rsPeers->isHiddenNode(sslid));
populateContactInfo(detail, pkt, !rsPeers->isHiddenNode(sslid));
/* G10h4ck: sending IP information also to hidden nodes has proven very
* helpful in the usecase of non hidden nodes, that share a common
* hidden trusted node, to discover each other IP.
@ -396,7 +396,7 @@ void p3discovery2::sendOwnContactInfo(const SSLID &sslid)
* permission matrix. Disabling this instead will make life more
* difficult for average user, that moreover whould have no way to
* revert an hardcoded policy. */
populateContactInfo(detail, pkt, true);
//populateContactInfo(detail, pkt, true);
pkt->version = RsUtil::retroshareVersion();
pkt->PeerId(sslid);
@ -500,10 +500,10 @@ void p3discovery2::updatePeerAddressList(const RsDiscContactItem *item)
if (item->isHidden)
{
}
else
else if(!mPeerMgr->isHiddenNode(rsPeers->getOwnId()))
{
/* Cyril: we don't store IP addresses if we're a hidden node.
* Normally they should not be sent to us, except for old peers. */
// if(!mPeerMgr->isHiddenNode(rsPeers->getOwnId()))
/* G10h4ck: sending IP information also to hidden nodes has proven very
* helpful in the usecase of non hidden nodes, that share a common
* hidden trusted node, to discover each other IP.
@ -512,7 +512,7 @@ void p3discovery2::updatePeerAddressList(const RsDiscContactItem *item)
* permission matrix. Disabling this instead will make life more
* difficult for average user, that moreover whould have no way to
* revert an hardcoded policy. */
{
pqiIpAddrSet addrsFromPeer;
addrsFromPeer.mLocal.extractFromTlv(item->localAddrList);
addrsFromPeer.mExt.extractFromTlv(item->extAddrList);