wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

connection queue fixes

This commit is contained in:
Arvid Norberg 2007-05-17 02:55:44 +00:00
parent 8987d7077d
commit 6d8cf1899c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/connection_queue.cpp
View File

@ -111,6 +111,7 @@ namespace libtorrent
, m_queue.end(), boost::bind(&entry::connecting, _1) == false); , m_queue.end(), boost::bind(&entry::connecting, _1) == false);
while (i != m_queue.end()) while (i != m_queue.end())
{ {
assert(i->connecting == false);
ptime expire = time_now() + i->timeout; ptime expire = time_now() + i->timeout;
if (m_num_connecting == 0) if (m_num_connecting == 0)
{ {
@ -120,7 +121,12 @@ namespace libtorrent
i->connecting = true; i->connecting = true;
++m_num_connecting; ++m_num_connecting;
i->expires = expire; i->expires = expire;
try { i->on_connect(i->ticket); } catch (std::exception&) {}
INVARIANT_CHECK;
entry& ent = *i;
++i;
try { ent.on_connect(i->ticket); } catch (std::exception&) {}
if (!free_slots()) break; if (!free_slots()) break;
i = std::find_if(i, m_queue.end(), boost::bind(&entry::connecting, _1) == false); i = std::find_if(i, m_queue.end(), boost::bind(&entry::connecting, _1) == false);
@ -142,7 +148,7 @@ namespace libtorrent
if (i->connecting && i->expires < now) if (i->connecting && i->expires < now)
{ {
boost::function<void()> on_timeout = i->on_timeout; boost::function<void()> on_timeout = i->on_timeout;
i = m_queue.erase(i); m_queue.erase(i++);
--m_num_connecting; --m_num_connecting;
try { on_timeout(); } catch (std::exception&) {} try { on_timeout(); } catch (std::exception&) {}
continue; continue;