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

added a display of turtle search/tunnel requests over time, to help spotting potential spammers

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4216 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-05-23 21:45:25 +00:00
parent 0429baf807
commit 3f21835114
7 changed files with 270 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libretroshare/src/retroshare/rsturtle.h
View file

@ -26,6 +26,8 @@
*
*/
#pragma once
#include <inttypes.h>
#include <string>
#include <list>
@ -39,7 +41,7 @@ extern RsTurtle *rsTurtle ;
typedef uint32_t TurtleRequestId ;
// This is the structure used to send back results of the turtle search
// to the notifyBase class.
// to the notifyBase class, or send info to the GUI.
struct TurtleFileInfo
{
@ -48,6 +50,14 @@ struct TurtleFileInfo
uint64_t size ;
};
struct TurtleRequestDisplayInfo
{
uint32_t request_id ; // Id of the request
std::string source_peer_id ; // Peer that relayed the request
uint32_t age ; // Age in seconds
uint32_t depth ; // Depth of the request. Might be altered.
};
// Interface class for turtle hopping.
//
// This class mainly interacts with the turtle router, that is responsible
@ -61,7 +71,7 @@ class RsTurtle
public:
enum FileSharingStrategy { SHARE_ENTIRE_NETWORK, SHARE_FRIENDS_ONLY } ;
RsTurtle() { _sharing_strategy = SHARE_ENTIRE_NETWORK ;}
RsTurtle() {}
virtual ~RsTurtle() {}
// Lauches a search request through the pipes, and immediately returns
@ -71,6 +81,11 @@ class RsTurtle
virtual TurtleRequestId turtleSearch(const std::string& match_string) = 0 ;
virtual TurtleRequestId turtleSearch(const LinearizedExpression& expr) = 0 ;
// Sets the file sharing strategy. It concerns all local files. It would
// be better to handle this for each file, of course.
void setFileSharingStrategy(FileSharingStrategy f) { _sharing_strategy = f ; }
// Initiates tunnel handling for the given file hash. tunnels. Launches
// an exception if an error occurs during the initialization process. The
// turtle router itself does not initiate downloads, it only maintains
@ -84,18 +99,13 @@ class RsTurtle
//
virtual void stopMonitoringFileTunnels(const std::string& file_hash) = 0 ;
// Sets the file sharing strategy. It concerns all local files. It would
// be better to handle this for each file, of course.
void setFileSharingStrategy(FileSharingStrategy f) { _sharing_strategy = f ; }
// Get info from the turtle router. I use std strings to hide the internal structs.
virtual void getInfo(std::vector<std::vector<std::string> >&,std::vector<std::vector<std::string> >&,
std::vector<std::vector<std::string> >&,std::vector<std::vector<std::string> >&) const = 0;
std::vector<TurtleRequestDisplayInfo>&,std::vector<TurtleRequestDisplayInfo>&) const = 0;
// Convenience function.
virtual bool isTurtlePeer(const std::string& peer_id) const = 0 ;
protected:
FileSharingStrategy _sharing_strategy ;
};

35
libretroshare/src/turtle/p3turtle.cc
View file

@ -2040,8 +2040,8 @@ static std::string printNumber(uint64_t num,bool hex=false)
void p3turtle::getInfo( std::vector<std::vector<std::string> >& hashes_info,
std::vector<std::vector<std::string> >& tunnels_info,
std::vector<std::vector<std::string> >& search_reqs_info,
std::vector<std::vector<std::string> >& tunnel_reqs_info) const
std::vector<TurtleRequestDisplayInfo >& search_reqs_info,
std::vector<TurtleRequestDisplayInfo >& tunnel_reqs_info) const
{
RsStackMutex stack(mTurtleMtx); /********** STACK LOCKED MTX ******/
@ -2091,35 +2091,28 @@ void p3turtle::getInfo( std::vector<std::vector<std::string> >& hashes_info,
for(std::map<TurtleSearchRequestId,TurtleRequestInfo>::const_iterator it(_search_requests_origins.begin());it!=_search_requests_origins.end();++it)
{
search_reqs_info.push_back(std::vector<std::string>()) ;
std::vector<std::string>& search_req(search_reqs_info.back()) ;
TurtleRequestDisplayInfo info ;
search_req.push_back(printNumber(it->first,true)) ;
info.request_id = it->first ;
info.source_peer_id = it->second.origin ;
info.age = now - it->second.time_stamp ;
info.depth = it->second.depth ;
RsPeerDetails sslDetails;
if(rsPeers->getPeerDetails(it->second.origin,sslDetails))
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_reqs_info.push_back(info) ;
}
tunnel_reqs_info.clear();
for(std::map<TurtleSearchRequestId,TurtleRequestInfo>::const_iterator it(_tunnel_requests_origins.begin());it!=_tunnel_requests_origins.end();++it)
{
tunnel_reqs_info.push_back(std::vector<std::string>()) ;
std::vector<std::string>& tunnel_req(tunnel_reqs_info.back()) ;
TurtleRequestDisplayInfo info ;
tunnel_req.push_back(printNumber(it->first,true)) ;
RsPeerDetails sslDetails;
if(rsPeers->getPeerDetails(it->second.origin,sslDetails))
tunnel_req.push_back(sslDetails.name + " - " + sslDetails.location) ;
else
tunnel_req.push_back(it->second.origin) ;
info.request_id = it->first ;
info.source_peer_id = it->second.origin ;
info.age = now - it->second.time_stamp ;
info.depth = it->second.depth ;
tunnel_req.push_back(printNumber(now - it->second.time_stamp) + " secs ago") ;
tunnel_reqs_info.push_back(info) ;
}
}

4
libretroshare/src/turtle/p3turtle.h
View file

@ -244,8 +244,8 @@ class p3turtle: public p3Service, /*public pqiMonitor,*/ public RsTurtle,/* publ
/// get info about tunnels
virtual void getInfo(std::vector<std::vector<std::string> >&,
std::vector<std::vector<std::string> >&,
std::vector<std::vector<std::string> >&,
std::vector<std::vector<std::string> >&) const ;
std::vector<TurtleRequestDisplayInfo >&,
std::vector<TurtleRequestDisplayInfo >&) const ;
#ifdef TO_REMOVE
/************* from pqiMonitor *******************/