Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-03 11:00:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed code inconsistency (did not cause any issue)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6711 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-09-07 14:12:11 +00:00
parent 5039fc46ea
commit 8aa3ccad72
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,10 +968,12 @@ void p3turtle::handleSearchResult(RsTurtleSearchResultItem *item)
// --------------------------------- File Transfer. -------------------------------- // // --------------------------------- File Transfer. -------------------------------- //
// -----------------------------------------------------------------------------------// // -----------------------------------------------------------------------------------//
// Routing of turtle tunnel items in a generic manner. Most tunnel packets will use this function, except packets designed for // Routing of turtle tunnel items in a generic manner. Most tunnel packets will
// contructing the tunnels and searching, namely TurtleSearchRequests/Results and OpenTunnel/TunnelOkItems // use this function, except packets designed for contructing the tunnels and
// searching, namely TurtleSearchRequests/Results and OpenTunnel/TunnelOkItems
// //
// Only packets coming from handleIncoming() end up here, so this function is able to catch the transiting traffic. // Only packets coming from handleIncoming() end up here, so this function is
// able to catch the transiting traffic.
// //
void p3turtle::routeGenericTunnelItem(RsTurtleGenericTunnelItem *item) void p3turtle::routeGenericTunnelItem(RsTurtleGenericTunnelItem *item)
{ {
@ -1644,27 +1646,29 @@ void p3turtle::handleTunnelResult(RsTurtleTunnelOkItem *item)
{ {
found = true ; found = true ;
// add the tunnel uniquely {
bool found = false ; // add the tunnel uniquely
bool found = false ;
for(unsigned int j=0;j<it->second.tunnels.size();++j) for(unsigned int j=0;j<it->second.tunnels.size();++j)
if(it->second.tunnels[j] == item->tunnel_id) if(it->second.tunnels[j] == item->tunnel_id)
found = true ; found = true ;
if(!found) if(!found)
it->second.tunnels.push_back(item->tunnel_id) ; it->second.tunnels.push_back(item->tunnel_id) ;
tunnel.hash = it->first ; // because it's a local tunnel tunnel.hash = it->first ; // because it's a local tunnel
// Adds a virtual peer to the list of online peers. // Adds a virtual peer to the list of online peers.
// We do this later, because of the mutex protection. // We do this later, because of the mutex protection.
// //
new_tunnel = true ; new_tunnel = true ;
new_hash = it->first ; new_hash = it->first ;
service = it->second.service ; service = it->second.service ;
locked_addDistantPeer(new_hash,item->tunnel_id) ; locked_addDistantPeer(new_hash,item->tunnel_id) ;
new_vpid = _local_tunnels[item->tunnel_id].vpid ; // save it for off-mutex usage. new_vpid = _local_tunnels[item->tunnel_id].vpid ; // save it for off-mutex usage.
}
} }
if(!found) if(!found)
std::cerr << "p3turtle: error. Could not find hash that emmitted tunnel request " << reinterpret_cast<void*>(item->tunnel_id) << std::endl ; std::cerr << "p3turtle: error. Could not find hash that emmitted tunnel request " << reinterpret_cast<void*>(item->tunnel_id) << std::endl ;