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

fix the fix for large UDP packets on windows

This commit is contained in:
Arvid Norberg 2014-05-10 23:44:57 +00:00
parent 870073345b
commit 22491740e5
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/udp_socket.cpp
View File

@ -278,20 +278,6 @@ void udp_socket::on_read(error_code const& ec, udp::socket* s)
--m_v4_outstanding;
}
// TODO: it would be nice to detect this on posix systems also
#ifdef TORRENT_WINDOWS
if ((ec == error_code(ERROR_MORE_DATA, get_system_category())
|| ec == error_code(WSAEMSGSIZE, get_system_category()))
&& m_buf_size < 65536)
{
// if this function fails to allocate memory, m_buf_size
// is set to 0. In that case, don't issue the async_read().
set_buf_size(m_buf_size * 2);
if (m_buf_size != 0) setup_read(s);
return;
}
#endif
if (ec == asio::error::operation_aborted) return;
if (m_abort) return;
@ -302,6 +288,21 @@ void udp_socket::on_read(error_code const& ec, udp::socket* s)
error_code ec;
udp::endpoint ep;
size_t bytes_transferred = s->receive_from(asio::buffer(m_buf, m_buf_size), ep, 0, ec);
// TODO: it would be nice to detect this on posix systems also
#ifdef TORRENT_WINDOWS
if ((ec == error_code(ERROR_MORE_DATA, get_system_category())
|| ec == error_code(WSAEMSGSIZE, get_system_category()))
&& m_buf_size < 65536)
{
// if this function fails to allocate memory, m_buf_size
// is set to 0. In that case, don't issue the async_read().
set_buf_size(m_buf_size * 2);
if (m_buf_size == 0) return;
continue;
}
#endif
if (ec == asio::error::would_block || ec == asio::error::try_again) break;
on_read_impl(s, ep, ec, bytes_transferred);
}
@ -489,6 +490,7 @@ void udp_socket::setup_read(udp::socket* s)
#if defined TORRENT_ASIO_DEBUGGING
add_outstanding_async("udp_socket::on_read");
#endif
udp::endpoint ep;
TORRENT_TRY
{
@ -701,6 +703,12 @@ void udp_socket::set_buf_size(int s)
call_handler(error::no_memory, ep, 0, 0);
close();
}
// set the internal buffer sizes as well
m_ipv4_sock.set_option(boost::asio::socket_base::receive_buffer_size(m_buf_size));
#if TORRENT_USE_IPV6
m_ipv6_sock.set_option(boost::asio::socket_base::receive_buffer_size(m_buf_size));
#endif
}
void udp_socket::bind(udp::endpoint const& ep, error_code& ec)