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

utp socket fix

This commit is contained in:
Arvid Norberg 2008-12-19 06:20:09 +00:00
parent eadd91849a
commit d850a9ea38
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/udp_socket.cpp
View File

@ -45,7 +45,9 @@ udp_socket::udp_socket(asio::io_service& ios, udp_socket::callback_t const& c
void udp_socket::send(udp::endpoint const& ep, char const* p, int len, error_code& ec) void udp_socket::send(udp::endpoint const& ep, char const* p, int len, error_code& ec)
{ {
CHECK_MAGIC; CHECK_MAGIC;
TORRENT_ASSERT(m_ipv4_sock.is_open()); // if the sockets are closed, the udp_socket is closing too
if (!m_ipv4_sock.is_open() && !m_ipv6_sock.is_open()) return;
if (m_tunnel_packets) if (m_tunnel_packets)
{ {
// send udp packets through SOCKS5 server // send udp packets through SOCKS5 server
@ -74,8 +76,8 @@ void udp_socket::on_read(udp::socket* s, error_code const& e, std::size_t bytes_
// "this" may be destructed in the callback // "this" may be destructed in the callback
// that's why we need to unlock // that's why we need to unlock
callback_t tmp = m_callback; callback_t tmp = m_callback;
l.unlock();
m_callback.clear(); m_callback.clear();
l.unlock();
} }
return; return;
} }
@ -105,7 +107,17 @@ void udp_socket::on_read(udp::socket* s, error_code const& e, std::size_t bytes_
&& e != asio::error::connection_refused && e != asio::error::connection_refused
&& e != asio::error::connection_aborted && e != asio::error::connection_aborted
&& e != asio::error::message_size) && e != asio::error::message_size)
{
if (m_outstanding == 0)
{
// "this" may be destructed in the callback
// that's why we need to unlock
callback_t tmp = m_callback;
m_callback.clear();
l.unlock();
}
return; return;
}
if (s == &m_ipv4_sock) if (s == &m_ipv4_sock)
s->async_receive_from(asio::buffer(m_v4_buf, sizeof(m_v4_buf)) s->async_receive_from(asio::buffer(m_v4_buf, sizeof(m_v4_buf))