Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 09:26:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed display inconsistency in tunnel local src/dst when getPeerDetails() call fails

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4170 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-04-25 14:15:57 +00:00
parent db428d0cd8
commit 61b387447f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2071,11 +2071,16 @@ void p3turtle::getInfo( std::vector<std::vector<std::string> >& hashes_info,
tunnel.push_back(printNumber(it->first,true)) ; tunnel.push_back(printNumber(it->first,true)) ;
RsPeerDetails sslDetails; RsPeerDetails sslDetails;
rsPeers->getPeerDetails(it->second.local_src,sslDetails) ;
tunnel.push_back(sslDetails.name + " - " + sslDetails.location) ;
rsPeers->getPeerDetails(it->second.local_dst,sslDetails) ; if(rsPeers->getPeerDetails(it->second.local_src,sslDetails))
tunnel.push_back(sslDetails.name + " - " + sslDetails.location) ; tunnel.push_back(sslDetails.name + " - " + sslDetails.location) ;
else
tunnel.push_back(it->second.local_src) ;
if(rsPeers->getPeerDetails(it->second.local_dst,sslDetails))
tunnel.push_back(sslDetails.name + " - " + sslDetails.location) ;
else
tunnel.push_back(it->second.local_dst);
tunnel.push_back(it->second.hash) ; tunnel.push_back(it->second.hash) ;
tunnel.push_back(printNumber(now-it->second.time_stamp) + " secs ago") ; tunnel.push_back(printNumber(now-it->second.time_stamp) + " secs ago") ;
@ -2092,8 +2097,10 @@ void p3turtle::getInfo( std::vector<std::vector<std::string> >& hashes_info,
search_req.push_back(printNumber(it->first,true)) ; search_req.push_back(printNumber(it->first,true)) ;
RsPeerDetails sslDetails; RsPeerDetails sslDetails;
rsPeers->getPeerDetails(it->second.origin,sslDetails) ; if(rsPeers->getPeerDetails(it->second.origin,sslDetails))
search_req.push_back(sslDetails.name + " - " + sslDetails.location) ; search_req.push_back(sslDetails.name + " - " + sslDetails.location) ;
else
search_req.push_back(it->second.origin) ;
search_req.push_back(printNumber(now - it->second.time_stamp) + " secs ago") ; search_req.push_back(printNumber(now - it->second.time_stamp) + " secs ago") ;
} }
@ -2107,8 +2114,11 @@ void p3turtle::getInfo( std::vector<std::vector<std::string> >& hashes_info,
tunnel_req.push_back(printNumber(it->first,true)) ; tunnel_req.push_back(printNumber(it->first,true)) ;
RsPeerDetails sslDetails; RsPeerDetails sslDetails;
rsPeers->getPeerDetails(it->second.origin,sslDetails) ; if(rsPeers->getPeerDetails(it->second.origin,sslDetails))
tunnel_req.push_back(sslDetails.name + " - " + sslDetails.location) ; tunnel_req.push_back(sslDetails.name + " - " + sslDetails.location) ;
else
tunnel_req.push_back(it->second.origin) ;
tunnel_req.push_back(printNumber(now - it->second.time_stamp) + " secs ago") ; tunnel_req.push_back(printNumber(now - it->second.time_stamp) + " secs ago") ;
} }
} }