jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue with UDP over SOCKS5. Added a udp tracker to the unit test to make sure it works. Added tracker tests for all proxies

Browse Source
This commit is contained in:
Arvid Norberg
2010-02-18 04:37:02 +00:00
parent 9197081618
commit 09a1023eb3
9 changed files with 300 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/udp_socket.cpp
View File

@@ -60,6 +60,7 @@ udp_socket::udp_socket(asio::io_service& ios, udp_socket::callback_t const& c
, m_connection_ticket(-1)
, m_cc(cc)
, m_resolver(ios)
, m_queue_packets(false)
, m_tunnel_packets(false)
, m_abort(false)
{
@@ -107,6 +108,15 @@ void udp_socket::send(udp::endpoint const& ep, char const* p, int len, error_cod
return;
}
if (m_queue_packets)
{
m_queue.push_back(queued_packet());
queued_packet& qp = m_queue.back();
qp.ep = ep;
qp.buf.insert(qp.buf.begin(), p, p + len);
return;
}
#if TORRENT_USE_IPV6
if (ep.address().is_v4() && m_ipv4_sock.is_open())
#endif
@@ -452,6 +462,7 @@ void udp_socket::set_proxy_settings(proxy_settings const& ps)
if (ps.type == proxy_settings::socks5
|| ps.type == proxy_settings::socks5_pw)
{
m_queue_packets = true;
// connect to socks5 server and open up the UDP tunnel
tcp::resolver::query q(ps.hostname, to_string(ps.port).elems);
m_resolver.async_resolve(q, boost::bind(
@@ -553,7 +564,7 @@ void udp_socket::handshake2(error_code const& e)
if (method == 0)
{
socks_forward_udp();
socks_forward_udp(l);
}
else if (method == 2)
{
@@ -609,16 +620,14 @@ void udp_socket::handshake4(error_code const& e)
if (version != 1) return;
if (status != 0) return;
socks_forward_udp();
socks_forward_udp(l);
}
void udp_socket::socks_forward_udp()
void udp_socket::socks_forward_udp(mutex::scoped_lock& l)
{
CHECK_MAGIC;
using namespace libtorrent::detail;
mutex::scoped_lock l(m_mutex);
// send SOCKS5 UDP command
char* p = &m_tmp_buf[0];
write_uint8(5, p); // SOCKS VERSION 5
@@ -673,6 +682,16 @@ void udp_socket::connect2(error_code const& e)
}
m_tunnel_packets = true;
m_queue_packets = false;
// forward all packets that were put in the queue
while (!m_queue.empty())
{
queued_packet const& p = m_queue.front();
error_code ec;
udp_socket::send(p.ep, &p.buf[0], p.buf.size(), ec);
m_queue.pop_front();
}
}
rate_limited_udp_socket::rate_limited_udp_socket(io_service& ios