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

upd

Browse Source
This commit is contained in:
RetroPooh 2017-03-10 11:15:39 +03:00
parent 6a2181ca14
commit 06e4c68065
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/turtle/p3turtle.cc
View File

@ -2003,12 +2003,12 @@ void p3turtle::getTrafficStatistics(TurtleTrafficStatisticsInfo& info) const
std::string p3turtle::getPeerNameForVirtualPeerId(const RsPeerId& virtual_peer_id) std::string p3turtle::getPeerNameForVirtualPeerId(const RsPeerId& virtual_peer_id)
{ {
RsStackMutex stack(mTurtleMtx); /********** STACK LOCKED MTX ******/
std::string name = "unknown"; std::string name = "unknown";
std::map<TurtleVirtualPeerId,TurtleTunnelId>::const_iterator it(_virtual_peers.find(virtual_peer_id)) ; std::map<TurtleVirtualPeerId,TurtleTunnelId>::const_iterator it(_virtual_peers.find(virtual_peer_id)) ;
if(it != _virtual_peers.end()) if(it != _virtual_peers.end())
{ {
TurtleTunnelId tunnel_id = it->second ; std::map<TurtleTunnelId,TurtleTunnel>::iterator it2( _local_tunnels.find(it->second) ) ;
std::map<TurtleTunnelId,TurtleTunnel>::iterator it2( _local_tunnels.find(tunnel_id) ) ;
if(it2 != _local_tunnels.end()) if(it2 != _local_tunnels.end())
{ {
if(it2->second.local_src == _own_id) if(it2->second.local_src == _own_id)

4
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View File

@ -1392,9 +1392,9 @@ QString TransfersDialog::getPeerName(const RsPeerId& id) const
{ {
res = QString::fromStdString(rsTurtle->getPeerNameForVirtualPeerId(id)); res = QString::fromStdString(rsTurtle->getPeerNameForVirtualPeerId(id));
if(rsFiles->isEncryptedSource(id)) if(rsFiles->isEncryptedSource(id))
return tr("e2ee tunnel ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ; return tr("Anonymous E2EE tunnel ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ;
else else
return tr("Anon tunnel ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ; return tr("Anonymous tunnel id # ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ;
} }
else else
return res ; return res ;