wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix force-proxy regression (udp sockets would not be opened)

This commit is contained in:
arvidn 2017-11-21 02:06:43 +01:00 committed by Arvid Norberg
parent 04c2c35f8d
commit a57ad00e15
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simulation/test_session.cpp
View File

@ -111,6 +111,6 @@ TORRENT_TEST(force_proxy)
sim.run(); sim.run();
TEST_EQUAL(num_listen_tcp, 1); TEST_EQUAL(num_listen_tcp, 1);
TEST_EQUAL(num_listen_udp, 1); TEST_EQUAL(num_listen_udp, 2);
} }

11
src/session_impl.cpp
View File

@ -1885,12 +1885,6 @@ retry:
m_stats_counters.set_value(counters::has_incoming_connections, 0); m_stats_counters.set_value(counters::has_incoming_connections, 0);
ec.clear(); ec.clear();
if (m_settings.get_bool(settings_pack::force_proxy))
{
// in force-proxy mode, we don't open any listen sockets
return;
}
if (m_abort) return; if (m_abort) return;
m_ipv6_interface = tcp::endpoint(); m_ipv6_interface = tcp::endpoint();
@ -1899,7 +1893,8 @@ retry:
// TODO: instead of having a special case for this, just make the // TODO: instead of having a special case for this, just make the
// default listen interfaces be "0.0.0.0:6881,[::]:6881" and use // default listen interfaces be "0.0.0.0:6881,[::]:6881" and use
// the generic path. That would even allow for not listening at all. // the generic path. That would even allow for not listening at all.
if (m_listen_interfaces.empty()) if (m_listen_interfaces.empty()
&& !m_settings.get_bool(settings_pack::force_proxy))
{ {
// this means we should open two listen sockets // this means we should open two listen sockets
// one for IPv4 and one for IPv6 // one for IPv4 and one for IPv6
@ -1978,7 +1973,7 @@ retry:
m_ipv4_interface = tcp::endpoint(addr, m_listen_interface.port()); m_ipv4_interface = tcp::endpoint(addr, m_listen_interface.port());
} }
} }
else else if (!m_settings.get_bool(settings_pack::force_proxy))
{ {
// TODO: 2 the udp socket(s) should be using the same generic // TODO: 2 the udp socket(s) should be using the same generic
// mechanism and not be restricted to a single one // mechanism and not be restricted to a single one