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

Added Incoming Query History, for future filtering of aggressive peers.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6681 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-09-03 11:09:30 +00:00
parent 6dbe3f3669
commit 3544bc30b2
4 changed files with 205 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

50
libbitdht/src/bitdht/bdnode.cc
View file

@ -71,7 +71,9 @@
#define HISTORY_PERIOD 60
bdNode::bdNode(bdNodeId *ownId, std::string dhtVersion, std::string bootfile, bdDhtFunctions *fns)
:mNodeSpace(ownId, fns), mQueryMgr(NULL), mConnMgr(NULL), mFilterPeers(NULL), mOwnId(*ownId), mDhtVersion(dhtVersion), mStore(bootfile, fns), mFns(fns), mFriendList(ownId), mHistory(HISTORY_PERIOD)
:mNodeSpace(ownId, fns), mQueryMgr(NULL), mConnMgr(NULL),
mFilterPeers(NULL), mOwnId(*ownId), mDhtVersion(dhtVersion), mStore(bootfile, fns), mFns(fns),
mFriendList(ownId), mHistory(HISTORY_PERIOD)
{
init(); /* (uses this pointers) stuff it - do it here! */
@ -264,14 +266,17 @@ void bdNode::printState()
std::cerr << "Outstanding Potential Peers: " << mPotentialPeers.size();
std::cerr << std::endl;
std::cerr << "Outstanding Query Requests: " << mRemoteQueries.size();
std::cerr << std::endl;
#ifdef USE_HISTORY
mHistory.cleanupOldMsgs();
mHistory.printMsgs();
mHistory.analysePeers();
mHistory.peerTypeAnalysis();
// Incoming Query Analysis.
std::cerr << "Outstanding Query Requests: " << mRemoteQueries.size();
std::cerr << std::endl;
mQueryHistory.printMsgs();
#endif
mAccount.printStats(std::cerr);
@ -647,12 +652,28 @@ void bdNode::processRemoteQuery()
while(nProcessed < MAX_REMOTE_PROCESS_PER_CYCLE)
{
/* extra exit clause */
if (mRemoteQueries.size() < 1) return;
if (mRemoteQueries.size() < 1)
{
#ifdef USE_HISTORY
if (nProcessed)
{
mQueryHistory.cleanupOldMsgs();
}
#endif
return;
}
bdRemoteQuery &query = mRemoteQueries.front();
// filtering.
bool badPeer = false;
#ifdef USE_HISTORY
// store result in badPeer to activate the filtering.
mQueryHistory.addIncomingQuery(query.mQueryTS, &(query.mId), &(query.mQuery));
#endif
/* discard older ones (stops queue getting overloaded) */
if (query.mQueryTS > oldTS)
if ((query.mQueryTS > oldTS) && (!badPeer))
{
/* recent enough to process! */
nProcessed++;
@ -722,16 +743,27 @@ void bdNode::processRemoteQuery()
}
else
{
std::cerr << "bdNode::processRemoteQuery() Query Too Old: Discarding: ";
if (badPeer)
{
std::cerr << "bdNode::processRemoteQuery() Query from BadPeer: Discarding: ";
}
else
{
std::cerr << "bdNode::processRemoteQuery() Query Too Old: Discarding: ";
}
mFns->bdPrintId(std::cerr, &(query.mId));
std::cerr << std::endl;
#ifdef DEBUG_NODE_MSGS
#endif
}
mRemoteQueries.pop_front();
}
#ifdef USE_HISTORY
mQueryHistory.cleanupOldMsgs();
#endif
}