config.hpp   config.hpp 
skipping to change at line 199 skipping to change at line 199
#define TORRENT_USE_SYSCTL 1 #define TORRENT_USE_SYSCTL 1
#define TORRENT_USE_IFCONF 1 #define TORRENT_USE_IFCONF 1
// ==== LINUX === // ==== LINUX ===
#elif defined __linux__ #elif defined __linux__
#define TORRENT_LINUX #define TORRENT_LINUX
#define TORRENT_USE_IFADDRS 1 #define TORRENT_USE_IFADDRS 1
#define TORRENT_USE_NETLINK 1 #define TORRENT_USE_NETLINK 1
#define TORRENT_USE_IFCONF 1 #define TORRENT_USE_IFCONF 1
#define TORRENT_HAS_SALEN 0 #define TORRENT_HAS_SALEN 0
#define TORRENT_USE_POSIX_MEMALIGN 1
// ==== MINGW === // ==== MINGW ===
#elif defined __MINGW32__ #elif defined __MINGW32__
#define TORRENT_MINGW #define TORRENT_MINGW
#define TORRENT_WINDOWS #define TORRENT_WINDOWS
#ifndef TORRENT_USE_ICONV #ifndef TORRENT_USE_ICONV
#define TORRENT_USE_ICONV 0 #define TORRENT_USE_ICONV 0
#define TORRENT_USE_LOCALE 1 #define TORRENT_USE_LOCALE 1
#endif #endif
#define TORRENT_USE_RLIMIT 0 #define TORRENT_USE_RLIMIT 0
skipping to change at line 449 skipping to change at line 450
#if !defined TORRENT_IOV_MAX #if !defined TORRENT_IOV_MAX
#ifdef IOV_MAX #ifdef IOV_MAX
#define TORRENT_IOV_MAX IOV_MAX #define TORRENT_IOV_MAX IOV_MAX
#else #else
#define TORRENT_IOV_MAX INT_MAX #define TORRENT_IOV_MAX INT_MAX
#endif #endif
#endif #endif
#if !defined(TORRENT_READ_HANDLER_MAX_SIZE) #if !defined(TORRENT_READ_HANDLER_MAX_SIZE)
# define TORRENT_READ_HANDLER_MAX_SIZE 300 # ifdef _GLIBCXX_DEBUG
# define TORRENT_READ_HANDLER_MAX_SIZE 400
# else
# define TORRENT_READ_HANDLER_MAX_SIZE 300
# endif
#endif #endif
#if !defined(TORRENT_WRITE_HANDLER_MAX_SIZE) #if !defined(TORRENT_WRITE_HANDLER_MAX_SIZE)
# define TORRENT_WRITE_HANDLER_MAX_SIZE 300 # ifdef _GLIBCXX_DEBUG
# define TORRENT_WRITE_HANDLER_MAX_SIZE 400
# else
# define TORRENT_WRITE_HANDLER_MAX_SIZE 300
# endif
#endif #endif
#if defined _MSC_VER && _MSC_VER <= 1200 #if defined _MSC_VER && _MSC_VER <= 1200
#define for if (false) {} else for #define for if (false) {} else for
#endif #endif
#if TORRENT_BROKEN_UNIONS #if TORRENT_BROKEN_UNIONS
#define TORRENT_UNION struct #define TORRENT_UNION struct
#else #else
#define TORRENT_UNION union #define TORRENT_UNION union
 End of changes. 3 change blocks. 
2 lines changed or deleted 11 lines changed or added


 disk_buffer_pool.hpp   disk_buffer_pool.hpp 
skipping to change at line 41 skipping to change at line 41
*/ */
#ifndef TORRENT_DISK_BUFFER_POOL #ifndef TORRENT_DISK_BUFFER_POOL
#define TORRENT_DISK_BUFFER_POOL #define TORRENT_DISK_BUFFER_POOL
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
#include "libtorrent/thread.hpp" #include "libtorrent/thread.hpp"
#include "libtorrent/session_settings.hpp" #include "libtorrent/session_settings.hpp"
#include "libtorrent/allocator.hpp" #include "libtorrent/allocator.hpp"
#ifndef TORRENT_DISABLE_POOL_ALLOCATOR
#include <boost/pool/pool.hpp>
#endif
#ifdef TORRENT_DISK_STATS #ifdef TORRENT_DISK_STATS
#include <fstream> #include <fstream>
#endif #endif
#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
#include <map> #include <map>
#endif #endif
namespace libtorrent namespace libtorrent
{ {
skipping to change at line 104 skipping to change at line 100
// number of disk buffers currently allocated // number of disk buffers currently allocated
int m_in_use; int m_in_use;
session_settings m_settings; session_settings m_settings;
private: private:
mutable mutex m_pool_mutex; mutable mutex m_pool_mutex;
#ifndef TORRENT_DISABLE_POOL_ALLOCATOR
// memory pool for read and write operations
// and disk cache
boost::pool<page_aligned_allocator> m_pool;
#endif
#if defined TORRENT_DISK_STATS || defined TORRENT_STATS #if defined TORRENT_DISK_STATS || defined TORRENT_STATS
int m_allocations; int m_allocations;
#endif #endif
#ifdef TORRENT_DISK_STATS #ifdef TORRENT_DISK_STATS
public: public:
void rename_buffer(char* buf, char const* category); void rename_buffer(char* buf, char const* category);
protected: protected:
std::map<std::string, int> m_categories; std::map<std::string, int> m_categories;
std::map<char*, std::string> m_buf_to_category; std::map<char*, std::string> m_buf_to_category;
std::ofstream m_log; std::ofstream m_log;
 End of changes. 2 change blocks. 
10 lines changed or deleted 0 lines changed or added


 msg.hpp   msg.hpp 
skipping to change at line 49 skipping to change at line 49
#if BOOST_VERSION < 103500 #if BOOST_VERSION < 103500
#include <asio/ip/udp.hpp> #include <asio/ip/udp.hpp>
#else #else
#include <boost/asio/ip/udp.hpp> #include <boost/asio/ip/udp.hpp>
#endif #endif
namespace libtorrent { namespace libtorrent {
namespace dht { namespace dht {
typedef std::vector<char> packet_t; typedef std::vector<char> packet_t;
/*
namespace messages
{
enum { ping = 0, find_node = 1, get_peers = 2, announce_peer = 3, er
ror = 4 };
char const* const ids[] = { "ping", "find_node", "get_peers", "annou
nce_peer", "error" };
} // namespace messages
struct msg
{
msg()
: reply(false)
, message_id(-1)
, port(0)
{}
// true if this message is a reply
bool reply;
// the kind if message
int message_id;
// if this is a reply, a copy of the transaction id
// from the request. If it's a request, a transaction
// id that should be sent back in the reply
std::string transaction_id;
// the node id of the process sending the message
node_id id;
// the address of the process sending or receiving
// the message.
udp::endpoint addr;
// if this is a nodes response, these are the nodes
nodes_t nodes;
peers_t peers;
// similar to transaction_id but for write operations.
std::string write_token;
// the info has for peer_requests, announce_peer
// and responses
node_id info_hash;
// port for announce_peer messages
int port;
// ERROR MESSAGES
int error_code;
std::string error_msg;
};
*/
typedef std::vector<node_entry> nodes_t; typedef std::vector<node_entry> nodes_t;
typedef std::vector<tcp::endpoint> peers_t; typedef std::vector<tcp::endpoint> peers_t;
struct msg struct msg
{ {
msg(lazy_entry const& m, udp::endpoint const& ep): message(m), addr( ep) {} msg(lazy_entry const& m, udp::endpoint const& ep): message(m), addr( ep) {}
// the message // the message
lazy_entry const& message; lazy_entry const& message;
// the address of the process sending or receiving // the address of the process sending or receiving
 End of changes. 1 change blocks. 
51 lines changed or deleted 0 lines changed or added


 piece_picker.hpp   piece_picker.hpp 
skipping to change at line 448 skipping to change at line 448
#else #else
max_peer_count = 0xffff max_peer_count = 0xffff
#endif #endif
}; };
bool have() const { return index == we_have_index; } bool have() const { return index == we_have_index; }
void set_have() { index = we_have_index; TORRENT_ASS ERT(have()); } void set_have() { index = we_have_index; TORRENT_ASS ERT(have()); }
void set_not_have() { index = 0; TORRENT_ASSERT(!hav e()); } void set_not_have() { index = 0; TORRENT_ASSERT(!hav e()); }
bool filtered() const { return piece_priority == fil ter_priority; } bool filtered() const { return piece_priority == fil ter_priority; }
void filtered(bool f) { piece_priority = f ? filter_ priority : 0; }
// prio 7 is always top priority // prio 7 is always top priority
// prio 0 is always -1 (don't pick) // prio 0 is always -1 (don't pick)
// downloading pieces are always on an even prio_fa ctor priority // downloading pieces are always on an even prio_fa ctor priority
// //
// availability x, downloading // availability x, downloading
// | availability x, prio 3; availability 2x, pr io 6 // | availability x, prio 3; availability 2x, pr io 6
// | | availability x, prio 2; availability 2x , prio 5 // | | availability x, prio 2; availability 2x , prio 5
// | | | availability x, prio 1; availabilit y 2x, prio 4 // | | | availability x, prio 1; availabilit y 2x, prio 4
// | | | | // | | | |
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 torrent_info.hpp   torrent_info.hpp 
skipping to change at line 85 skipping to change at line 85
}; };
TORRENT_EXTRA_EXPORT int merkle_num_leafs(int); TORRENT_EXTRA_EXPORT int merkle_num_leafs(int);
TORRENT_EXTRA_EXPORT int merkle_num_nodes(int); TORRENT_EXTRA_EXPORT int merkle_num_nodes(int);
TORRENT_EXTRA_EXPORT int merkle_get_parent(int); TORRENT_EXTRA_EXPORT int merkle_get_parent(int);
TORRENT_EXTRA_EXPORT int merkle_get_sibling(int); TORRENT_EXTRA_EXPORT int merkle_get_sibling(int);
struct TORRENT_EXPORT announce_entry struct TORRENT_EXPORT announce_entry
{ {
announce_entry(std::string const& u); announce_entry(std::string const& u);
announce_entry();
~announce_entry(); ~announce_entry();
// tracker URL as it appeared in the torrent file // tracker URL as it appeared in the torrent file
std::string url; std::string url;
std::string trackerid; std::string trackerid;
// if this tracker has returned an error or warning message // if this tracker has returned an error or warning message
// that message is stored here // that message is stored here
std::string message; std::string message;
 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 16 #define LIBTORRENT_VERSION_MINOR 16
#define LIBTORRENT_VERSION_TINY 9 #define LIBTORRENT_VERSION_TINY 10
// the format of this version is: MMmmtt // the format of this version is: MMmmtt
// M = Major version, m = minor version, t = tiny version // M = Major version, m = minor version, t = tiny version
#define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTO RRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY) #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTO RRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
#define LIBTORRENT_VERSION "0.16.9.0" #define LIBTORRENT_VERSION "0.16.10.0"
#define LIBTORRENT_REVISION "$Rev: 8143 $" #define LIBTORRENT_REVISION "$Rev: 8403 $"
#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/