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

restore aspects of the previous behavior of force-proxy. Instead of not opening any TCP listen sockets at all, open them but reject any incoming connection. This is because in RC_1_1, the UDP and TCP sockets are tied in subtle and unintuitive ways. This is much cleaner in the next major release and this patch will not need to be merged

This commit is contained in:
arvidn 2018-05-11 22:34:36 +02:00 committed by Arvid Norberg
parent f052d1ca40
commit 9ca12d6db5
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
* fix recent regression with force_proxy setting
* don't perform DNS lookups for the DHT bootstrap unless DHT is enabled
* fix issue where setting file/piece priority would stop checking
* expose post_dht_stats() to python binding

7
simulation/test_session.cpp
View File

@ -79,8 +79,9 @@ TORRENT_TEST(force_proxy)
// create session
std::shared_ptr<lt::session> ses = std::make_shared<lt::session>(pack, *ios);
// disable force proxy in 3 seconds (this should make us open up listen
// sockets)
// disable force proxy in 3 seconds. this won't make us open up listen
// sockets, since force proxy rejects incoming connections, it doesn't
// prevent the listen sockets from opening
sim::timer t1(sim, lt::seconds(3), [&](boost::system::error_code const& ec)
{
lt::settings_pack p;
@ -111,6 +112,6 @@ TORRENT_TEST(force_proxy)
sim.run();
TEST_EQUAL(num_listen_tcp, 1);
TEST_EQUAL(num_listen_udp, 2);
TEST_EQUAL(num_listen_udp, 1);
}

21
src/session_impl.cpp
View File

@ -1660,9 +1660,6 @@ namespace aux {
(pack.has_val(settings_pack::ssl_listen)
&& pack.get_int(settings_pack::ssl_listen)
!= m_settings.get_int(settings_pack::ssl_listen))
|| (pack.has_val(settings_pack::force_proxy)
&& !pack.get_bool(settings_pack::force_proxy)
&& m_settings.get_bool(settings_pack::force_proxy))
|| (pack.has_val(settings_pack::listen_interfaces)
&& pack.get_str(settings_pack::listen_interfaces)
!= m_settings.get_str(settings_pack::listen_interfaces));
@ -1880,8 +1877,7 @@ retry:
// TODO: instead of having a special case for this, just make the
// default listen interfaces be "0.0.0.0:6881,[::]:6881" and use
// the generic path. That would even allow for not listening at all.
if (m_listen_interfaces.empty()
&& !m_settings.get_bool(settings_pack::force_proxy))
if (m_listen_interfaces.empty())
{
// this means we should open two listen sockets
// one for IPv4 and one for IPv6
@ -1948,7 +1944,7 @@ retry:
#endif // TORRENT_USE_IPV6
}
else if (!m_settings.get_bool(settings_pack::force_proxy))
else
{
// TODO: 2 the udp socket(s) should be using the same generic
// mechanism and not be restricted to a single one
@ -1957,7 +1953,7 @@ retry:
for (int i = 0; i < m_listen_interfaces.size(); ++i)
{
std::string const& device = m_listen_interfaces[i].first;
int port = m_listen_interfaces[i].second;
int const port = m_listen_interfaces[i].second;
int num_device_fails = 0;
@ -2005,7 +2001,6 @@ retry:
#endif
m_ipv4_interface = bind_ep;
}
#ifdef TORRENT_USE_OPENSSL
if (m_settings.get_int(settings_pack::ssl_listen))
{
@ -2517,6 +2512,10 @@ retry:
}
async_accept(listener, ssl);
// don't accept any connections from our local sockets
if (m_settings.get_bool(settings_pack::force_proxy))
return;
#ifdef TORRENT_USE_OPENSSL
if (ssl)
{
@ -6532,12 +6531,6 @@ retry:
#ifndef TORRENT_DISABLE_DHT
stop_dht();
#endif
// close the listen sockets
error_code ec;
for (std::list<listen_socket_t>::iterator i = m_listen_sockets.begin()
, end(m_listen_sockets.end()); i != end; ++i)
i->sock->close(ec);
m_listen_sockets.clear();
}
#ifndef TORRENT_NO_DEPRECATE