twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-22 12:34:24 +00:00
Code Issues Projects Releases Wiki Activity

Revert commit in order to apply the upstream fix.

Browse Source 
Revert "don't rely on m_connection_ticket: if we have two "on_connect" in a row,"
This reverts commit 241291be70908394deff90758b90e86d32ab0004.
This commit is contained in:
Miguel Freitas 2014-07-01 07:59:47 -03:00
parent 241291be70
commit 17641de17a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libtorrent/include/libtorrent/udp_socket.hpp
View File

@ -176,7 +176,7 @@ namespace libtorrent
void on_name_lookup(error_code const& e, tcp::resolver::iterator i);
void on_timeout();
void on_connect(int ticket);
void on_connected(error_code const& ec, int ticket);
void on_connected(error_code const& ec);
void handshake1(error_code const& e);
void handshake2(error_code const& e);
void handshake3(error_code const& e);

6
libtorrent/src/udp_socket.cpp
View File

@ -885,10 +885,10 @@ void udp_socket::on_connect(int ticket)
++m_outstanding_connect;
#endif
m_socks5_sock.async_connect(tcp::endpoint(m_proxy_addr.address(), m_proxy_addr.port())
, boost::bind(&udp_socket::on_connected, this, _1, ticket));
, boost::bind(&udp_socket::on_connected, this, _1));
}
void udp_socket::on_connected(error_code const& e, int ticket)
void udp_socket::on_connected(error_code const& e)
{
#if defined TORRENT_ASIO_DEBUGGING
complete_async("udp_socket::on_connected");
@ -910,7 +910,7 @@ void udp_socket::on_connected(error_code const& e, int ticket)
if (e == asio::error::operation_aborted) return;
TORRENT_ASSERT(is_single_thread());
m_cc.done(ticket);
m_cc.done(m_connection_ticket);
m_connection_ticket = -1;
// we just called done, which means on_timeout