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

only update peer IPs form discovery for non hidden nodes

Browse source
This commit is contained in:
csoler 2021-02-06 21:55:43 +01:00
parent abe3527635
commit 90a11a1236
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc
View file

@ -373,26 +373,30 @@ void p3discovery2::recvOwnContactInfo(const RsPeerId &fromId, const RsDiscContac
} }
// Peer Own Info replaces the existing info, because the // Peer Own Info replaces the existing info, because the
// peer is the primary source of his own IPs. // peer is the primary source of his own IPs, except for hidden nodes
// that normally send nothing. We still ignore it as a double security.
mPeerMgr->setNetworkMode(fromId, item->netMode); mPeerMgr->setNetworkMode(fromId, item->netMode);
mPeerMgr->setLocation(fromId, item->location); mPeerMgr->setLocation(fromId, item->location);
mPeerMgr->setVisState(fromId, item->vs_disc, item->vs_dht); mPeerMgr->setVisState(fromId, item->vs_disc, item->vs_dht);
if(!det.localAddr.empty()) if(!mPeerMgr->isHiddenNode(fromId))
{ {
if(sockaddr_storage_isValidNet(item->localAddrV4.addr)) if(!det.localAddr.empty())
mPeerMgr->setLocalAddress(fromId,item->localAddrV4.addr); {
else if(sockaddr_storage_isValidNet(item->localAddrV6.addr)) if(sockaddr_storage_isValidNet(item->localAddrV4.addr))
mPeerMgr->setLocalAddress(fromId,item->localAddrV6.addr); mPeerMgr->setLocalAddress(fromId,item->localAddrV4.addr);
} else if(sockaddr_storage_isValidNet(item->localAddrV6.addr))
mPeerMgr->setLocalAddress(fromId,item->localAddrV6.addr);
}
if(!det.extAddr.empty()) if(!det.extAddr.empty())
{ {
if(sockaddr_storage_isValidNet(item->extAddrV4.addr)) if(sockaddr_storage_isValidNet(item->extAddrV4.addr))
mPeerMgr->setExtAddress(fromId,item->extAddrV4.addr); mPeerMgr->setExtAddress(fromId,item->extAddrV4.addr);
else if(sockaddr_storage_isValidNet(item->extAddrV6.addr)) else if(sockaddr_storage_isValidNet(item->extAddrV6.addr))
mPeerMgr->setExtAddress(fromId,item->extAddrV6.addr); mPeerMgr->setExtAddress(fromId,item->extAddrV6.addr);
}
} }
setPeerVersion(fromId, item->version); setPeerVersion(fromId, item->version);