premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

pex flood fix

This commit is contained in:
Arvid Norberg 2011-01-23 05:57:11 +00:00
parent 021a774168
commit 0d2ba173a4
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ut_pex.cpp
View File

@ -215,11 +215,16 @@ namespace libtorrent { namespace
: m_torrent(t) : m_torrent(t)
, m_pc(pc) , m_pc(pc)
, m_tp(tp) , m_tp(tp)
, m_last_pex(min_time())
, m_1_minute(55) , m_1_minute(55)
, m_message_index(0) , m_message_index(0)
, m_first_time(true) , m_first_time(true)
{} {
const int num_pex_timers = sizeof(m_last_pex)/sizeof(m_last_pex[0]);
for (int i = 0; i < num_pex_timers; ++i)
{
m_last_pex[i]= min_time();
}
}
virtual char const* type() const { return "ut_pex"; } virtual char const* type() const { return "ut_pex"; }
@ -253,8 +258,10 @@ namespace libtorrent { namespace
return true; return true;
} }
ptime now = time_now(); if (body.left() < length) return true;
if (now - m_last_pex < seconds(10))
ptime now = time_now_hires(); //#error TEMP!
if (now - m_last_pex[0]< seconds(60))
{ {
// this client appears to be trying to flood us // this client appears to be trying to flood us
// with pex messages. Don't allow that. // with pex messages. Don't allow that.
@ -262,9 +269,10 @@ namespace libtorrent { namespace
return true; return true;
} }
if (body.left() < length) return true; const int num_pex_timers = sizeof(m_last_pex)/sizeof(m_last_pex[0]);
for (int i = 0; i < num_pex_timers-1; ++i)
m_last_pex = now; m_last_pex[i] = m_last_pex[i+1];
m_last_pex[num_pex_timers-1] = now;
lazy_entry pex_msg; lazy_entry pex_msg;
error_code ec; error_code ec;
@ -508,8 +516,14 @@ namespace libtorrent { namespace
typedef std::vector<std::pair<address_v6::bytes_type, boost::uint16_t> > peers6_t; typedef std::vector<std::pair<address_v6::bytes_type, boost::uint16_t> > peers6_t;
peers6_t m_peers6; peers6_t m_peers6;
#endif #endif
// the last pex message we received // the last pex messages we received
ptime m_last_pex; // [0] is the oldest one. There is a problem with
// rate limited connections, because we may sit
// for a long time, accumulating pex messages, and
// then once we read from the socket it will look like
// we received them all back to back. That's why
// we look at 6 pex messages back.
ptime m_last_pex[6];
int m_1_minute; int m_1_minute;
int m_message_index; int m_message_index;