From fcff3e0e00e2ec090cb2349b0ce41ba1823c9792 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 29 May 2013 02:11:15 +0000 Subject: [PATCH] merged bootstrap.sh script from RC_0_16 --- ChangeLog | 1 + bootstrap.sh | 5 +++++ src/peer_connection.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 bootstrap.sh diff --git a/ChangeLog b/ChangeLog index f51266df0..45fcb7971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * fix uTP edge case where udp socket buffer fills up * fix nagle implementation in uTP + * add bootstrap.sh to generage configure script and run configure * fix bug in SOCK5 UDP support * fix issue where torrents added by URL would not be started immediately diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 000000000..3920cec85 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +./autotool.sh +./configure $@ + diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp index f5fb340f9..556770259 100644 --- a/src/peer_connection.cpp +++ b/src/peer_connection.cpp @@ -319,6 +319,7 @@ namespace libtorrent return m_last_unchoke < rhs.m_last_unchoke; } + // return true if 'this' peer should be preferred to be unchoke over p bool peer_connection::unchoke_compare(boost::intrusive_ptr const& p) const { TORRENT_ASSERT(p); @@ -401,7 +402,6 @@ namespace libtorrent if (score2 > score1) return false; } - // if both peers have are still in their send quota or not in their send quota // prioritize the one that has waited the longest to be unchoked return m_last_unchoke < rhs.m_last_unchoke; }