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

Merge pull request #1371 from csoler/v0.6-BugFixing

Browse Source 
fixed bug in recent commit that broke turtle generic search
This commit is contained in:
csoler 2018-10-13 23:00:29 +02:00 committed by GitHub
commit bbf855fefb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,6 @@
#include <stdexcept>
#include <stdlib.h>
#include <assert.h>
#ifdef P3TURTLE_DEBUG
#include <assert.h>
#endif
#include "rsserver/p3face.h"
#include "crypto/rscrypto.h"
@ -930,6 +927,9 @@ void p3turtle::handleSearchRequest(RsTurtleSearchRequestItem *item)
(*it)->request_id = item->request_id ;
(*it)->PeerId(item->PeerId()) ;
#ifdef P3TURTLE_DEBUG
std::cerr << " sending back search result for request " << item->request_id << " to back to peer " << item->PeerId() << std::endl ;
#endif
sendItem(*it) ;
}
}
@ -1174,7 +1174,8 @@ void p3turtle::handleSearchResult(RsTurtleSearchResultItem *item)
if(it->second.result_count >= it->second.max_allowed_hits)
{
std::cerr << "(WW) exceeded turtle search result to forward. Req=" << std::hex << item->request_id << std::dec << ": dropping item with " << n << " elements." << std::endl;
std::cerr << "(WW) exceeded turtle search result to forward. Req=" << std::hex << item->request_id << std::dec
<< " already forwarded: " << it->second.result_count << ", max_allowed: " << it->second.max_allowed_hits << ": dropping item with " << n << " elements." << std::endl;
return ;
}
@ -2099,7 +2100,7 @@ void p3turtle::monitorTunnels(const RsFileHash& hash,RsTurtleClientService *clie
if(_hashes_to_remove.erase(hash) > 0)
{
#ifdef P3TURTLE_DEBUG
std::cerr << "p3turtle: File hash " << hash << " Was scheduled for removal. Canceling the removal." << std::endl ;
TURTLE_DEBUG() << "p3turtle: File hash " << hash << " Was scheduled for removal. Canceling the removal." << std::endl ;
#endif
}
@ -2108,12 +2109,12 @@ void p3turtle::monitorTunnels(const RsFileHash& hash,RsTurtleClientService *clie
if(_incoming_file_hashes.find(hash) != _incoming_file_hashes.end()) // download already asked.
{
#ifdef P3TURTLE_DEBUG
std::cerr << "p3turtle: File hash " << hash << " already in pool. Returning." << std::endl ;
TURTLE_DEBUG() << "p3turtle: File hash " << hash << " already in pool. Returning." << std::endl ;
#endif
return ;
}
#ifdef P3TURTLE_DEBUG
std::cerr << "p3turtle: Received order for turtle download fo hash " << hash << std::endl ;
TURTLE_DEBUG() << "p3turtle: Received order for turtle download fo hash " << hash << std::endl ;
#endif
// No tunnels at start, but this triggers digging new tunnels.
@ -2129,10 +2130,6 @@ void p3turtle::monitorTunnels(const RsFileHash& hash,RsTurtleClientService *clie
IndicateConfigChanged() ; // initiates saving of handled hashes.
}
#ifdef P3TURTLE_DEBUG
std::cerr << " Returning result for search request " << HEX_PRINT(item->request_id) << " upwards." << std::endl ;
#endif
// RsTurtleGxsSearchResultGroupSummaryItem *gxs_sr_gs = dynamic_cast<RsTurtleGxsSearchResultGroupSummaryItem*>(item) ;
//

2
libretroshare/src/turtle/rsturtleitem.cc
View File

@ -104,7 +104,7 @@ RsTurtleSearchRequestItem *RsTurtleGenericSearchRequestItem::clone() const
}
RsTurtleGenericSearchRequestItem::RsTurtleGenericSearchRequestItem(const RsTurtleGenericSearchRequestItem& it)
: RsTurtleSearchRequestItem(RS_TURTLE_SUBTYPE_GENERIC_SEARCH_REQUEST)
: RsTurtleSearchRequestItem(it)
{
search_data_len = it.search_data_len ;
search_data = (unsigned char*)rs_malloc(it.search_data_len) ;