config.hpp   config.hpp 
skipping to change at line 87 skipping to change at line 87
#define TORRENT_BSD #define TORRENT_BSD
#elif defined __linux__ #elif defined __linux__
#define TORRENT_LINUX #define TORRENT_LINUX
#elif defined __MINGW32__ #elif defined __MINGW32__
#define TORRENT_MINGW #define TORRENT_MINGW
#define TORRENT_WINDOWS #define TORRENT_WINDOWS
#elif defined WIN32 #elif defined WIN32
#define TORRENT_WINDOWS #define TORRENT_WINDOWS
#elif defined sun || defined __sun #elif defined sun || defined __sun
#define TORRENT_SOLARIS #define TORRENT_SOLARIS
#define TORRENT_COMPLETE_TYPES_REQUIRED 1
#else #else
#warning unknown OS, assuming BSD #warning unknown OS, assuming BSD
#define TORRENT_BSD #define TORRENT_BSD
#endif #endif
#if defined TORRENT_BSD || defined TORRENT_LINUX || defined TORRENT_SOLARIS #if defined TORRENT_BSD || defined TORRENT_LINUX || defined TORRENT_SOLARIS
#define TORRENT_USE_RLIMIT 1 #define TORRENT_USE_RLIMIT 1
#else #else
#define TORRENT_USE_RLIMIT 0 #define TORRENT_USE_RLIMIT 0
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 entry.hpp   entry.hpp 
skipping to change at line 184 skipping to change at line 184
protected: protected:
void construct(data_type t); void construct(data_type t);
void copy(const entry& e); void copy(const entry& e);
void destruct(); void destruct();
private: private:
data_type m_type; data_type m_type;
#if defined(_MSC_VER) && _MSC_VER < 1310 #if (defined(_MSC_VER) && _MSC_VER < 1310) || TORRENT_COMPLETE_TYPES_REQUIR ED
// workaround for msvc-bug. // workaround for msvc-bug.
// assumes sizeof(map<string, char>) == sizeof(map<string, e ntry>) // assumes sizeof(map<string, char>) == sizeof(map<string, e ntry>)
// and sizeof(list<char>) == sizeof(list<entry>) // and sizeof(list<char>) == sizeof(list<entry>)
union union
{ {
char data[ char data[
detail::max4<sizeof(std::list<char>) detail::max4<sizeof(std::list<char>)
, sizeof(std::map<std::string, char>) , sizeof(std::map<std::string, char>)
, sizeof(string_type) , sizeof(string_type)
, sizeof(integer_type)>::value]; , sizeof(integer_type)>::value];
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 piece_picker.hpp   piece_picker.hpp 
skipping to change at line 189 skipping to change at line 189
// it means that the refcounter will indicate that // it means that the refcounter will indicate that
// we are not interested in this piece anymore // we are not interested in this piece anymore
// (i.e. we don't have to maintain a refcount) // (i.e. we don't have to maintain a refcount)
void we_have(int index); void we_have(int index);
void we_dont_have(int index); void we_dont_have(int index);
int cursor() const { return m_cursor; } int cursor() const { return m_cursor; }
int reverse_cursor() const { return m_reverse_cursor; } int reverse_cursor() const { return m_reverse_cursor; }
// sets all pieces to dont-have // sets all pieces to dont-have
void init(int blocks_per_piece, int total_num_blocks); void init(int blocks_per_piece, int blocks_in_last_piece, in t total_num_pieces);
int num_pieces() const { return int(m_piece_map.size()); } int num_pieces() const { return int(m_piece_map.size()); }
bool have_piece(int index) const bool have_piece(int index) const
{ {
TORRENT_ASSERT(index >= 0); TORRENT_ASSERT(index >= 0);
TORRENT_ASSERT(index < int(m_piece_map.size())); TORRENT_ASSERT(index < int(m_piece_map.size()));
return m_piece_map[index].index == piece_pos::we_hav e_index; return m_piece_map[index].index == piece_pos::we_hav e_index;
} }
// sets the priority of a piece. // sets the priority of a piece.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 session_impl.hpp   session_impl.hpp 
skipping to change at line 88 skipping to change at line 88
#include "libtorrent/session.hpp" #include "libtorrent/session.hpp"
#include "libtorrent/stat.hpp" #include "libtorrent/stat.hpp"
#include "libtorrent/file_pool.hpp" #include "libtorrent/file_pool.hpp"
#include "libtorrent/bandwidth_manager.hpp" #include "libtorrent/bandwidth_manager.hpp"
#include "libtorrent/socket_type.hpp" #include "libtorrent/socket_type.hpp"
#include "libtorrent/connection_queue.hpp" #include "libtorrent/connection_queue.hpp"
#include "libtorrent/disk_io_thread.hpp" #include "libtorrent/disk_io_thread.hpp"
#include "libtorrent/assert.hpp" #include "libtorrent/assert.hpp"
#include "libtorrent/udp_socket.hpp" #include "libtorrent/udp_socket.hpp"
#if TORRENT_COMPLETE_TYPES_REQUIRED
#include "libtorrent/peer_connection.hpp"
#endif
namespace libtorrent namespace libtorrent
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
class peer_connection; class peer_connection;
class upnp; class upnp;
class natpmp; class natpmp;
class lsd; class lsd;
class fingerprint; class fingerprint;
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 session_settings.hpp   session_settings.hpp 
skipping to change at line 137 skipping to change at line 137
, outgoing_ports(0,0) , outgoing_ports(0,0)
, peer_tos(0) , peer_tos(0)
, active_downloads(8) , active_downloads(8)
, active_seeds(5) , active_seeds(5)
, active_limit(15) , active_limit(15)
, dont_count_slow_torrents(true) , dont_count_slow_torrents(true)
, auto_manage_interval(30) , auto_manage_interval(30)
, share_ratio_limit(2.f) , share_ratio_limit(2.f)
, seed_time_ratio_limit(7.f) , seed_time_ratio_limit(7.f)
, seed_time_limit(24 * 60 * 60) // 24 hours , seed_time_limit(24 * 60 * 60) // 24 hours
, peer_turnover(1 / 50.f) , peer_turnover(1 / 100.f)
, peer_turnover_cutoff(1.f) , peer_turnover_cutoff(1.1f) // disable until the cr
ash is resolved
, close_redundant_connections(true) , close_redundant_connections(true)
, auto_scrape_interval(1800) , auto_scrape_interval(1800)
, auto_scrape_min_interval(300) , auto_scrape_min_interval(300)
, max_peerlist_size(8000) , max_peerlist_size(8000)
, min_announce_interval(5 * 60) , min_announce_interval(5 * 60)
, prioritize_partial_pieces(false) , prioritize_partial_pieces(false)
, auto_manage_startup(120) , auto_manage_startup(120)
, rate_limit_ip_overhead(true) , rate_limit_ip_overhead(true)
{} {}
 End of changes. 1 change blocks. 
2 lines changed or deleted 3 lines changed or added


 torrent.hpp   torrent.hpp 
skipping to change at line 75 skipping to change at line 75
#include "libtorrent/piece_picker.hpp" #include "libtorrent/piece_picker.hpp"
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
#include "libtorrent/escape_string.hpp" #include "libtorrent/escape_string.hpp"
#include "libtorrent/bandwidth_limit.hpp" #include "libtorrent/bandwidth_limit.hpp"
#include "libtorrent/bandwidth_queue_entry.hpp" #include "libtorrent/bandwidth_queue_entry.hpp"
#include "libtorrent/storage.hpp" #include "libtorrent/storage.hpp"
#include "libtorrent/hasher.hpp" #include "libtorrent/hasher.hpp"
#include "libtorrent/assert.hpp" #include "libtorrent/assert.hpp"
#include "libtorrent/bitfield.hpp" #include "libtorrent/bitfield.hpp"
#if TORRENT_COMPLETE_TYPES_REQUIRED
#include "libtorrent/peer_connection.hpp"
#endif
namespace libtorrent namespace libtorrent
{ {
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
struct logger; struct logger;
#endif #endif
class piece_manager; class piece_manager;
struct torrent_plugin; struct torrent_plugin;
struct bitfield; struct bitfield;
skipping to change at line 495 skipping to change at line 499
} }
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
else else
{ {
TORRENT_ASSERT(is_seed()); TORRENT_ASSERT(is_seed());
} }
#endif #endif
} }
int block_size() const { TORRENT_ASSERT(m_block_size > 0); r eturn m_block_size; } int block_size() const { TORRENT_ASSERT(m_block_size > 0); r eturn m_block_size; }
peer_request to_req(piece_block const& p); peer_request to_req(piece_block const& p) const;
void disconnect_all(); void disconnect_all();
int disconnect_peers(int num); int disconnect_peers(int num);
// this is called wheh the torrent has completed // this is called wheh the torrent has completed
// the download. It will post an event, disconnect // the download. It will post an event, disconnect
// all seeds and let the tracker know we're finished. // all seeds and let the tracker know we're finished.
void completed(); void completed();
// this is the asio callback that is called when a name // this is the asio callback that is called when a name
skipping to change at line 654 skipping to change at line 658
// of the storage. // of the storage.
// a return value of false indicates an error // a return value of false indicates an error
bool set_metadata(lazy_entry const& metadata, std::string& e rror); bool set_metadata(lazy_entry const& metadata, std::string& e rror);
int sequence_number() const { return m_sequence_number; } int sequence_number() const { return m_sequence_number; }
private: private:
void on_files_deleted(int ret, disk_io_job const& j); void on_files_deleted(int ret, disk_io_job const& j);
void on_files_released(int ret, disk_io_job const& j); void on_files_released(int ret, disk_io_job const& j);
void on_torrent_aborted(int ret, disk_io_job const& j);
void on_torrent_paused(int ret, disk_io_job const& j); void on_torrent_paused(int ret, disk_io_job const& j);
void on_storage_moved(int ret, disk_io_job const& j); void on_storage_moved(int ret, disk_io_job const& j);
void on_save_resume_data(int ret, disk_io_job const& j); void on_save_resume_data(int ret, disk_io_job const& j);
void on_file_renamed(int ret, disk_io_job const& j); void on_file_renamed(int ret, disk_io_job const& j);
void on_piece_verified(int ret, disk_io_job const& j void on_piece_verified(int ret, disk_io_job const& j
, boost::function<void(int)> f); , boost::function<void(int)> f);
void try_next_tracker(tracker_request const& req); void try_next_tracker(tracker_request const& req);
int prioritize_tracker(int tracker_index); int prioritize_tracker(int tracker_index);
 End of changes. 3 change blocks. 
1 lines changed or deleted 6 lines changed or added


 tracker_manager.hpp   tracker_manager.hpp 
skipping to change at line 156 skipping to change at line 156
struct TORRENT_EXPORT timeout_handler struct TORRENT_EXPORT timeout_handler
: intrusive_ptr_base<timeout_handler> : intrusive_ptr_base<timeout_handler>
, boost::noncopyable , boost::noncopyable
{ {
timeout_handler(io_service& str); timeout_handler(io_service& str);
void set_timeout(int completion_timeout, int read_timeout); void set_timeout(int completion_timeout, int read_timeout);
void restart_read_timeout(); void restart_read_timeout();
void cancel(); void cancel();
bool cancelled() const { return m_abort; }
virtual void on_timeout() = 0; virtual void on_timeout() = 0;
virtual ~timeout_handler() {} virtual ~timeout_handler() {}
private: private:
void timeout_callback(error_code const&); void timeout_callback(error_code const&);
boost::intrusive_ptr<timeout_handler> self() boost::intrusive_ptr<timeout_handler> self()
{ return boost::intrusive_ptr<timeout_handler>(this); } { return boost::intrusive_ptr<timeout_handler>(this); }
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 version.hpp   version.hpp 
skipping to change at line 38 skipping to change at line 38
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef TORRENT_VERSION_HPP_INCLUDED #ifndef TORRENT_VERSION_HPP_INCLUDED
#define TORRENT_VERSION_HPP_INCLUDED #define TORRENT_VERSION_HPP_INCLUDED
#define LIBTORRENT_VERSION_MAJOR 0 #define LIBTORRENT_VERSION_MAJOR 0
#define LIBTORRENT_VERSION_MINOR 14 #define LIBTORRENT_VERSION_MINOR 14
#define LIBTORRENT_VERSION_TINY 9 #define LIBTORRENT_VERSION_TINY 10
#define LIBTORRENT_VERSION "0.14.9.0" #define LIBTORRENT_VERSION "0.14.10.0"
#define LIBTORRENT_REVISION "$Rev: 4192 $" #define LIBTORRENT_REVISION "$Rev: 4387 $"
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/