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

return values instead of using out-params

This commit is contained in:
arvidn 2018-07-19 13:26:44 +02:00 committed by Arvid Norberg
parent dfb3f03c73
commit a7b7623f23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/utp_socket_manager.hpp
View File

@ -108,7 +108,7 @@ namespace libtorrent {
int min_timeout() const { return m_sett.get_int(settings_pack::utp_min_timeout); }
int loss_multiplier() const { return m_sett.get_int(settings_pack::utp_loss_multiplier); }
void mtu_for_dest(address const& addr, int& link_mtu, int& utp_mtu);
std::pair<int, int> mtu_for_dest(address const& addr);
int num_sockets() const { return int(m_utp_sockets.size()); }
void defer_ack(utp_socket_impl* s);

8
src/utp_socket_manager.cpp
View File

@ -88,7 +88,7 @@ namespace libtorrent {
}
}
void utp_socket_manager::mtu_for_dest(address const& addr, int& link_mtu, int& utp_mtu)
std::pair<int, int> utp_socket_manager::mtu_for_dest(address const& addr)
{
int mtu = 0;
if (is_teredo(addr)) mtu = TORRENT_TEREDO_MTU;
@ -109,7 +109,7 @@ namespace libtorrent {
if (mtu < TORRENT_INET_MIN_MTU) mtu = TORRENT_INET_MIN_MTU;
else if (mtu > TORRENT_INET_MAX_MTU) mtu = TORRENT_INET_MAX_MTU;
link_mtu = mtu;
int const link_mtu = mtu;
mtu -= TORRENT_UDP_HEADER;
@ -133,7 +133,7 @@ namespace libtorrent {
else mtu -= TORRENT_IPV6_HEADER;
}
utp_mtu = std::min(mtu, restrict_mtu());
return std::make_pair(link_mtu, std::min(mtu, restrict_mtu()));
}
void utp_socket_manager::send_packet(std::weak_ptr<utp_socket_interface> sock
@ -226,7 +226,7 @@ namespace libtorrent {
TORRENT_ASSERT(str);
int link_mtu, utp_mtu;
mtu_for_dest(ep.address(), link_mtu, utp_mtu);
std::tie(link_mtu, utp_mtu) = mtu_for_dest(ep.address());
utp_init_mtu(str->get_impl(), link_mtu, utp_mtu);
utp_init_socket(str->get_impl(), std::move(socket));
bool ret = utp_incoming_packet(str->get_impl(), p, ep, receive_time);

2
src/utp_stream.cpp
View File

@ -1123,7 +1123,7 @@ void utp_stream::issue_write()
void utp_stream::do_connect(tcp::endpoint const& ep)
{
int link_mtu, utp_mtu;
m_impl->m_sm.mtu_for_dest(ep.address(), link_mtu, utp_mtu);
std::tie(link_mtu, utp_mtu) = m_impl->m_sm.mtu_for_dest(ep.address());
m_impl->init_mtu(link_mtu, utp_mtu);
TORRENT_ASSERT(m_impl->m_connect_handler == false);
m_impl->m_remote_address = ep.address();