merged udp socket fix

This commit is contained in:
Arvid Norberg 2012-09-27 17:39:41 +00:00
parent 2f985de420
commit 19e4cbec46
2 changed files with 4 additions and 2 deletions

View File

@ -4089,14 +4089,14 @@ namespace aux {
{ {
--hard_limit; --hard_limit;
--type_limit; --type_limit;
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING || defined TORRENT_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
t->log_to_all_peers(("AUTO MANAGER STARTING TORRENT: " + t->torrent_file().name()).c_str()); t->log_to_all_peers(("AUTO MANAGER STARTING TORRENT: " + t->torrent_file().name()).c_str());
#endif #endif
t->set_allow_peers(true); t->set_allow_peers(true);
} }
else else
{ {
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING || defined TORRENT_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
t->log_to_all_peers(("AUTO MANAGER PAUSING TORRENT: " + t->torrent_file().name()).c_str()); t->log_to_all_peers(("AUTO MANAGER PAUSING TORRENT: " + t->torrent_file().name()).c_str());
#endif #endif
// use graceful pause for auto-managed torrents // use graceful pause for auto-managed torrents

View File

@ -385,6 +385,8 @@ void udp_socket::on_read_impl(udp::socket* s, udp::endpoint const& ep
&& e != asio::error::connection_refused && e != asio::error::connection_refused
&& e != asio::error::connection_aborted && e != asio::error::connection_aborted
&& e != asio::error::operation_aborted && e != asio::error::operation_aborted
&& e != asio::error::network_reset
&& e != asio::error::network_unreachable
#ifdef WIN32 #ifdef WIN32
// ERROR_MORE_DATA means the same thing as EMSGSIZE // ERROR_MORE_DATA means the same thing as EMSGSIZE
&& e != error_code(ERROR_MORE_DATA, get_system_category()) && e != error_code(ERROR_MORE_DATA, get_system_category())