From a7b7623f239b6f24df24eb06b64869904a84fe67 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Thu, 19 Jul 2018 13:26:44 +0200
Subject: [PATCH] return values instead of using out-params

---
 include/libtorrent/utp_socket_manager.hpp | 2 +-
 src/utp_socket_manager.cpp                | 8 ++++----
 src/utp_stream.cpp                        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/libtorrent/utp_socket_manager.hpp b/include/libtorrent/utp_socket_manager.hpp
index f4ced1852..2110f02b5 100644
--- a/include/libtorrent/utp_socket_manager.hpp
+++ b/include/libtorrent/utp_socket_manager.hpp
@@ -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);
diff --git a/src/utp_socket_manager.cpp b/src/utp_socket_manager.cpp
index ddaab2931..ffb35a36e 100644
--- a/src/utp_socket_manager.cpp
+++ b/src/utp_socket_manager.cpp
@@ -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);
diff --git a/src/utp_stream.cpp b/src/utp_stream.cpp
index f0dacf1d3..252c67207 100644
--- a/src/utp_stream.cpp
+++ b/src/utp_stream.cpp
@@ -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();