From ff2063651b8576a82b4cf132be24fdc0b4d4aa78 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Thu, 3 Dec 2009 17:44:11 +0000 Subject: [PATCH] build fixes --- include/libtorrent/aux_/session_impl.hpp | 3 ++- src/http_tracker_connection.cpp | 4 ++-- src/torrent.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/libtorrent/aux_/session_impl.hpp b/include/libtorrent/aux_/session_impl.hpp index dea17abec..722305728 100644 --- a/include/libtorrent/aux_/session_impl.hpp +++ b/include/libtorrent/aux_/session_impl.hpp @@ -771,6 +771,7 @@ namespace libtorrent , std::list
const& ip_list , std::vector& peers , int interval + , int min_interval , int complete , int incomplete , address const& external_ip) @@ -778,7 +779,7 @@ namespace libtorrent std::string s; s = "TRACKER RESPONSE:\n"; char tmp[200]; - snprintf(tmp, 200, "interval: %d\npeers:\n", interval); + snprintf(tmp, 200, "interval: %d\nmin_interval: %d\npeers:\n", interval, min_interval); s += tmp; for (std::vector::const_iterator i = peers.begin(); i != peers.end(); ++i) diff --git a/src/http_tracker_connection.cpp b/src/http_tracker_connection.cpp index 3ead8b045..90861d77d 100644 --- a/src/http_tracker_connection.cpp +++ b/src/http_tracker_connection.cpp @@ -408,7 +408,7 @@ namespace libtorrent { char const* peers = peers_ent->string_ptr(); int len = peers_ent->string_length(); - for (int i = 0; i < len; ++i) + for (int i = 0; i < len; i += 6) { if (len - i < 6) break; @@ -442,7 +442,7 @@ namespace libtorrent { char const* peers = ipv6_peers->string_ptr(); int len = ipv6_peers->string_length(); - for (int i = 0; i < len; ++i) + for (int i = 0; i < len; i += 18) { if (len - i < 18) break; diff --git a/src/torrent.cpp b/src/torrent.cpp index fd3d2f4ef..5dd349127 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -762,7 +762,7 @@ namespace libtorrent #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING (*m_ses.m_logger) << "fastresume data for " << torrent_file().name() << " rejected: " - << ev.message() << "\n"; + << error_code(ev, get_libtorrent_category()).message() << "\n"; #endif std::vector().swap(m_resume_data); lazy_entry().swap(m_resume_entry);