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

missing return if error in session_impl::on_port_mapping, doc typo (#2459)

This commit is contained in:
Alden Torres 2017-10-23 06:36:51 -04:00 committed by Arvid Norberg
parent 98effc8d88
commit bb409c5ee9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/aux_/session_impl.hpp
View File

@ -141,7 +141,7 @@ namespace aux {
// listen_socket_t should not be copied or moved because
// references to it are held by the DHT and tracker announce
// code. That code expects a listen_socket_t to always refer
// to the same socket. It would be easy to accidently
// to the same socket. It would be easy to accidentally
// invalidate that assumption if copying or moving were allowed.
listen_socket_t(listen_socket_t const&) = delete;
listen_socket_t(listen_socket_t&&) = delete;

12
src/session_impl.cpp
View File

@ -5413,10 +5413,14 @@ namespace {
{
TORRENT_ASSERT(is_single_thread());
if (ec && m_alerts.should_post<portmap_error_alert>())
if (ec)
{
m_alerts.emplace_alert<portmap_error_alert>(mapping
, transport, ec);
if (m_alerts.should_post<portmap_error_alert>())
{
m_alerts.emplace_alert<portmap_error_alert>(mapping
, transport, ec);
}
return;
}
// look through our listen sockets to see if this mapping is for one of
@ -5447,7 +5451,7 @@ namespace {
else (*ls)->udp_external_port = port;
}
if (!ec && m_alerts.should_post<portmap_alert>())
if (m_alerts.should_post<portmap_alert>())
{
m_alerts.emplace_alert<portmap_alert>(mapping, port
, transport, proto);