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

more fixes to avoid unwanted exceptions

This commit is contained in:
Arvid Norberg 2008-10-23 04:10:23 +00:00
parent d298ccdd76
commit 392dbb71da
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/peer_connection.cpp
View File

@ -155,7 +155,8 @@ namespace libtorrent
#endif #endif
#endif #endif
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
m_logger = m_ses.create_log(m_remote.address().to_string() + "_" error_code ec;
m_logger = m_ses.create_log(m_remote.address().to_string(ec) + "_"
+ boost::lexical_cast<std::string>(m_remote.port()), m_ses.listen_port()); + boost::lexical_cast<std::string>(m_remote.port()), m_ses.listen_port());
(*m_logger) << "*** OUTGOING CONNECTION\n"; (*m_logger) << "*** OUTGOING CONNECTION\n";
#endif #endif
@ -2423,7 +2424,8 @@ namespace libtorrent
{ {
TORRENT_ASSERT(m_connecting); TORRENT_ASSERT(m_connecting);
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
(*m_ses.m_logger) << time_now_string() << " CONNECTION TIMED OUT: " << m_remote.address().to_string() error_code ec;
(*m_ses.m_logger) << time_now_string() << " CONNECTION TIMED OUT: " << m_remote.address().to_string(ec)
<< "\n"; << "\n";
#endif #endif
disconnect("timed out: connect", 1); disconnect("timed out: connect", 1);
@ -3709,10 +3711,11 @@ namespace libtorrent
m_connecting = false; m_connecting = false;
m_ses.m_half_open.done(m_connection_ticket); m_ses.m_half_open.done(m_connection_ticket);
error_code ec;
if (e) if (e)
{ {
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
(*m_ses.m_logger) << time_now_string() << " CONNECTION FAILED: " << m_remote.address().to_string() (*m_ses.m_logger) << time_now_string() << " CONNECTION FAILED: " << m_remote.address().to_string(ec)
<< ": " << e.message() << "\n"; << ": " << e.message() << "\n";
#endif #endif
disconnect(e.message().c_str(), 1); disconnect(e.message().c_str(), 1);
@ -3728,11 +3731,10 @@ namespace libtorrent
TORRENT_ASSERT(m_socket); TORRENT_ASSERT(m_socket);
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
(*m_ses.m_logger) << time_now_string() << " COMPLETED: " << m_remote.address().to_string() (*m_ses.m_logger) << time_now_string() << " COMPLETED: " << m_remote.address().to_string(ec)
<< " rtt = " << m_rtt << "\n"; << " rtt = " << m_rtt << "\n";
#endif #endif
error_code ec;
if (m_remote == m_socket->local_endpoint(ec)) if (m_remote == m_socket->local_endpoint(ec))
{ {
// if the remote endpoint is the same as the local endpoint, we're connected // if the remote endpoint is the same as the local endpoint, we're connected

3
src/policy.cpp
View File

@ -825,7 +825,8 @@ namespace libtorrent
// to this peer. don't connect to // to this peer. don't connect to
// it again. // it again.
m_torrent->debug_log("already connected to peer: " + remote.address().to_string() + ":" error_code ec;
m_torrent->debug_log("already connected to peer: " + remote.address().to_string(ec) + ":"
+ boost::lexical_cast<std::string>(remote.port()) + " " + boost::lexical_cast<std::string>(remote.port()) + " "
+ boost::lexical_cast<std::string>(i->second.connection->pid())); + boost::lexical_cast<std::string>(i->second.connection->pid()));

3
src/torrent.cpp
View File

@ -1088,7 +1088,8 @@ namespace libtorrent
if (m_ses.m_ip_filter.access(host->endpoint().address()) & ip_filter::blocked) if (m_ses.m_ip_filter.access(host->endpoint().address()) & ip_filter::blocked)
{ {
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
debug_log("blocked ip from tracker: " + host->endpoint().address().to_string()); error_code ec;
debug_log("blocked ip from tracker: " + host->endpoint().address().to_string(ec));
#endif #endif
if (m_ses.m_alerts.should_post<peer_blocked_alert>()) if (m_ses.m_alerts.should_post<peer_blocked_alert>())
{ {