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

session::set_tracker_proxy fix for udp trackers

This commit is contained in:
Arvid Norberg 2010-08-21 22:07:29 +00:00
parent 0dbb04f75f
commit afd5567969
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/libtorrent/aux_/session_impl.hpp
View File

@ -315,7 +315,10 @@ namespace libtorrent
void set_web_seed_proxy(proxy_settings const& s) void set_web_seed_proxy(proxy_settings const& s)
{ m_web_seed_proxy = s; } { m_web_seed_proxy = s; }
void set_tracker_proxy(proxy_settings const& s) void set_tracker_proxy(proxy_settings const& s)
{ m_tracker_proxy = s; } {
m_udp_socket.set_proxy_settings(s);
m_tracker_proxy = s;
}
proxy_settings const& peer_proxy() const proxy_settings const& peer_proxy() const
{ return m_peer_proxy; } { return m_peer_proxy; }

5
src/udp_socket.cpp
View File

@ -113,6 +113,7 @@ void udp_socket::send_hostname(char const* hostname, int port
return; return;
} }
// this function is only supported when we're using a proxy
TORRENT_ASSERT(m_queue_packets); TORRENT_ASSERT(m_queue_packets);
if (!m_queue_packets) return; if (!m_queue_packets) return;
@ -614,6 +615,7 @@ void udp_socket::on_connected(error_code const& e)
write_uint8(0, p); // no authentication write_uint8(0, p); // no authentication
write_uint8(2, p); // username/password write_uint8(2, p); // username/password
} }
TORRENT_ASSERT(p - m_tmp_buf < sizeof(m_tmp_buf));
asio::async_write(m_socks5_sock, asio::buffer(m_tmp_buf, p - m_tmp_buf) asio::async_write(m_socks5_sock, asio::buffer(m_tmp_buf, p - m_tmp_buf)
, boost::bind(&udp_socket::handshake1, this, _1)); , boost::bind(&udp_socket::handshake1, this, _1));
} }
@ -664,6 +666,7 @@ void udp_socket::handshake2(error_code const& e)
write_string(m_proxy_settings.username, p); write_string(m_proxy_settings.username, p);
write_uint8(m_proxy_settings.password.size(), p); write_uint8(m_proxy_settings.password.size(), p);
write_string(m_proxy_settings.password, p); write_string(m_proxy_settings.password, p);
TORRENT_ASSERT(p - m_tmp_buf < sizeof(m_tmp_buf));
asio::async_write(m_socks5_sock, asio::buffer(m_tmp_buf, p - m_tmp_buf) asio::async_write(m_socks5_sock, asio::buffer(m_tmp_buf, p - m_tmp_buf)
, boost::bind(&udp_socket::handshake3, this, _1)); , boost::bind(&udp_socket::handshake3, this, _1));
} }
@ -729,7 +732,7 @@ void udp_socket::socks_forward_udp(mutex::scoped_lock& l)
port = m_ipv6_sock.local_endpoint(ec).port(); port = m_ipv6_sock.local_endpoint(ec).port();
#endif #endif
detail::write_uint16(port , p); detail::write_uint16(port , p);
TORRENT_ASSERT(p - m_tmp_buf < sizeof(m_tmp_buf));
asio::async_write(m_socks5_sock, asio::buffer(m_tmp_buf, p - m_tmp_buf) asio::async_write(m_socks5_sock, asio::buffer(m_tmp_buf, p - m_tmp_buf)
, boost::bind(&udp_socket::connect1, this, _1)); , boost::bind(&udp_socket::connect1, this, _1));
} }