lt sync 2049

This commit is contained in:
Andrew Resch 2008-03-08 23:38:26 +00:00
parent 569fba5b5f
commit 4087576905
3 changed files with 5 additions and 7 deletions

View File

@ -34,6 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
#if defined TORRENT_BSD || defined TORRENT_LINUX #if defined TORRENT_BSD || defined TORRENT_LINUX
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#elif defined TORRENT_WINDOWS #elif defined TORRENT_WINDOWS

View File

@ -502,10 +502,7 @@ namespace libtorrent
= transferred_amount / (connected_time_in_seconds + 1); = transferred_amount / (connected_time_in_seconds + 1);
// prefer to disconnect uninteresting peers, and secondly slow peers // prefer to disconnect uninteresting peers, and secondly slow peers
if (transfer_rate <= slowest_transfer_rate if (transfer_rate <= slowest_transfer_rate)
|| (disconnect_peer != m_peers.end()
&& disconnect_peer->second.connection->is_interesting()
&& !c->is_interesting()))
{ {
slowest_transfer_rate = transfer_rate; slowest_transfer_rate = transfer_rate;
disconnect_peer = i; disconnect_peer = i;

View File

@ -583,7 +583,7 @@ namespace libtorrent
for (torrent_info::file_iterator i = m_info->begin_files(true) for (torrent_info::file_iterator i = m_info->begin_files(true)
, end(m_info->end_files(true)); i != end; ++i, ++fs) , end(m_info->end_files(true)); i != end; ++i, ++fs)
{ {
std::cerr << "filesize: " << i->size << std::endl; //std::cerr << "filesize: " << i->size << std::endl;
if (i->size != fs->first) if (i->size != fs->first)
{ {
error = "file size for '" + i->path.native_file_string() error = "file size for '" + i->path.native_file_string()
@ -1150,14 +1150,14 @@ namespace libtorrent
for (last = m_slot_to_piece.rbegin(); for (last = m_slot_to_piece.rbegin();
last != m_slot_to_piece.rend(); ++last) last != m_slot_to_piece.rend(); ++last)
{ {
if (*last != unallocated && have[*last]) break; if (*last != unallocated) break;
} }
for (std::vector<int>::const_iterator i = for (std::vector<int>::const_iterator i =
m_slot_to_piece.begin(); m_slot_to_piece.begin();
i != last.base(); ++i) i != last.base(); ++i)
{ {
p.push_back((*i >= 0 && have[*i]) ? *i : unassigned); p.push_back((*i >= 0) ? *i : unassigned);
} }
} }
else else