bencode.hpp   bencode.hpp 
skipping to change at line 100 skipping to change at line 100
{ {
template <class OutIt> template <class OutIt>
int write_string(OutIt& out, const std::string& val) int write_string(OutIt& out, const std::string& val)
{ {
for (std::string::const_iterator i = val.begin() for (std::string::const_iterator i = val.begin()
, end(val.end()); i != end; ++i) , end(val.end()); i != end; ++i)
*out++ = *i; *out++ = *i;
return int(val.length()); return int(val.length());
} }
TORRENT_EXTRA_EXPORT char const* integer_to_str(char* buf, i // this is used in the template, so it must be available to
nt size, entry::integer_type val); the client
TORRENT_EXPORT char const* integer_to_str(char* buf, int siz
e
, entry::integer_type val);
template <class OutIt> template <class OutIt>
int write_integer(OutIt& out, entry::integer_type val) int write_integer(OutIt& out, entry::integer_type val)
{ {
// the stack allocated buffer for keeping the // the stack allocated buffer for keeping the
// decimal representation of the number can // decimal representation of the number can
// not hold number bigger than this: // not hold number bigger than this:
BOOST_STATIC_ASSERT(sizeof(entry::integer_type) <= 8 ); BOOST_STATIC_ASSERT(sizeof(entry::integer_type) <= 8 );
char buf[21]; char buf[21];
int ret = 0; int ret = 0;
 End of changes. 1 change blocks. 
2 lines changed or deleted 5 lines changed or added


 error_code.hpp   error_code.hpp 
skipping to change at line 272 skipping to change at line 272
reserved188, reserved188,
reserved189, reserved189,
// bdecode errors // bdecode errors
expected_string, // 190 expected_string, // 190
expected_colon, expected_colon,
unexpected_eof, unexpected_eof,
expected_value, expected_value,
depth_exceeded, depth_exceeded,
limit_exceeded, limit_exceeded,
overflow,
error_code_max error_code_max
}; };
enum http_errors enum http_errors
{ {
cont = 100, cont = 100,
ok = 200, ok = 200,
created = 201, created = 201,
accepted = 202, accepted = 202,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 file_storage.hpp   file_storage.hpp 
skipping to change at line 81 skipping to change at line 81
// it's smaller and optimized for smaller memory // it's smaller and optimized for smaller memory
// footprint, as opposed to file_entry, which is // footprint, as opposed to file_entry, which is
// optimized for convenience // optimized for convenience
struct TORRENT_EXPORT internal_file_entry struct TORRENT_EXPORT internal_file_entry
{ {
friend class file_storage; friend class file_storage;
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
// for torrent_info::invariant_check // for torrent_info::invariant_check
friend class torrent_info; friend class torrent_info;
#endif #endif
enum { no_symlink_idx = 0xffff };
internal_file_entry() internal_file_entry()
: name(0) : name(0)
, offset(0) , offset(0)
, symlink_index(-1) , symlink_index(no_symlink_idx)
, size(0) , size(0)
, name_len(0) , name_len(0)
, pad_file(false) , pad_file(false)
, hidden_attribute(false) , hidden_attribute(false)
, executable_attribute(false) , executable_attribute(false)
, symlink_attribute(false) , symlink_attribute(false)
, no_root_dir(false) , no_root_dir(false)
, path_index(-1) , path_index(-1)
{} {}
internal_file_entry(file_entry const& e) internal_file_entry(file_entry const& e)
: name(0) : name(0)
, offset(e.offset) , offset(e.offset)
, symlink_index(-1) , symlink_index(no_symlink_idx)
, size(e.size) , size(e.size)
, name_len(0) , name_len(0)
, pad_file(e.pad_file) , pad_file(e.pad_file)
, hidden_attribute(e.hidden_attribute) , hidden_attribute(e.hidden_attribute)
, executable_attribute(e.executable_attribute) , executable_attribute(e.executable_attribute)
, symlink_attribute(e.symlink_attribute) , symlink_attribute(e.symlink_attribute)
, no_root_dir(false) , no_root_dir(false)
, path_index(-1) , path_index(-1)
{ {
set_name(e.path.c_str()); set_name(e.path.c_str());
skipping to change at line 131 skipping to change at line 133
&& !defined TORRENT_LOGGING \ && !defined TORRENT_LOGGING \
&& !defined TORRENT_ERROR_LOGGING && !defined TORRENT_ERROR_LOGGING
private: private:
#endif #endif
// This string is not necessarily null terminated! // This string is not necessarily null terminated!
// that's why it's private, to keep people away from it // that's why it's private, to keep people away from it
char const* name; char const* name;
public: public:
// the offset of this file inside the torrent // the offset of this file inside the torrent
size_type offset:48; boost::uint64_t offset:48;
// index into file_storage::m_symlinks or -1 // index into file_storage::m_symlinks or -1
// if this is not a symlink // if this is not a symlink
size_type symlink_index:16; boost::uint64_t symlink_index:16;
// the size of this file // the size of this file
size_type size:48; boost::uint64_t size:48;
// the number of characters in the name. If this is // the number of characters in the name. If this is
// 0, name is null terminated and owned by this object // 0, name is null terminated and owned by this object
// (i.e. it should be freed in the destructor). If // (i.e. it should be freed in the destructor). If
// the len is > 0, the name pointer doesn not belong // the len is > 0, the name pointer doesn not belong
// to this object, and it's not null terminated // to this object, and it's not null terminated
size_type name_len:10; size_type name_len:10;
bool pad_file:1; bool pad_file:1;
bool hidden_attribute:1; bool hidden_attribute:1;
bool executable_attribute:1; bool executable_attribute:1;
 End of changes. 6 change blocks. 
5 lines changed or deleted 7 lines changed or added


 peer_connection.hpp   peer_connection.hpp 
skipping to change at line 1020 skipping to change at line 1020
// once the connection completes // once the connection completes
int m_connection_ticket; int m_connection_ticket;
// if this is -1, superseeding is not active. If it is >= 0 // if this is -1, superseeding is not active. If it is >= 0
// this is the piece that is available to this peer. Only // this is the piece that is available to this peer. Only
// this piece can be downloaded from us by this peer. // this piece can be downloaded from us by this peer.
// This will remain the current piece for this peer until // This will remain the current piece for this peer until
// another peer sends us a have message for this piece // another peer sends us a have message for this piece
int m_superseed_piece; int m_superseed_piece;
// bytes downloaded since last second // pieces downloaded since last second
// timer timeout; used for determining // timer timeout; used for determining
// approx download rate // approx download rate
int m_remote_bytes_dled; int m_remote_pieces_dled;
// approximate peer download rate // approximate peer download rate
int m_remote_dl_rate; int m_remote_dl_rate;
// the number of bytes send to the disk-io // the number of bytes send to the disk-io
// thread that hasn't yet been completely written. // thread that hasn't yet been completely written.
int m_outstanding_writing_bytes; int m_outstanding_writing_bytes;
// max transfer rates seen on this peer // max transfer rates seen on this peer
int m_download_rate_peak; int m_download_rate_peak;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 session_settings.hpp   session_settings.hpp 
skipping to change at line 858 skipping to change at line 858
// does not throttle uTP, throttles TCP to the same proportion // does not throttle uTP, throttles TCP to the same proportion
// of throughput as there are TCP connections // of throughput as there are TCP connections
peer_proportional = 1 peer_proportional = 1
}; };
// the algorithm to use to balance bandwidth between tcp // the algorithm to use to balance bandwidth between tcp
// connections and uTP connections // connections and uTP connections
int mixed_mode_algorithm; int mixed_mode_algorithm;
// set to true if uTP connections should be rate limited // set to true if uTP connections should be rate limited
// defaults to false // defaults to true.
bool rate_limit_utp; bool rate_limit_utp;
// this is the number passed in to listen(). i.e. // this is the number passed in to listen(). i.e.
// the number of connections to accept while we're // the number of connections to accept while we're
// not waiting in an accept() call. // not waiting in an accept() call.
int listen_queue_size; int listen_queue_size;
// if this is true, the &ip= argument in tracker requests // if this is true, the &ip= argument in tracker requests
// (unless otherwise specified) will be set to the intermedi ate // (unless otherwise specified) will be set to the intermedi ate
// IP address if the user is double NATed. If ther user is n ot // IP address if the user is double NATed. If ther user is n ot
 End of changes. 1 change blocks. 
1 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 16 #define LIBTORRENT_VERSION_TINY 17
// 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.16.0" #define LIBTORRENT_VERSION "0.16.17.0"
#define LIBTORRENT_REVISION "$Rev: 9831 $" #define LIBTORRENT_REVISION "$Rev: 10007 $"
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 web_connection_base.hpp   web_connection_base.hpp 
skipping to change at line 122 skipping to change at line 122
bool in_handshake() const; bool in_handshake() const;
// the following functions appends messages // the following functions appends messages
// to the send buffer // to the send buffer
void write_choke() {} void write_choke() {}
void write_unchoke() {} void write_unchoke() {}
void write_interested() {} void write_interested() {}
void write_not_interested() {} void write_not_interested() {}
virtual void write_request(peer_request const& r) = 0; virtual void write_request(peer_request const& r) = 0;
void write_cancel(peer_request const& r) void write_cancel(peer_request const& r) {}
{ incoming_reject_request(r); }
void write_have(int index) {} void write_have(int index) {}
void write_piece(peer_request const& r, disk_buffer_holder& buffer) { TORRENT_ASSERT(false); } void write_piece(peer_request const& r, disk_buffer_holder& buffer) { TORRENT_ASSERT(false); }
void write_keepalive() {} void write_keepalive() {}
void on_connected(); void on_connected();
void write_reject_request(peer_request const&) {} void write_reject_request(peer_request const&) {}
void write_allow_fast(int) {} void write_allow_fast(int) {}
void write_suggest(int piece) {} void write_suggest(int piece) {}
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
void check_invariant() const; void check_invariant() const;
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 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/