libtorrent

Revision: 7481
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7481&view=rev
Author:   arvidn
Date:     2012-09-28 03:50:34 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
merged boost.date_time linking from RC_0_16

Modified Paths:
--------------
    trunk/Jamfile
    trunk/docs/building.rst
    trunk/src/asio.cpp

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RC_0_16:6640,6657,6662,6665,6669,6673-6675,6678,6684,6686,6688,6690,6692,6694-6695,6698,6700,6715,6936,6938,6946,6951,6956,6971,6974,6976,6979,7166,7200,7206,7258,7311,7314,7323,7333,7339,7348,7358,7371,7373,7375,7379,7395,7422,7433,7458,7461,7464,7466,7469,7471,7473
/branches/libtorrent_aio:5693,6230,6329,6384,6796,6798,6884,7010,7013,7183,7186-7187,7190,7192,7209,7386,7435,7438,7440,7443-7444,7447,7449-7450,7453
/branches/libtorrent_utp:3973-5057
/branches/ssl:6336-6361
   + /branches/RC_0_16:6640,6657,6662,6665,6669,6673-6675,6678,6684,6686,6688,6690,6692,6694-6695,6698,6700,6715,6936,6938,6946,6951,6956,6971,6974,6976,6979,7166,7200,7206,7258,7311,7314,7323,7333,7339,7348,7358,7371,7373,7375,7379,7395,7422,7433,7458,7461,7464,7466,7469,7471,7473,7480
/branches/libtorrent_aio:5693,6230,6329,6384,6796,6798,6884,7010,7013,7183,7186-7187,7190,7192,7209,7386,7435,7438,7440,7443-7444,7447,7449-7450,7453
/branches/libtorrent_utp:3973-5057
/branches/ssl:6336-6361

Modified: trunk/Jamfile
===================================================================
--- trunk/Jamfile	2012-09-28 03:43:53 UTC (rev 7480)
+++ trunk/Jamfile	2012-09-28 03:50:34 UTC (rev 7481)
@@ -305,6 +305,9 @@
 
 feature need-librt : no yes : composite propagated link-incompatible ;
 
+feature boost-date-time : off on : composite propagated link-incompatible ;
+feature.compose <boost-date-time>off : <define>TORRENT_NO_BOOST_DATE_TIME ;
+
 feature fiemap : off on : composite propagated ;
 feature.compose <fiemap>on : <define>HAVE_LINUX_FIEMAP_H ;
 

Modified: trunk/docs/building.rst
===================================================================
--- trunk/docs/building.rst	2012-09-28 03:43:53 UTC (rev 7480)
+++ trunk/docs/building.rst	2012-09-28 03:50:34 UTC (rev 7481)
@@ -367,6 +367,16 @@
 |                          |   trace of the assert and some more information.   |
 |                          | * ``system`` use the libc assert macro             |
 +--------------------------+----------------------------------------------------+
+| ``i2p``                  | * ``on`` - build with I2P support                  |
+|                          | * ``off`` - build without I2P support              |
++--------------------------+----------------------------------------------------+
+| ``boost-date-time``      | * ``off`` - don't build asio types that depend     |
+|                          |   on boost.date_time. libtorrent doesn't use them  |
+|                          |   but if the client does, you need these to be     |
+|                          |   built.                                           |
+|                          | * ``on`` - build asio types that depend on         |
+|                          |   boost.date_time.                                 |
++--------------------------+----------------------------------------------------+
 
 .. _MaxMind: http://www.maxmind.com/app/api
 

Modified: trunk/src/asio.cpp
===================================================================
--- trunk/src/asio.cpp	2012-09-28 03:43:53 UTC (rev 7480)
+++ trunk/src/asio.cpp	2012-09-28 03:50:34 UTC (rev 7481)
@@ -5,7 +5,7 @@
 #define BOOST_ASIO_SOURCE
 #endif
 
-#if _MSC_VER > 1310
+#if _MSC_VER > 1310 && defined TORRENT_NO_BOOST_DATE_TIME
 
 // on windows; including timer_queue.hpp results in an
 // actual link-time dependency on boost.date_time, even
@@ -15,6 +15,9 @@
 // works, at least across windows, Linux and Mac OS X.
 // In the future this hack can be fixed by disabling
 // use of boost.date_time in boost.asio
+// if TORRENT_NO_BOOST_DATE_TIME is not defined, it's
+// fine to include everything, including pulling in
+// the boost.date_time dependency via asio
 
 #include <boost/asio/detail/config.hpp>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7500
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7500&view=rev
Author:   arvidn
Date:     2012-10-01 02:17:01 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
fix up udp tracker patch

Modified Paths:
--------------
    branches/RC_0_16/src/udp_tracker_connection.cpp

Modified: branches/RC_0_16/src/udp_tracker_connection.cpp
===================================================================
--- branches/RC_0_16/src/udp_tracker_connection.cpp	2012-10-01 00:24:37 UTC (rev 7499)
+++ branches/RC_0_16/src/udp_tracker_connection.cpp	2012-10-01 02:17:01 UTC (rev 7500)
@@ -143,11 +143,24 @@
 
 		// if that was the last one, fail the whole announce
 		if (m_endpoints.empty())
+		{
 			tracker_connection::fail(ec, code, msg, interval, min_interval);
+			return;
+		}
 
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+		boost::shared_ptr<request_callback> cb = requester();
+		if (cb) cb->debug_log("*** UDP_TRACKER [ host: \"%s\" ip: \"%s\" | error: \"%s\" ]"
+			, m_hostname.c_str(), print_endpoint(m_target).c_str(), ec.message().c_str());
+#endif
+
 		// pick another target endpoint and try again
 		m_target = pick_target_endpoint();
 
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+		if (cb) cb->debug_log("*** UDP_TRACKER trying next IP [ host: \"%s\" ip: \"%s\" ]"
+			, m_hostname.c_str(), print_endpoint(m_target).c_str());
+#endif
 		m_ses.m_io_service.post(boost::bind(
 			&udp_tracker_connection::start_announce, self()));
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7477
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7477&view=rev
Author:   arvidn
Date:     2012-09-28 00:22:32 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
merged changes from trunk

Modified Paths:
--------------
    branches/libtorrent_aio/ChangeLog
    branches/libtorrent_aio/examples/Makefile.am
    branches/libtorrent_aio/include/libtorrent/aux_/session_impl.hpp
    branches/libtorrent_aio/include/libtorrent/config.hpp
    branches/libtorrent_aio/include/libtorrent/socket_type.hpp
    branches/libtorrent_aio/include/libtorrent/torrent.hpp
    branches/libtorrent_aio/include/libtorrent/tracker_manager.hpp
    branches/libtorrent_aio/src/GeoIP.c
    branches/libtorrent_aio/src/broadcast_socket.cpp
    branches/libtorrent_aio/src/enum_net.cpp
    branches/libtorrent_aio/src/file.cpp
    branches/libtorrent_aio/src/http_tracker_connection.cpp
    branches/libtorrent_aio/src/kademlia/dht_tracker.cpp
    branches/libtorrent_aio/src/kademlia/routing_table.cpp
    branches/libtorrent_aio/src/kademlia/rpc_manager.cpp
    branches/libtorrent_aio/src/natpmp.cpp
    branches/libtorrent_aio/src/session_impl.cpp
    branches/libtorrent_aio/src/settings_pack.cpp
    branches/libtorrent_aio/src/torrent.cpp
    branches/libtorrent_aio/src/tracker_manager.cpp
    branches/libtorrent_aio/src/udp_socket.cpp
    branches/libtorrent_aio/src/udp_tracker_connection.cpp
    branches/libtorrent_aio/src/utp_stream.cpp

Property Changed:
----------------
    branches/libtorrent_aio/


Property changes on: branches/libtorrent_aio
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RC_0_16:6640,6657,6662,6665,6669,6673-6675,6678,6684,6686,6688,6690,6692,6694-6695,6698,6700,6715,6936,6938,6946,6951,6956,6971,6974,6976,6979,7166,7200,7206,7258,7311,7314,7323,7333,7339,7348,7358,7371,7373,7375,7379,7395,7422,7433
/branches/libtorrent_aio_arc:6324-6529
/branches/libtorrent_aio_ghost_torrents:6532-7262
/branches/libtorrent_aio_peer_classes:6326-6856
/branches/libtorrent_aio_settings:6709-6880
/branches/libtorrent_utp:3973-5057
/branches/ssl:6336-6361
/trunk:4468-7436
   + /branches/RC_0_16:6640,6657,6662,6665,6669,6673-6675,6678,6684,6686,6688,6690,6692,6694-6695,6698,6700,6715,6936,6938,6946,6951,6956,6971,6974,6976,6979,7166,7200,7206,7258,7311,7314,7323,7333,7339,7348,7358,7371,7373,7375,7379,7395,7422,7433,7458,7461,7464,7466,7469,7471,7473
/branches/libtorrent_aio_arc:6324-6529
/branches/libtorrent_aio_ghost_torrents:6532-7262
/branches/libtorrent_aio_peer_classes:6326-6856
/branches/libtorrent_aio_settings:6709-6880
/branches/libtorrent_utp:3973-5057
/branches/ssl:6336-6361
/trunk:4468-7474

Modified: branches/libtorrent_aio/ChangeLog
===================================================================
--- branches/libtorrent_aio/ChangeLog	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/ChangeLog	2012-09-28 00:22:32 UTC (rev 7477)
@@ -21,6 +21,9 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* raise the default number of torrents allowed to announce to trackers to 1600
+	* improve uTP slow start behavior
+	* fixed UDP socket error causing it to fail on Win7
 	* update use of boost.system to not use deprecated functions
 	* fix GIL issue in python bindings. Deprecated extension support in python
 	* fixed bug where setting upload slots to -1 would not mean infinite

Modified: branches/libtorrent_aio/examples/Makefile.am
===================================================================
--- branches/libtorrent_aio/examples/Makefile.am	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/examples/Makefile.am	2012-09-28 00:22:32 UTC (rev 7477)
@@ -6,7 +6,8 @@
   simple_client     \
   rss_reader        \
   parse_request_log \
-  utp_test
+  utp_test          \
+  connection_tester
 
 if ENABLE_EXAMPLES
 bin_PROGRAMS = $(example_programs)
@@ -30,6 +31,9 @@
 enum_if_SOURCES = enum_if.cpp
 #enum_if_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
 
+connection_tester_SOURCES = connection_tester.cpp
+#connection_tester_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
+
 rss_reader_SOURCES = rss_reader.cpp
 #rss_reader_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
 

Modified: branches/libtorrent_aio/include/libtorrent/aux_/session_impl.hpp
===================================================================
--- branches/libtorrent_aio/include/libtorrent/aux_/session_impl.hpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/include/libtorrent/aux_/session_impl.hpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -1378,7 +1378,7 @@
 			void tracker_warning(tracker_request const& req
 				, std::string const& str)
 			{
-				debug_log("*** tracker warning: " + str);
+				debug_log("*** tracker warning: %s", str.c_str());
 			}
 
 			void tracker_response(tracker_request const&
@@ -1409,7 +1409,7 @@
 				}
 				snprintf(tmp, 200, "external ip: %s\n", print_address(external_ip).c_str());
 				s += tmp;
-				debug_log(s);
+				debug_log("%s", s.c_str());
 			}
 
 			void tracker_request_timed_out(
@@ -1422,15 +1422,23 @@
 				, int response_code, error_code const& ec, const std::string& str
 				, int retry_interval)
 			{
-				char msg[256];
-				snprintf(msg, sizeof(msg), "*** tracker error: %d: %s %s"
+				debug_log("*** tracker error: %d: %s %s"
 					, response_code, ec.message().c_str(), str.c_str());
-				debug_log(msg);
 			}
 			
-			void debug_log(const std::string& line)
+			void debug_log(const char* fmt, ...) const
 			{
-				(*m_ses.m_logger) << time_now_string() << " " << line << "\n";
+				if (!m_ses.m_logger) return;
+
+				va_list v;	
+				va_start(v, fmt);
+	
+				char usr[1024];
+				vsnprintf(usr, sizeof(usr), fmt, v);
+				va_end(v);
+				char buf[1280];
+				snprintf(buf, sizeof(buf), "%s: %s\n", time_now_string(), usr);
+				(*m_ses.m_logger) << buf;
 			}
 			session_impl& m_ses;
 		};

Modified: branches/libtorrent_aio/include/libtorrent/config.hpp
===================================================================
--- branches/libtorrent_aio/include/libtorrent/config.hpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/include/libtorrent/config.hpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -292,6 +292,18 @@
 #define TORRENT_USE_IFADDRS 1
 #define TORRENT_USE_IFCONF 1
 
+// ==== eCS(OS/2) ===
+#elif defined __OS2__
+#define TORRENT_OS2
+#define TORRENT_HAS_FALLOCATE 0
+#define TORRENT_USE_IFCONF 1
+#define TORRENT_USE_SYSCTL 1
+#define TORRENT_USE_MLOCK 0
+#define TORRENT_USE_IPV6 0
+#define TORRENT_ICONV_ARG (const char**)
+#define TORRENT_USE_WRITEV 0
+#define TORRENT_USE_READV 0
+
 #else
 #warning unknown OS, assuming BSD
 #define TORRENT_BSD

Modified: branches/libtorrent_aio/include/libtorrent/socket_type.hpp
===================================================================
--- branches/libtorrent_aio/include/libtorrent/socket_type.hpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/include/libtorrent/socket_type.hpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -51,6 +51,10 @@
 #include "libtorrent/debug.hpp"
 #endif
 
+#if defined TORRENT_OS2 && defined ioc
+#undef ioc
+#endif
+
 #if TORRENT_USE_I2P
 
 #define TORRENT_SOCKTYPE_I2P_FORWARD(x) \

Modified: branches/libtorrent_aio/include/libtorrent/torrent.hpp
===================================================================
--- branches/libtorrent_aio/include/libtorrent/torrent.hpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/include/libtorrent/torrent.hpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -752,7 +752,7 @@
 
 		// LOGGING
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-		virtual void debug_log(const std::string& line);
+		virtual void debug_log(const char* fmt, ...) const;
 #endif
 
 		// DEBUG

Modified: branches/libtorrent_aio/include/libtorrent/tracker_manager.hpp
===================================================================
--- branches/libtorrent_aio/include/libtorrent/tracker_manager.hpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/include/libtorrent/tracker_manager.hpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -167,7 +167,7 @@
 			, int retry_interval) = 0;
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-		virtual void debug_log(const std::string& line) = 0;
+		virtual void debug_log(const char* fmt, ...) const = 0;
 #else
 	private:
 #endif

Modified: branches/libtorrent_aio/src/GeoIP.c
===================================================================
--- branches/libtorrent_aio/src/GeoIP.c	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/GeoIP.c	2012-09-28 00:22:32 UTC (rev 7477)
@@ -334,7 +334,7 @@
 				char const* src_start;
 				/* GeoIP Database file updated */
 				if (gi->flags & (GEOIP_MEMORY_CACHE | GEOIP_MMAP_CACHE)) {
-#ifndef WIN32
+#if !defined WIN32 && !defined __OS2__
 				    if ( gi->flags & GEOIP_MMAP_CACHE) {
 					munmap(gi->cache, gi->size);
 					gi->cache = NULL;
@@ -371,7 +371,7 @@
 				gi->mtime = buf.st_mtime;
 				gi->size = buf.st_size;
 
-#ifndef WIN32
+#if !defined WIN32 && !defined __OS2__
 				if ( gi->flags & GEOIP_MMAP_CACHE) {
 				    gi->cache = (unsigned char*)mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fileno(gi->GeoIPDatabase), 0);
 				    if ( gi->cache == MAP_FAILED ) {
@@ -594,7 +594,7 @@
 			}
 			gi->mtime = buf.st_mtime;
 			gi->size = buf.st_size;
-#ifndef WIN32
+#if !defined WIN32 && !defined __OS2__
 			/* MMAP added my Peter Shipley */
 			if ( flags & GEOIP_MMAP_CACHE) {
 			    gi->cache = (unsigned char*)mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fileno(gi->GeoIPDatabase), 0);
@@ -660,7 +660,7 @@
 	if (gi->GeoIPDatabase != NULL)
 		fclose(gi->GeoIPDatabase);
 	if (gi->cache != NULL) {
-#ifndef WIN32
+#if !defined WIN32 && !defined __OS2__
 	    if ( gi->flags & GEOIP_MMAP_CACHE) {
 		munmap(gi->cache, gi->size);
 	    } else

Modified: branches/libtorrent_aio/src/broadcast_socket.cpp
===================================================================
--- branches/libtorrent_aio/src/broadcast_socket.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/broadcast_socket.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -32,6 +32,11 @@
 
 #include <boost/version.hpp>
 
+#include "libtorrent/config.hpp"
+#if defined TORRENT_OS2
+#include <pthread.h>
+#endif
+
 #include <boost/bind.hpp>
 
 #include "libtorrent/socket.hpp"

Modified: branches/libtorrent_aio/src/enum_net.cpp
===================================================================
--- branches/libtorrent_aio/src/enum_net.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/enum_net.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -88,6 +88,10 @@
 #include <ifaddrs.h>
 #endif
 
+#if defined(TORRENT_OS2) and !defined(IF_NAMESIZE)
+#define IF_NAMESIZE IFNAMSIZ
+#endif
+
 namespace libtorrent { namespace
 {
 
@@ -222,6 +226,9 @@
 #endif
 
 #if TORRENT_USE_SYSCTL
+#ifdef TORRENT_OS2
+int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen);
+#endif
 
 	bool parse_route(int s, rt_msghdr* rtm, ip_route* rt_info)
 	{
@@ -493,7 +500,11 @@
 					close(s);
 					return ret;
 				}
+#ifndef TORRENT_OS2
 				iface.mtu = req.ifr_mtu;
+#else
+				iface.mtu = req.ifr_metric; // according to tcp/ip reference
+#endif
 
 				memset(&req, 0, sizeof(req));
 				strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1);
@@ -762,7 +773,11 @@
 	int mib[6] = { CTL_NET, PF_ROUTE, 0, AF_UNSPEC, NET_RT_DUMP, 0};
 
 	size_t needed = 0;
+#ifdef TORRENT_OS2
+	if (__libsocket_sysctl(mib, 6, 0, &needed, 0, 0) < 0)
+#else
 	if (sysctl(mib, 6, 0, &needed, 0, 0) < 0)
+#endif
 	{
 		ec = error_code(errno, asio::error::system_category);
 		return std::vector<ip_route>();
@@ -780,7 +795,11 @@
 		return std::vector<ip_route>();
 	}
 
+#ifdef TORRENT_OS2
+	if (__libsocket_sysctl(mib, 6, buf.get(), &needed, 0, 0) < 0)
+#else
 	if (sysctl(mib, 6, buf.get(), &needed, 0, 0) < 0)
+#endif
 	{
 		ec = error_code(errno, asio::error::system_category);
 		return std::vector<ip_route>();

Modified: branches/libtorrent_aio/src/file.cpp
===================================================================
--- branches/libtorrent_aio/src/file.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/file.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -514,7 +514,7 @@
 		{
 			while (*p != '/'
 				&& *p != '\0'
-#ifdef TORRENT_WINDOWS
+#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
 				&& *p != '\\'
 #endif
 				) ++p;
@@ -568,7 +568,7 @@
 	{
 		if (f.empty()) return false;
 
-#ifdef TORRENT_WINDOWS
+#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
 		// match \\ form
 		if (f == "\\\\") return true;
 		int i = 0;
@@ -658,7 +658,7 @@
 		if (f.empty()) return "";
 		char const* first = f.c_str();
 		char const* sep = strrchr(first, '/');
-#ifdef TORRENT_WINDOWS
+#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
 		char const* altsep = strrchr(first, '\\');
 		if (sep == 0 || altsep > sep) sep = altsep;
 #endif
@@ -673,7 +673,7 @@
 			{
 				--sep;
 				if (*sep == '/'
-#ifdef TORRENT_WINDOWS
+#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
 					|| *sep == '\\'
 #endif
 					)
@@ -692,7 +692,7 @@
 		if (lhs.empty() || lhs == ".") return rhs;
 		if (rhs.empty() || rhs == ".") return lhs;
 
-#ifdef TORRENT_WINDOWS
+#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
 #define TORRENT_SEPARATOR "\\"
 		bool need_sep = lhs[lhs.size()-1] != '\\' && lhs[lhs.size()-1] != '/';
 #else
@@ -883,7 +883,7 @@
 	bool is_complete(std::string const& f)
 	{
 		if (f.empty()) return false;
-#ifdef TORRENT_WINDOWS
+#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
 		int i = 0;
 		// match the xx:\ or xx:/ form
 		while (f[i] && is_alpha(f[i])) ++i;
@@ -1150,8 +1150,11 @@
 
 		if (mode & attribute_executable)
 			permissions |= S_IXGRP | S_IXOTH | S_IXUSR;
-
+#ifdef O_BINARY
+		static const int mode_array[] = {O_RDONLY | O_BINARY, O_WRONLY | O_CREAT | O_BINARY, O_RDWR | O_CREAT | O_BINARY};
+#else
 		static const int mode_array[] = {O_RDONLY, O_WRONLY | O_CREAT, O_RDWR | O_CREAT};
+#endif
 
 #ifdef O_NOATIME
 		static const int no_atime_flag[] = {0, O_NOATIME};

Modified: branches/libtorrent_aio/src/http_tracker_connection.cpp
===================================================================
--- branches/libtorrent_aio/src/http_tracker_connection.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/http_tracker_connection.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -245,7 +245,7 @@
 		boost::shared_ptr<request_callback> cb = requester();
 		if (cb)
 		{
-			cb->debug_log("==> TRACKER_REQUEST [ url: " + url + " ]");
+			cb->debug_log("==> TRACKER_REQUEST [ url: %s ]", url.c_str());
 		}
 #endif
 	}

Modified: branches/libtorrent_aio/src/kademlia/dht_tracker.cpp
===================================================================
--- branches/libtorrent_aio/src/kademlia/dht_tracker.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/kademlia/dht_tracker.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -432,7 +432,14 @@
 		{
 			if (ec == asio::error::connection_refused
 				|| ec == asio::error::connection_reset
-				|| ec == asio::error::connection_aborted)
+				|| ec == asio::error::connection_aborted
+#ifdef WIN32
+				|| ec == error_code(ERROR_HOST_UNREACHABLE, get_system_category())
+				|| ec == error_code(ERROR_PORT_UNREACHABLE, get_system_category())
+				|| ec == error_code(ERROR_CONNECTION_REFUSED, get_system_category())
+				|| ec == error_code(ERROR_CONNECTION_ABORTED, get_system_category())
+#endif
+				)
 			{
 				m_dht.unreachable(ep);
 			}

Modified: branches/libtorrent_aio/src/kademlia/routing_table.cpp
===================================================================
--- branches/libtorrent_aio/src/kademlia/routing_table.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/kademlia/routing_table.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -625,7 +625,10 @@
 			continue;
 		}
 		// this entry belongs in the new bucket
-		new_bucket.push_back(*j);
+		if (int(new_bucket.size()) < bucket_size_limit)
+			new_bucket.push_back(*j);
+		else if (int(new_replacement_bucket.size()) < m_bucket_size)
+			new_replacement_bucket.push_back(*j);
 		j = b.erase(j);
 	}
 
@@ -648,7 +651,7 @@
 			// this entry belongs in the new bucket
 			if (int(new_bucket.size()) < new_bucket_size)
 				new_bucket.push_back(*j);
-			else
+			else if (int(new_replacement_bucket.size()) < m_bucket_size)
 				new_replacement_bucket.push_back(*j);
 		}
 		j = rb.erase(j);
@@ -754,7 +757,12 @@
 	m_ips.erase(j->addr.to_v4().to_bytes());
 	b.erase(j);
 
-	j = std::find_if(rb.begin(), rb.end(), boost::bind(&node_entry::pinged, _1) == true);
+	// sort by RTT first, to find the node with the lowest
+	// RTT that is pinged
+	std::sort(rb.begin(), rb.end()
+		, boost::bind(&node_entry::rtt, _1) < boost::bind(&node_entry::rtt, _2));
+
+	j = std::find_if(rb.begin(), rb.end(), boost::bind(&node_entry::pinged, _1));
 	if (j == rb.end()) j = rb.begin();
 	b.push_back(*j);
 	rb.erase(j);
@@ -895,17 +903,6 @@
 	if (int(l.size()) >= count)
 		l.resize(count);
 }
-/*
-routing_table::iterator routing_table::begin() const
-{
-	// +1 to avoid ourself
-	return iterator(m_buckets.begin() + 1, m_buckets.end());
-}
 
-routing_table::iterator routing_table::end() const
-{
-	return iterator(m_buckets.end(), m_buckets.end());
-}
-*/
 } } // namespace libtorrent::dht
 

Modified: branches/libtorrent_aio/src/kademlia/rpc_manager.cpp
===================================================================
--- branches/libtorrent_aio/src/kademlia/rpc_manager.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/kademlia/rpc_manager.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -376,8 +376,8 @@
 {
 	INVARIANT_CHECK;
 
-	const static int short_timeout = 3;
-	const static int timeout = 20;
+	const static int short_timeout = 2;
+	const static int timeout = 10;
 
 	//	look for observers that have timed out
 

Modified: branches/libtorrent_aio/src/natpmp.cpp
===================================================================
--- branches/libtorrent_aio/src/natpmp.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/natpmp.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -29,6 +29,10 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 */
+#include "libtorrent/config.hpp"
+#if defined TORRENT_OS2
+#include <pthread.h>
+#endif
 
 #include "libtorrent/pch.hpp"
 

Modified: branches/libtorrent_aio/src/session_impl.cpp
===================================================================
--- branches/libtorrent_aio/src/session_impl.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/session_impl.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -2667,6 +2667,12 @@
 			if (ec != asio::error::operation_aborted
 				&& m_alerts.should_post<udp_error_alert>())
 				m_alerts.post_alert(udp_error_alert(ep, ec));
+
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+			char msg[200];
+			snprintf(msg, sizeof(msg), "UDP socket error: (%d) %s", ec.value(), ec.message().c_str());
+			(*m_logger) << msg << "\n";
+#endif
 		}
 		return false;
 	}
@@ -4386,14 +4392,14 @@
 				--hard_limit;
 				--type_limit;
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-				t->log_to_all_peers(("AUTO MANAGER STARTING TORRENT: " + t->torrent_file().name()).c_str());
+				t->log_to_all_peers("AUTO MANAGER STARTING TORRENT");
 #endif
 				t->set_allow_peers(true);
 			}
 			else
 			{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-				t->log_to_all_peers(("AUTO MANAGER PAUSING TORRENT: " + t->torrent_file().name()).c_str());
+				t->log_to_all_peers("AUTO MANAGER PAUSING TORRENT");
 #endif
 				// use graceful pause for auto-managed torrents
 				t->set_allow_peers(false, true);

Modified: branches/libtorrent_aio/src/settings_pack.cpp
===================================================================
--- branches/libtorrent_aio/src/settings_pack.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/settings_pack.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -223,7 +223,7 @@
 		SET(active_downloads, 3, &session_impl::reset_auto_manage_timer),
 		SET(active_seeds, 5, &session_impl::reset_auto_manage_timer),
 		SET(active_dht_limit, 88, 0),
-		SET(active_tracker_limit, 360, 0),
+		SET(active_tracker_limit, 1600, 0),
 		SET(active_lsd_limit, 60, 0),
 		SET(active_limit, 15, &session_impl::reset_auto_manage_timer),
 		SET_NOPREV(active_loaded_limit, 0, &session_impl::reset_auto_manage_timer),

Modified: branches/libtorrent_aio/src/torrent.cpp
===================================================================
--- branches/libtorrent_aio/src/torrent.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/torrent.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -400,16 +400,16 @@
 				error_code ec;
 				lazy_entry tmp;
 				lazy_entry const* info = 0;
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-				(*m_ses.m_logger) << time_now_string() << " adding magnet link with resume data\n";
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+				debug_log("adding magnet link with resume data");
 #endif
 				if (lazy_bdecode(&(*p.resume_data)[0], &(*p.resume_data)[0]
 					+ p.resume_data->size(), tmp, ec, &pos) == 0
 					&& tmp.type() == lazy_entry::dict_t
 					&& (info = tmp.dict_find_dict("info")))
 				{
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-					(*m_ses.m_logger) << time_now_string() << " found metadata in resume data\n";
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+					debug_log("found metadata in resume data");
 #endif
 					// verify the info-hash of the metadata stored in the resume file matches
 					// the torrent we're loading
@@ -421,36 +421,36 @@
 					// torrent, but the hash of the URL, until we have the full torrent
 					if (resume_ih == info_hash || !p.url.empty())
 					{
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-						(*m_ses.m_logger) << time_now_string() << " info-hash matched\n";
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+						debug_log("info-hash matched");
 #endif
 						m_torrent_file = (p.ti ? p.ti : new torrent_info(resume_ih));
 
 						if (!m_torrent_file->parse_info_section(*info, ec, 0))
 						{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-							(*m_ses.m_logger) << time_now_string() << " failed to load metadata from resume file: "
-								<< ec.message() << "\n";
+							debug_log("failed to load metadata from resume file: %s"
+								, ec.message().c_str());
 #endif
 						}
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
 						else
 						{
-							(*m_ses.m_logger) << time_now_string() << " successfully loaded metadata from resume file\n";
+							debug_log("successfully loaded metadata from resume file");
 						}
 #endif
 					}
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 					else
 					{
-						(*m_ses.m_logger) << time_now_string() << " metadata info-hash failed\n";
+						debug_log("metadata info-hash failed");
 					}
 #endif
 				}
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 				else
 				{
-					(*m_ses.m_logger) << time_now_string() << " no metadata found\n";
+					debug_log("no metadata found");
 				}
 #endif
 			}
@@ -475,8 +475,7 @@
 
 		TORRENT_ASSERT(m_ses.is_single_thread());
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " creating torrent: "
-			<< torrent_file().name() << "\n";
+		debug_log("creating torrent: %s", torrent_file().name().c_str());
 #endif
 		if (p.file_priorities)
 			m_file_priority = *p.file_priorities;
@@ -694,7 +693,6 @@
 
 		m_override_resume_data = true;
 		init();
-		start_announcing();
 	}
 #else
 
@@ -808,7 +806,6 @@
 
 		m_override_resume_data = true;
 		init();
-		start_announcing();
 	}
 
 #endif
@@ -816,9 +813,8 @@
 	void torrent::start()
 	{
 		TORRENT_ASSERT(m_ses.is_single_thread());
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " starting torrent: "
-			<< torrent_file().name() << "\n";
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+		debug_log("starting torrent");
 #endif
 		TORRENT_ASSERT(!m_picker);
 
@@ -835,9 +831,7 @@
 				{
 					m_resume_data.reset();
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-					(*m_ses.m_logger) << time_now_string() << " fastresume data for "
-						<< torrent_file().name() << " rejected: " << ec.message()
-						<< " pos: " << pos << "\n";
+					debug_log("resume data rejected: %s pos: %d", ec.message().c_str(), pos);
 #endif
 					if (m_ses.m_alerts.should_post<fastresume_rejected_alert>())
 						m_ses.m_alerts.post_alert(fastresume_rejected_alert(get_handle(), ec, "", 0));
@@ -1105,10 +1099,8 @@
 		if (!j->error) return;
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-		(*m_ses.m_logger) << "disk error: '" << j->error.ec.message()
-			<< " in file " << j->error.file
-			<< " in torrent " << torrent_file().name()
-			<< "\n";
+		debug_log("disk error: (%d) %s in file: %s", j->error.ec.value(), j->error.ec.message().c_str()
+			, resolve_filename(j->error.file).c_str());
 #endif
 
 		TORRENT_ASSERT(j->piece >= 0);
@@ -1472,10 +1464,9 @@
 			}
 		}
 
-#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
-		(*m_ses.m_logger) << time_now_string() << " <== INCOMING SSL CONNECTION [ torrent: "
-			<< m_torrent_file->name() << " | n: " << names << " | match: " << (match?"yes":"no")
-			<<  " ]\n";
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+		debug_log("<== incoming SSL CONNECTION [ n: %s | match: %s ]"
+			, names.c_str(), match?"yes":"no");
 		return match;
 #endif
 
@@ -1719,9 +1710,8 @@
 			if (ev)
 			{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-				(*m_ses.m_logger) << time_now_string() << " fastresume data for "
-					<< torrent_file().name() << " rejected: "
-					<< error_code(ev, get_libtorrent_category()).message() << "\n";
+				debug_log("fastresume data rejected: %s"
+					, error_code(ev, get_libtorrent_category()).message().c_str());
 #endif
 				m_resume_data.reset();
 			}
@@ -2060,10 +2050,16 @@
 		}
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " fastresume data for "
-			<< torrent_file().name() << " rejected: "
-			<< j->error.ec.message() << " ret:" << j->ret << "\n";
+		if (j->ret != 0)
+		{
+			debug_log("fastresume data rejected: ret: %d (%d) %s"
+				, j->ret, j->error.ec.value(), j->error.ec.message().c_str());
+		}
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+		else
+			debug_log("fastresume data accepted");
 #endif
+#endif
 
 		// if ret != 0, it means we need a full check. We don't necessarily need
 		// that when the resume data check fails. For instance, if the resume data
@@ -2310,10 +2306,7 @@
 						resolve_filename(j->error.file), j->error.operation_str(), get_handle()));
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-				(*m_ses.m_logger) << time_now_string() << ": fatal disk error ["
-					" error: " << j->error.ec.message() <<
-					" torrent: " << torrent_file().name() <<
-					" ]\n";
+			debug_log("fatal disk error: (%d) %s", j->error.ec.value(), j->error.ec.message().c_str());
 #endif
 				pause();
 				set_error(j->error.ec, j->error.file);
@@ -2497,13 +2490,25 @@
 		TORRENT_ASSERT(m_ses.is_single_thread());
 		INVARIANT_CHECK;
 
-		if (m_trackers.empty()) return;
+		if (m_trackers.empty())
+		{
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+			debug_log("*** announce_with_tracker: no trackers");
+#endif
+			return;
+		}
 
 		if (m_abort) e = tracker_request::stopped;
 
 		// if we're not announcing to trackers, only allow
 		// stopping
-		if (e != tracker_request::stopped && !m_announce_to_trackers) return;
+		if (e != tracker_request::stopped && !m_announce_to_trackers)
+		{
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+			debug_log("*** announce_with_tracker: event != stopped && !m_announce_to_trackers");
+#endif
+			return;
+		}
 
 		TORRENT_ASSERT(m_allow_peers || e == tracker_request::stopped);
 
@@ -2649,10 +2654,12 @@
 				}
 			}
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-			(*m_ses.m_logger) << time_now_string() << " ==> TACKER REQUEST " << req.url
-				<< " event=" << (req.event==tracker_request::stopped?"stopped"
+			debug_log("==> TRACKER REQUEST \"%s\" event: %s abort: %d"
+				, req.url.c_str()
+				, (req.event==tracker_request::stopped?"stopped"
 					:req.event==tracker_request::started?"started":"")
-				<< " abort=" << m_abort << "\n";
+				, m_abort);
+
 			if (m_abort)
 			{
 				boost::shared_ptr<aux::tracker_logger> tl(new aux::tracker_logger(m_ses));
@@ -2661,8 +2668,11 @@
 			}
 			else
 #endif
-			m_ses.m_tracker_manager.queue_request(m_ses.m_io_service, m_ses.m_half_open, req
-				, tracker_login() , shared_from_this());
+			{
+				m_ses.m_tracker_manager.queue_request(m_ses.m_io_service, m_ses.m_half_open, req
+					, tracker_login() , shared_from_this());
+			}
+
 			ae.updating = true;
 			ae.next_announce = now + seconds(20);
 			ae.min_announce = now + seconds(10);
@@ -2811,7 +2821,7 @@
 		std::copy(tracker_ips.begin(), tracker_ips.end(), std::ostream_iterator<address>(s, " "));
 		s << "\n";
 		s << "we connected to: " << tracker_ip << "\n";
-		debug_log(s.str());
+		debug_log("%s", s.str().c_str());
 #endif
 		// for each of the peers we got from the tracker
 		for (std::vector<peer_entry>::iterator i = peer_list.begin();
@@ -2909,8 +2919,8 @@
 					:m_ses.m_ipv4_interface.address();
 				announce_with_tracker(r.event, bind_interface);
 #if (defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING) && TORRENT_USE_IOSTREAM
-				debug_log("announce again using " + print_address(bind_interface)
-					+ " as the bind interface");
+				debug_log("announce again using %s as the bind interface"
+					, print_address(bind_interface).c_str());
 #endif
 			}
 		}
@@ -2979,7 +2989,7 @@
 
 #if defined TORRENT_LOGGING
 		if (ec)
-			*m_ses.m_logger << time_now_string() << " on_i2p_resolve: " << ec.message() << "\n";
+			debug_log("i2p_resolve error: %s", ec.message().c_str());
 #endif
 		if (ec || m_ses.is_aborted()) return;
 
@@ -3000,7 +3010,7 @@
 
 #if defined TORRENT_LOGGING
 		if (e)
-			*m_ses.m_logger << time_now_string() << " on_peer_name_lookup: " << e.message() << "\n";
+			debug_log("peer name lookup error: %s", e.message().c_str());
 #endif
 		if (e || host == tcp::resolver::iterator() ||
 			m_ses.is_aborted()) return;
@@ -3010,7 +3020,7 @@
 		{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 			error_code ec;
-			debug_log("blocked ip from tracker: " + host->endpoint().address().to_string(ec));
+			debug_log("blocked ip from tracker: %s", host->endpoint().address().to_string(ec).c_str());
 #endif
 			if (m_ses.m_alerts.should_post<peer_blocked_alert>())
 				m_ses.m_alerts.post_alert(peer_blocked_alert(get_handle(), host->endpoint().address()));
@@ -3357,11 +3367,11 @@
 		// -2: piece failed check
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " *** PIECE_FINISHED [ p: "
-			<< j->piece << " chk: " << ((ret == 0)
+		debug_log("*** PIECE_FINISHED [ p: %d | chk: %s | size: %d ]"
+			, index, ((ret == 0)
 				?"passed":ret == -1
-				?"disk failed":"failed") << " size: "
-			<< m_torrent_file->piece_size(j->piece) << " ]\n";
+				?"disk failed":"failed")
+			, m_torrent_file->piece_size(j->piece));
 #endif
 		TORRENT_ASSERT(valid_metadata());
 
@@ -3797,12 +3807,11 @@
 				if (p->connection)
 				{
 #ifdef TORRENT_LOGGING
-					(*m_ses.m_logger) << time_now_string() << " *** BANNING PEER [ " << p->ip()
-						<< " ] 'too many corrupt pieces'\n";
+					debug_log("*** BANNING PEER: \"%s\" Too many corrupt pieces"
+						, print_endpoint(p->ip()).c_str());
 #endif
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
-					(*p->connection->m_logger) << "*** BANNING PEER [ " << p->ip()
-						<< " ] 'too many corrupt pieces'\n";
+					p->connection->peer_log("*** BANNING PEER: Too many corrupt pieces");
 #endif
 					p->connection->disconnect(errors::too_many_corrupt_pieces);
 				}
@@ -5040,7 +5049,7 @@
 			return;
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " resolving web seed: " << web->url << "\n";
+		debug_log("resolving web seed: %s", web->url.c_str());
 #endif
 
 		std::string protocol;
@@ -5054,8 +5063,8 @@
 
 		if (ec)
 		{
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-			(*m_ses.m_logger) << time_now_string() << " failed to parse web seed url: " << ec.message() << "\n";
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+			debug_log("failed to parse web seed url: %s", ec.message().c_str());
 #endif
 			if (m_ses.m_alerts.should_post<url_seed_alert>())
 			{
@@ -5070,7 +5079,7 @@
 		if (web->peer_info.banned)
 		{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-			(*m_ses.m_logger) << time_now_string() << "banned web seed: " << web->url << "\n";
+			debug_log("banned web seed: %s", web->url.c_str());
 #endif
 			if (m_ses.m_alerts.should_post<url_seed_alert>())
 			{
@@ -5176,16 +5185,18 @@
 
 		TORRENT_ASSERT(web->resolving == true);
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " completed resolve proxy hostname for: " << web->url << "\n";
+		debug_log("completed resolve proxy hostname for: %s", web->url.c_str());
+#endif
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 		if (e)
-			*m_ses.m_logger << time_now_string() << " on_proxy_name_lookup: " << e.message() << "\n";
+			debug_log("proxy name lookup error: %s", e.message().c_str());
 #endif
 		web->resolving = false;
 
 		if (web->removed)
 		{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-			(*m_ses.m_logger) << time_now_string() << " removed web seed\n";
+			debug_log("removed web seed");
 #endif
 			remove_web_seed(web);
 			return;
@@ -5264,13 +5275,13 @@
 
 		TORRENT_ASSERT(web->resolving == true);
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " completed resolve: " << web->url << "\n";
+		debug_log("completed resolve: %s", web->url.c_str());
 #endif
 		web->resolving = false;
 		if (web->removed)
 		{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-			(*m_ses.m_logger) << time_now_string() << " removed web seed\n";
+			debug_log("removed web seed");
 #endif
 			remove_web_seed(web);
 			return;
@@ -5283,8 +5294,8 @@
 			if (m_ses.m_alerts.should_post<url_seed_alert>())
 				m_ses.m_alerts.post_alert(url_seed_alert(get_handle(), web->url, e));
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-			(*m_ses.m_logger) << " ** HOSTNAME LOOKUP FAILED!**: " << web->url
-				<< " " << e.message() << "\n";
+			debug_log("*** HOSTNAME LOOKUP FAILED: %s: (%d) %s"
+				, web->url.c_str(), e.value(), e.message().c_str());
 #endif
 
 			// unavailable, retry in 30 minutes
@@ -5431,7 +5442,7 @@
 			web->peer_info.prev_amount_download = 0;
 			web->peer_info.prev_amount_upload = 0;
 #if defined TORRENT_VERBOSE_LOGGING 
-			(*m_ses.m_logger) << time_now_string() << " web seed connection started " << web->url << "\n";
+			debug_log("web seed connection started: %s", web->url.c_str());
 #endif
 
 			c->start();
@@ -5448,7 +5459,7 @@
 			TORRENT_DECLARE_DUMMY(std::exception, e);
 			(void)e;
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-			(*m_ses.m_logger) << " ** HOSTNAME LOOKUP FAILED!**: " << e.what() << "\n";
+			debug_log("*** HOST NAME LOOKUP FAILED: %s", e.what());
 #endif
 			c->disconnect(errors::no_error, 1);
 		}
@@ -5587,7 +5598,8 @@
 				// unknown country!
 				p->set_country("!!");
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-				(*m_ses.m_logger) << "IP " << p->remote().address() << " was mapped to unknown country: " << country << "\n";
+				debug_log("IP \"%s\" was mapped to unknown country: %d"
+					, print_address(p->remote().address()).c_str(), country);
 #endif
 				return;
 			}
@@ -6603,8 +6615,8 @@
 			if (!m_policy.new_connection(*p, m_ses.session_time()))
 			{
 #if defined TORRENT_LOGGING
-				(*m_ses.m_logger) << time_now_string() << " CLOSING CONNECTION "
-					<< p->remote() << " policy::new_connection returned false (i.e. peer list full)\n";
+				debug_log("CLOSING CONNECTION \"%s\" peer list full"
+					, print_endpoint(p->remote()).c_str());
 #endif
 				p->disconnect(errors::too_many_connections);
 				return false;
@@ -6616,8 +6628,8 @@
 			TORRENT_DECLARE_DUMMY(std::exception, e);
 			(void)e;
 #if defined TORRENT_LOGGING
-			(*m_ses.m_logger) << time_now_string() << " CLOSING CONNECTION "
-				<< p->remote() << " policy::new_connection threw: " << e.what() << "\n";
+			debug_log("CLOSING CONNECTION \"%s\" caught exception: %s"
+				, print_endpoint(p->remote()).c_str(), e.what());
 #endif
 			p->disconnect(errors::no_error);
 			return false;
@@ -6730,7 +6742,7 @@
 			TORRENT_ASSERT(p->associated_torrent().lock().get() == this);
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
-			(*p->m_logger) << "*** CLOSING CONNECTION: " << ec.message() << "\n";
+			p->peer_log("*** CLOSING CONNECTION \"%s\"", ec.message().c_str());
 #endif
 #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
 			std::size_t size = m_connections.size();
@@ -6857,7 +6869,7 @@
 			if (p->upload_only())
 			{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
-				(*p->m_logger) << "*** SEED, CLOSING CONNECTION\n";
+				p->peer_log("*** SEED, CLOSING CONNECTION");
 #endif
 				seeds.push_back(p);
 			}
@@ -6982,7 +6994,13 @@
 		TORRENT_ASSERT(m_ses.is_single_thread());
 		TORRENT_ASSERT(m_torrent_file->is_valid());
 
-		if (m_abort) return;
+		if (m_abort)
+		{
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+			debug_log("files_checked(), paused");
+#endif
+			return;
+		}
 
 		// we might be finished already, in which case we should
 		// not switch to downloading mode. If all files are
@@ -7925,7 +7943,7 @@
 		}
 #endif
 
-		(*m_ses.m_logger) << time_now_string() << " " << message << "\n";
+		debug_log("%s", message);
 	}
 #endif
 
@@ -8090,11 +8108,23 @@
 	void torrent::start_announcing()
 	{
 		TORRENT_ASSERT(m_ses.is_single_thread());
-		if (is_paused()) return;
+		if (is_paused())
+		{
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+			debug_log("start_announcing(), paused");
+#endif
+			return;
+		}
 		// if we don't have metadata, we need to announce
 		// before checking files, to get peers to
 		// request the metadata from
-		if (!m_files_checked && valid_metadata()) return;
+		if (!m_files_checked && valid_metadata())
+		{
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+			debug_log("start_announcing(), files not checked (with valid metadata)");
+#endif
+			return;
+		}
 		if (m_announcing) return;
 
 		m_announcing = true;
@@ -8745,7 +8775,7 @@
 		TORRENT_ASSERT(i->resolving == false);
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
-		(*m_ses.m_logger) << time_now_string() << " disconnect_web_seed: " << i->url << "\n";
+		debug_log("disconnect web seed: \"%s\"", i->url.c_str());
 #endif
 		TORRENT_ASSERT(i->peer_info.connection);
 		i->peer_info.connection = 0;
@@ -9046,8 +9076,11 @@
 
 		m_state = s;
 
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+		debug_log("set_state() %d", m_state);
+#endif
+
 		update_want_peers();
-
 		state_updated();
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
@@ -9357,7 +9390,7 @@
 		INVARIANT_CHECK;
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-		debug_log("*** tracker error: " + ec.message() + " " + msg);
+		debug_log("*** tracker error: (%d) %s %s", ec.value(), ec.message().c_str(), msg.c_str());
 #endif
 		if (r.kind == tracker_request::announce_request)
 		{
@@ -9369,8 +9402,7 @@
 				ae->message = msg;
 				int tracker_index = ae - &m_trackers[0];
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-				debug_log("*** increment tracker fail count ["
-					+ std::string(to_string(ae->fails).elems) + "]");
+				debug_log("*** increment tracker fail count [%d]", ae->fails);
 #endif
 				deprioritize_tracker(tracker_index);
 			}
@@ -9395,10 +9427,21 @@
 
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-	void torrent::debug_log(const std::string& line)
+	void torrent::debug_log(const char* fmt, ...) const
 	{
 		TORRENT_ASSERT(m_ses.is_single_thread());
-		(*m_ses.m_logger) << time_now_string() << " " << line << "\n";
+		if (!m_ses.m_logger) return;
+
+		va_list v;	
+		va_start(v, fmt);
+	
+		char usr[1024];
+		vsnprintf(usr, sizeof(usr), fmt, v);
+		va_end(v);
+		char buf[1280];
+		snprintf(buf, sizeof(buf), "%s: %s: %s\n", time_now_string()
+			, to_hex(info_hash().to_string()).substr(0, 6).c_str(), usr);
+		(*m_ses.m_logger) << buf;
 	}
 #endif
 

Modified: branches/libtorrent_aio/src/tracker_manager.cpp
===================================================================
--- branches/libtorrent_aio/src/tracker_manager.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/tracker_manager.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -325,7 +325,7 @@
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 			boost::shared_ptr<request_callback> rc = c->requester();
-			if (rc) rc->debug_log("aborting: " + req.url);
+			if (rc) rc->debug_log("aborting: %s", req.url.c_str());
 #endif
 		}
 		l.unlock();

Modified: branches/libtorrent_aio/src/udp_socket.cpp
===================================================================
--- branches/libtorrent_aio/src/udp_socket.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/udp_socket.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -382,9 +382,17 @@
 			&& e != asio::error::connection_refused
 			&& e != asio::error::connection_aborted
 			&& e != asio::error::operation_aborted
+			&& e != asio::error::network_reset
+			&& e != asio::error::network_unreachable
 #ifdef WIN32
 			// ERROR_MORE_DATA means the same thing as EMSGSIZE
 			&& e != error_code(ERROR_MORE_DATA, get_system_category())
+			&& e != error_code(ERROR_HOST_UNREACHABLE, get_system_category())
+			&& e != error_code(ERROR_PORT_UNREACHABLE, get_system_category())
+			&& e != error_code(ERROR_RETRY, get_system_category())
+			&& e != error_code(ERROR_NETWORK_UNREACHABLE, get_system_category())
+			&& e != error_code(ERROR_CONNECTION_REFUSED, get_system_category())
+			&& e != error_code(ERROR_CONNECTION_ABORTED, get_system_category())
 #endif
 			&& e != asio::error::message_size)
 		{

Modified: branches/libtorrent_aio/src/udp_tracker_connection.cpp
===================================================================
--- branches/libtorrent_aio/src/udp_tracker_connection.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/udp_tracker_connection.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -121,7 +121,8 @@
 				&udp_tracker_connection::name_lookup, self(), _1, _2));
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
 			boost::shared_ptr<request_callback> cb = requester();
-			if (cb) cb->debug_log(("*** UDP_TRACKER [ initiating name lookup: " + hostname + " ]").c_str());
+			if (cb) cb->debug_log("*** UDP_TRACKER [ initiating name lookup: \"%s\" ]"
+				, hostname.c_str());
 #endif
 		}
 
@@ -173,7 +174,8 @@
 				if (m_ses.m_ip_filter.access(k->address()) == ip_filter::blocked) 
 				{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-					if (cb) cb->debug_log("*** UDP_TRACKER [ IP blocked by filter: " + print_address(k->address()) + " ]");
+					if (cb) cb->debug_log("*** UDP_TRACKER [ IP blocked by filter: %s ]"
+						, print_address(k->address()).c_str());
 #endif
 					k = m_endpoints.erase(k);
 				}
@@ -259,9 +261,7 @@
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 		boost::shared_ptr<request_callback> cb = requester();
-		char msg[200];
-		snprintf(msg, 200, "*** UDP_TRACKER [ timed out url: %s ]", tracker_req().url.c_str());
-		if (cb) cb->debug_log(msg);
+		if (cb) cb->debug_log("*** UDP_TRACKER [ timed out url: %s ]", tracker_req().url.c_str());
 #endif
 		m_abort = true;
 		fail(error_code(errors::timed_out));
@@ -303,9 +303,7 @@
 		boost::shared_ptr<request_callback> cb = requester();
 		if (cb)
 		{
-			char msg[200];
-			snprintf(msg, 200, "<== UDP_TRACKER_PACKET [ size: %d ]", size);
-			cb->debug_log(msg);
+			cb->debug_log("<== UDP_TRACKER_PACKET [ size: %d ]", size);
 		}
 #endif
 
@@ -319,9 +317,7 @@
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
 		if (cb)
 		{
-			char msg[200];
-			snprintf(msg, 200, "*** UDP_TRACKER_PACKET [ action: %d ]", action);
-			cb->debug_log(msg);
+			cb->debug_log("*** UDP_TRACKER_PACKET [ action: %d ]", action);
 		}
 #endif
 
@@ -342,10 +338,8 @@
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
 		if (cb)
 		{
-			char msg[200];
-			snprintf(msg, 200, "*** UDP_TRACKER_RESPONSE [ tid: %x ]"
+			cb->debug_log("*** UDP_TRACKER_RESPONSE [ tid: %x ]"
 				, int(transaction));
-			cb->debug_log(msg);
 		}
 #endif
 
@@ -395,9 +389,7 @@
 		{
 			char hex_ih[41];
 			to_hex((char const*)&tracker_req().info_hash[0], 20, hex_ih);
-			char msg[200];
-			snprintf(msg, 200, "==> UDP_TRACKER_CONNECT [%s]", hex_ih);
-			cb->debug_log(msg);
+			cb->debug_log("==> UDP_TRACKER_CONNECT [%s]", hex_ih);
 		}
 #endif
 		if (m_abort) return;
@@ -498,9 +490,7 @@
 		if (cb)
 		{
 			boost::shared_ptr<request_callback> cb = requester();
-			char msg[200];
-			snprintf(msg, 200, "<== UDP_TRACKER_RESPONSE [ url: %s ]", tracker_req().url.c_str());
-			cb->debug_log(msg);
+			cb->debug_log("<== UDP_TRACKER_RESPONSE [ url: %s ]", tracker_req().url.c_str());
 		}
 #endif
 
@@ -660,9 +650,7 @@
 		{
 			char hex_ih[41];
 			to_hex((char const*)&req.info_hash[0], 20, hex_ih);
-			char msg[200];
-			snprintf(msg, 200, "==> UDP_TRACKER_ANNOUNCE [%s]", hex_ih);
-			cb->debug_log(msg);
+			cb->debug_log("==> UDP_TRACKER_ANNOUNCE [%s]", hex_ih);
 		}
 #endif
 

Modified: branches/libtorrent_aio/src/utp_stream.cpp
===================================================================
--- branches/libtorrent_aio/src/utp_stream.cpp	2012-09-28 00:20:36 UTC (rev 7476)
+++ branches/libtorrent_aio/src/utp_stream.cpp	2012-09-28 00:22:32 UTC (rev 7477)
@@ -3062,7 +3062,9 @@
 
 	if (m_slow_start)
 	{
-		scaled_gain = (std::max)((window_factor * m_cwnd) >> 16, linear_gain);
+		// mimic TCP slow-start by adding the number of acked
+		// bytes to cwnd
+		scaled_gain = (std::max)(boost::int64_t(acked_bytes) << 16, linear_gain);
 	}
 	else
 	{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7478
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7478&view=rev
Author:   arvidn
Date:     2012-09-28 00:24:30 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
prepare for 0.16.4 release

Modified Paths:
--------------
    branches/RC_0_16/CMakeLists.txt
    branches/RC_0_16/ChangeLog
    branches/RC_0_16/Jamfile
    branches/RC_0_16/configure.ac
    branches/RC_0_16/docs/building.rst
    branches/RC_0_16/docs/contributing.rst
    branches/RC_0_16/docs/features.rst
    branches/RC_0_16/docs/hacking.rst
    branches/RC_0_16/docs/make_torrent.rst
    branches/RC_0_16/docs/manual.rst
    branches/RC_0_16/docs/tuning.rst
    branches/RC_0_16/docs/utp.rst
    branches/RC_0_16/include/libtorrent/version.hpp

Modified: branches/RC_0_16/CMakeLists.txt
===================================================================
--- branches/RC_0_16/CMakeLists.txt	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/CMakeLists.txt	2012-09-28 00:24:30 UTC (rev 7478)
@@ -244,7 +244,7 @@
 	SOVERSION 1
 	VERSION 1)
 
-set (VERSION "0.16.3")
+set (VERSION "0.16.4")
 
 get_property (COMPILETIME_OPTIONS_LIST
 	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIRECTORY}

Modified: branches/RC_0_16/ChangeLog
===================================================================
--- branches/RC_0_16/ChangeLog	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/ChangeLog	2012-09-28 00:24:30 UTC (rev 7478)
@@ -1,3 +1,5 @@
+0.16.4 release
+
 	* raise the default number of torrents allowed to announce to trackers to 1600
 	* improve uTP slow start behavior
 	* fixed UDP socket error causing it to fail on Win7

Modified: branches/RC_0_16/Jamfile
===================================================================
--- branches/RC_0_16/Jamfile	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/Jamfile	2012-09-28 00:24:30 UTC (rev 7478)
@@ -23,7 +23,7 @@
 	use-project /boost : $(BOOST_ROOT) ;
 }
 
-VERSION = 0.16.3 ;
+VERSION = 0.16.4 ;
 
 # rule for linking the correct libraries depending
 # on features and target-os

Modified: branches/RC_0_16/configure.ac
===================================================================
--- branches/RC_0_16/configure.ac	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/configure.ac	2012-09-28 00:24:30 UTC (rev 7478)
@@ -5,7 +5,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libtorrent-rasterbar],[0.16.3],[arvid@...],
+AC_INIT([libtorrent-rasterbar],[0.16.4],[arvid@...],
         [libtorrent-rasterbar],[http://www.libtorrent.org])
 AC_CONFIG_SRCDIR([src/torrent.cpp])
 AC_CONFIG_AUX_DIR([build-aux])

Modified: branches/RC_0_16/docs/building.rst
===================================================================
--- branches/RC_0_16/docs/building.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/building.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 2

Modified: branches/RC_0_16/docs/contributing.rst
===================================================================
--- branches/RC_0_16/docs/contributing.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/contributing.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 2

Modified: branches/RC_0_16/docs/features.rst
===================================================================
--- branches/RC_0_16/docs/features.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/features.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 2

Modified: branches/RC_0_16/docs/hacking.rst
===================================================================
--- branches/RC_0_16/docs/hacking.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/hacking.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 ==================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 2

Modified: branches/RC_0_16/docs/make_torrent.rst
===================================================================
--- branches/RC_0_16/docs/make_torrent.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/make_torrent.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 2

Modified: branches/RC_0_16/docs/manual.rst
===================================================================
--- branches/RC_0_16/docs/manual.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/manual.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 ============================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 1

Modified: branches/RC_0_16/docs/tuning.rst
===================================================================
--- branches/RC_0_16/docs/tuning.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/tuning.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 2

Modified: branches/RC_0_16/docs/utp.rst
===================================================================
--- branches/RC_0_16/docs/utp.rst	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/docs/utp.rst	2012-09-28 00:24:30 UTC (rev 7478)
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@...
-:Version: 0.16.3
+:Version: 0.16.4
 
 .. contents:: Table of contents
   :depth: 2

Modified: branches/RC_0_16/include/libtorrent/version.hpp
===================================================================
--- branches/RC_0_16/include/libtorrent/version.hpp	2012-09-28 00:22:32 UTC (rev 7477)
+++ branches/RC_0_16/include/libtorrent/version.hpp	2012-09-28 00:24:30 UTC (rev 7478)
@@ -35,13 +35,13 @@
 
 #define LIBTORRENT_VERSION_MAJOR 0
 #define LIBTORRENT_VERSION_MINOR 16
-#define LIBTORRENT_VERSION_TINY 3
+#define LIBTORRENT_VERSION_TINY 4
 
 // the format of this version is: MMmmtt
 // M = Major version, m = minor version, t = tiny version
 #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
 
-#define LIBTORRENT_VERSION "0.16.3.0"
+#define LIBTORRENT_VERSION "0.16.4.0"
 #define LIBTORRENT_REVISION "$Rev$" 
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7493
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7493&view=rev
Author:   arvidn
Date:     2012-09-30 17:00:43 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
fixed typo

Modified Paths:
--------------
    branches/RC_0_16/include/libtorrent/error_code.hpp

Modified: branches/RC_0_16/include/libtorrent/error_code.hpp
===================================================================
--- branches/RC_0_16/include/libtorrent/error_code.hpp	2012-09-30 16:55:51 UTC (rev 7492)
+++ branches/RC_0_16/include/libtorrent/error_code.hpp	2012-09-30 17:00:43 UTC (rev 7493)
@@ -387,6 +387,7 @@
 	struct TORRENT_EXPORT libtorrent_exception: std::exception
 	{
 		libtorrent_exception(error_code const& s): m_error(s), m_msg(0) {}
+		virtual const char* what() const throw();
 		virtual ~libtorrent_exception() throw();
 		error_code error() const { return m_error; }
 	private:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7490
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7490&view=rev
Author:   arvidn
Date:     2012-09-30 15:38:37 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
add TODO comment

Modified Paths:
--------------
    trunk/src/session_impl.cpp

Modified: trunk/src/session_impl.cpp
===================================================================
--- trunk/src/session_impl.cpp	2012-09-30 15:38:14 UTC (rev 7489)
+++ trunk/src/session_impl.cpp	2012-09-30 15:38:37 UTC (rev 7490)
@@ -4330,6 +4330,9 @@
 		if (m_settings.smooth_connects && max_connections > (limit+1) / 2)
 			max_connections = (limit+1) / 2;
 
+		// TODO: use a lower limit than m_settings.connections_limit
+		// to allocate the to 10% or so of connection slots for incoming
+		// connections
 		if (!m_torrents.empty()
 			&& free_slots > -m_half_open.limit()
 			&& num_connections() < m_settings.connections_limit

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7489
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7489&view=rev
Author:   arvidn
Date:     2012-09-30 15:38:14 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
fix build

Modified Paths:
--------------
    branches/RC_0_16/tools/parse_hash_fails.cpp

Modified: branches/RC_0_16/tools/parse_hash_fails.cpp
===================================================================
--- branches/RC_0_16/tools/parse_hash_fails.cpp	2012-09-29 21:30:40 UTC (rev 7488)
+++ branches/RC_0_16/tools/parse_hash_fails.cpp	2012-09-30 15:38:14 UTC (rev 7489)
@@ -32,6 +32,7 @@
 
 #include <stdlib.h>
 #include <string>
+#include <cstring>
 #include "libtorrent/file.hpp"
 
 using namespace libtorrent;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7486
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7486&view=rev
Author:   arvidn
Date:     2012-09-29 17:56:37 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
tag 0.16.4 release

Added Paths:
-----------
    tags/libtorrent_0_16_4/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7485
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7485&view=rev
Author:   arvidn
Date:     2012-09-29 17:53:40 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
update changelog

Modified Paths:
--------------
    trunk/ChangeLog

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-09-29 17:46:41 UTC (rev 7484)
+++ trunk/ChangeLog	2012-09-29 17:53:40 UTC (rev 7485)
@@ -5,6 +5,8 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+0.16.4 release
+
 	* raise the default number of torrents allowed to announce to trackers to 1600
 	* improve uTP slow start behavior
 	* fixed UDP socket error causing it to fail on Win7

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7482
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7482&view=rev
Author:   arvidn
Date:     2012-09-29 05:09:21 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
fixed python binding for proxy_setting and added it to the example python client

Modified Paths:
--------------
    branches/RC_0_16/bindings/python/client.py
    branches/RC_0_16/bindings/python/src/session_settings.cpp

Modified: branches/RC_0_16/bindings/python/client.py
===================================================================
--- branches/RC_0_16/bindings/python/client.py	2012-09-28 03:50:34 UTC (rev 7481)
+++ branches/RC_0_16/bindings/python/client.py	2012-09-29 05:09:21 UTC (rev 7482)
@@ -159,9 +159,6 @@
     parser.add_option('-p', '--port', 
         type='int', help='set listening port')
 
-    parser.add_option('-r', '--ratio', 
-        type='float', help='set the preferred upload/download ratio. 0 means infinite. Values smaller than 1 are clamped to 1')
-
     parser.add_option('-d', '--max-download-rate', 
         type='float', help='the maximum download rate given in kB/s. 0 means infinite.')
 
@@ -174,13 +171,16 @@
     parser.add_option('-a', '--allocation-mode', 
         type='string', help='sets mode used for allocating the downloaded files on disk. Possible options are [full | compact]')
 
+    parser.add_option('-r', '--proxy-host', 
+        type='string', help='sets HTTP proxy host and port (separated by \':\')')
+
     parser.set_defaults(
         port=6881
-      , ratio=0
       , max_download_rate=0
       , max_upload_rate=0
       , save_path='./'
       , allocation_mode='compact'
+      , proxy_host=''
     )
 
     (options, args) = parser.parse_args()
@@ -208,6 +208,13 @@
     ses.set_settings(settings)
     ses.set_alert_mask(0xfffffff)
 
+    if options.proxy_host != '':
+        ps = lt.proxy_settings()
+        ps.type = lt.proxy_type.http
+        ps.hostname = options.proxy_host.split(':')[0]
+        ps.port = int(options.proxy_host.split(':')[1])
+        ses.set_proxy(ps)
+
     handles = []
     alerts = []
 
@@ -235,7 +242,6 @@
 
         h.set_max_connections(60)
         h.set_max_uploads(-1)
-        h.set_ratio(options.ratio)
 
     if os.name == 'nt':
         console = WindowsConsole()
@@ -276,7 +282,6 @@
                 % (add_suffix(s.download_rate), add_suffix(s.total_download))
             out += 'upload: %s/s (%s) ' \
                 % (add_suffix(s.upload_rate), add_suffix(s.total_upload))
-            out += 'ratio: %s\n' % '0'
 
             if s.state != lt.torrent_status.seeding:
                 out += 'info-hash: %s\n' % h.info_hash()

Modified: branches/RC_0_16/bindings/python/src/session_settings.cpp
===================================================================
--- branches/RC_0_16/bindings/python/src/session_settings.cpp	2012-09-28 03:50:34 UTC (rev 7481)
+++ branches/RC_0_16/bindings/python/src/session_settings.cpp	2012-09-29 05:09:21 UTC (rev 7482)
@@ -181,6 +181,7 @@
         .value("socks5_pw", proxy_settings::socks5_pw)
         .value("http", proxy_settings::http)
         .value("http_pw", proxy_settings::http_pw)
+        .value("i2p_proxy", proxy_settings::i2p_proxy)
     ;
 
     enum_<session_settings::disk_cache_algo_t>("disk_cache_algo_t")
@@ -212,6 +213,8 @@
         .def_readwrite("password", &proxy_settings::password)
         .def_readwrite("username", &proxy_settings::username)
         .def_readwrite("type", &proxy_settings::type)
+        .def_readwrite("proxy_peer_connections", &proxy_settings::proxy_peer_connections)
+        .def_readwrite("proxy_hostnames", &proxy_settings::proxy_hostnames)
     ;
 
 #ifndef TORRENT_DISABLE_DHT

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7479
          http://libtorrent.svn.sourceforge.net/libtorrent/?rev=7479&view=rev
Author:   arvidn
Date:     2012-09-28 00:25:34 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
regenerated html

Modified Paths:
--------------
    branches/RC_0_16/docs/building.html
    branches/RC_0_16/docs/contributing.html
    branches/RC_0_16/docs/features.html
    branches/RC_0_16/docs/make_torrent.html
    branches/RC_0_16/docs/manual.html
    branches/RC_0_16/docs/tuning.html
    branches/RC_0_16/docs/udp_tracker_protocol.html
    branches/RC_0_16/docs/utp.html

Modified: branches/RC_0_16/docs/building.html
===================================================================
--- branches/RC_0_16/docs/building.html	2012-09-28 00:24:30 UTC (rev 7478)
+++ branches/RC_0_16/docs/building.html	2012-09-28 00:25:34 UTC (rev 7479)
@@ -49,7 +49,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;rasterbar.com">arvid&#64;rasterbar.com</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>0.16.0</td></tr>
+<td>0.16.4</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">

Modified: branches/RC_0_16/docs/contributing.html
===================================================================
--- branches/RC_0_16/docs/contributing.html	2012-09-28 00:24:30 UTC (rev 7478)
+++ branches/RC_0_16/docs/contributing.html	2012-09-28 00:25:34 UTC (rev 7479)
@@ -49,7 +49,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;rasterbar.com">arvid&#64;rasterbar.com</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>0.16.0</td></tr>
+<td>0.16.4</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">

Modified: branches/RC_0_16/docs/features.html
===================================================================
--- branches/RC_0_16/docs/features.html	2012-09-28 00:24:30 UTC (rev 7478)
+++ branches/RC_0_16/docs/features.html	2012-09-28 00:25:34 UTC (rev 7479)
@@ -49,7 +49,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;rasterbar.com">arvid&#64;rasterbar.com</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>0.16.0</td></tr>
+<td>0.16.4</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">

Modified: branches/RC_0_16/docs/make_torrent.html
===================================================================
--- branches/RC_0_16/docs/make_torrent.html	2012-09-28 00:24:30 UTC (rev 7478)
+++ branches/RC_0_16/docs/make_torrent.html	2012-09-28 00:25:34 UTC (rev 7479)
@@ -49,7 +49,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;rasterbar.com">arvid&#64;rasterbar.com</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>0.16.0</td></tr>
+<td>0.16.4</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
@@ -539,6 +539,8 @@
 torrent an <em>SSL torrent</em>. An SSL torrent requires that each peer has a valid certificate
 signed by this root certificate. For SSL torrents, all peers are connecting over SSL
 connections. For more information on SSL torrents, see the <a class="reference external" href="manual.html#ssl-torrents">manual</a>.</p>
+<p>The string is not the path to the cert, it's the actual content of the certificate,
+loaded into a std::string.</p>
 </div>
 <div class="section" id="set-priv-priv">
 <h2>set_priv() priv()</h2>

Modified: branches/RC_0_16/docs/manual.html
===================================================================
--- branches/RC_0_16/docs/manual.html	2012-09-28 00:24:30 UTC (rev 7478)
+++ branches/RC_0_16/docs/manual.html	2012-09-28 00:25:34 UTC (rev 7479)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>libtorrent API Documentation</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -49,7 +49,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;rasterbar.com">arvid&#64;rasterbar.com</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>0.16.0</td></tr>
+<td>0.16.4</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
@@ -93,7 +93,7 @@
 <div class="section" id="overview">
 <h1>overview</h1>
 <p>The interface of libtorrent consists of a few classes. The main class is
-the <tt class="docutils literal">session</tt>, it contains the main loop that serves all torrents.</p>
+the <tt class="docutils literal"><span class="pre">session</span></tt>, it contains the main loop that serves all torrents.</p>
 <p>The basic usage is as follows:</p>
 <ul>
 <li><p class="first">construct a session</p>
@@ -152,8 +152,8 @@
 </div>
 <div class="section" id="network-primitives">
 <h1>network primitives</h1>
-<p>There are a few typedefs in the <tt class="docutils literal">libtorrent</tt> namespace which pulls
-in network types from the <tt class="docutils literal">asio</tt> namespace. These are:</p>
+<p>There are a few typedefs in the <tt class="docutils literal"><span class="pre">libtorrent</span></tt> namespace which pulls
+in network types from the <tt class="docutils literal"><span class="pre">asio</span></tt> namespace. These are:</p>
 <pre class="literal-block">
 typedef asio::ip::address address;
 typedef asio::ip::address_v4 address_v4;
@@ -161,8 +161,8 @@
 using asio::ip::tcp;
 using asio::ip::udp;
 </pre>
-<p>These are declared in the <tt class="docutils literal">&lt;libtorrent/socket.hpp&gt;</tt> header.</p>
-<p>The <tt class="docutils literal">using</tt> statements will give easy access to:</p>
+<p>These are declared in the <tt class="docutils literal"><span class="pre">&lt;libtorrent/socket.hpp&gt;</span></tt> header.</p>
+<p>The <tt class="docutils literal"><span class="pre">using</span></tt> statements will give easy access to:</p>
 <pre class="literal-block">
 tcp::endpoint
 udp::endpoint
@@ -173,7 +173,7 @@
 </div>
 <div class="section" id="session">
 <h1>session</h1>
-<p>The <tt class="docutils literal">session</tt> class has the following synopsis:</p>
+<p>The <tt class="docutils literal"><span class="pre">session</span></tt> class has the following synopsis:</p>
 <pre class="literal-block">
 class session: public boost::noncopyable
 {
@@ -357,11 +357,11 @@
 listen port for the session, to get it running you'll have to call <tt class="docutils literal"><span class="pre">session::listen_on()</span></tt>.
 The other constructor, that takes a port range and an interface as well as the fingerprint
 will automatically try to listen on a port on the given interface. For more information about
-the parameters, see <tt class="docutils literal">listen_on()</tt> function.</p>
+the parameters, see <tt class="docutils literal"><span class="pre">listen_on()</span></tt> function.</p>
 <p>The flags paramater can be used to start default features (upnp &amp; nat-pmp) and default plugins
 (ut_metadata, ut_pex and smart_ban). The default is to start those things. If you do not want
 them to start, pass 0 as the flags parameter.</p>
-<p>The <tt class="docutils literal">alert_mask</tt> is the same mask that you would send to <a class="reference internal" href="#set-alert-mask">set_alert_mask()</a>.</p>
+<p>The <tt class="docutils literal"><span class="pre">alert_mask</span></tt> is the same mask that you would send to <a class="reference internal" href="#set-alert-mask">set_alert_mask()</a>.</p>
 </div>
 <div class="section" id="id2">
 <h2>~session()</h2>
@@ -369,7 +369,7 @@
 If some trackers are down, they will time out. All this before the destructor of session
 returns. So, it's advised that any kind of interface (such as windows) are closed before
 destructing the session object. Because it can take a few second for it to finish. The
-timeout can be set with <tt class="docutils literal">set_settings()</tt>.</p>
+timeout can be set with <tt class="docutils literal"><span class="pre">set_settings()</span></tt>.</p>
 </div>
 <div class="section" id="load-state-save-state">
 <h2>load_state() save_state()</h2>
@@ -380,11 +380,11 @@
 </pre>
 </blockquote>
 <p>loads and saves all session settings, including dht_settings, encryption settings and proxy
-settings. <tt class="docutils literal">save_state</tt> writes all keys to the <tt class="docutils literal">entry</tt> that's passed in, which needs to
+settings. <tt class="docutils literal"><span class="pre">save_state</span></tt> writes all keys to the <tt class="docutils literal"><span class="pre">entry</span></tt> that's passed in, which needs to
 either not be initialized, or initialized as a dictionary.</p>
-<p><tt class="docutils literal">load_state</tt> expects a <tt class="docutils literal">lazy_entry</tt> which can be built from a bencoded buffer with
+<p><tt class="docutils literal"><span class="pre">load_state</span></tt> expects a <tt class="docutils literal"><span class="pre">lazy_entry</span></tt> which can be built from a bencoded buffer with
 <a class="reference internal" href="#lazy-bdecode">lazy_bdecode()</a>.</p>
-<p>The <tt class="docutils literal">flags</tt> arguments passed in to <tt class="docutils literal">save_state</tt> can be used to filter which parts
+<p>The <tt class="docutils literal"><span class="pre">flags</span></tt> arguments passed in to <tt class="docutils literal"><span class="pre">save_state</span></tt> can be used to filter which parts
 of the session state to save. By default, all state is saved (except for the individual
 torrents). These are the possible flags. A flag that's set, means those settings are saved:</p>
 <pre class="literal-block">
@@ -425,11 +425,11 @@
 </blockquote>
 <p>In case you want to destruct the session asynchrounously, you can request a session
 destruction proxy. If you don't do this, the destructor of the session object will
-block while the trackers are contacted. If you keep one <tt class="docutils literal">session_proxy</tt> to the
+block while the trackers are contacted. If you keep one <tt class="docutils literal"><span class="pre">session_proxy</span></tt> to the
 session when destructing it, the destructor will not block, but start to close down
 the session, the destructor of the proxy will then synchronize the threads. So, the
-destruction of the session is performed from the <tt class="docutils literal">session</tt> destructor call until the
-<tt class="docutils literal">session_proxy</tt> destructor call. The <tt class="docutils literal">session_proxy</tt> does not have any operations
+destruction of the session is performed from the <tt class="docutils literal"><span class="pre">session</span></tt> destructor call until the
+<tt class="docutils literal"><span class="pre">session_proxy</span></tt> destructor call. The <tt class="docutils literal"><span class="pre">session_proxy</span></tt> does not have any operations
 on it (since the session is being closed down, no operations are allowed on it). The
 only valid operation is calling the destructor:</p>
 <pre class="literal-block">
@@ -495,45 +495,45 @@
 void async_add_torrent(add_torrent_params const&amp; params);
 </pre>
 </blockquote>
-<p>You add torrents through the <tt class="docutils literal">add_torrent()</tt> function where you give an
-object with all the parameters. The <tt class="docutils literal">add_torrent()</tt> overloads will block
+<p>You add torrents through the <tt class="docutils literal"><span class="pre">add_torrent()</span></tt> function where you give an
+object with all the parameters. The <tt class="docutils literal"><span class="pre">add_torrent()</span></tt> overloads will block
 until the torrent has been added (or failed to be added) and returns an
-error code and a <tt class="docutils literal">torrent_handle</tt>. In order to add torrents more efficiently,
-consider using <tt class="docutils literal">async_add_torrent()</tt> which returns immediately, without
+error code and a <tt class="docutils literal"><span class="pre">torrent_handle</span></tt>. In order to add torrents more efficiently,
+consider using <tt class="docutils literal"><span class="pre">async_add_torrent()</span></tt> which returns immediately, without
 waiting for the torrent to add. Notification of the torrent being added is sent
 as <a class="reference internal" href="#add-torrent-alert">add_torrent_alert</a>.</p>
-<p>The overload that does not take an <tt class="docutils literal">error_code</tt> throws an exception on
+<p>The overload that does not take an <tt class="docutils literal"><span class="pre">error_code</span></tt> throws an exception on
 error and is not available when building without exception support.</p>
-<p>The only mandatory parameters are <tt class="docutils literal">save_path</tt> which is the directory where you
-want the files to be saved. You also need to specify either the <tt class="docutils literal">ti</tt> (the
-torrent file), the <tt class="docutils literal">info_hash</tt> (the info hash of the torrent) or the <tt class="docutils literal">url</tt>
+<p>The only mandatory parameters are <tt class="docutils literal"><span class="pre">save_path</span></tt> which is the directory where you
+want the files to be saved. You also need to specify either the <tt class="docutils literal"><span class="pre">ti</span></tt> (the
+torrent file), the <tt class="docutils literal"><span class="pre">info_hash</span></tt> (the info hash of the torrent) or the <tt class="docutils literal"><span class="pre">url</span></tt>
 (the URL to where to download the .torrent file from). If you specify the
 info-hash, the torrent file will be downloaded from peers, which requires them to
 support the metadata extension. For the metadata extension to work, libtorrent must
-be built with extensions enabled (<tt class="docutils literal">TORRENT_DISABLE_EXTENSIONS</tt> must not be
-defined). It also takes an optional <tt class="docutils literal">name</tt> argument. This may be left empty in case no
+be built with extensions enabled (<tt class="docutils literal"><span class="pre">TORRENT_DISABLE_EXTENSIONS</span></tt> must not be
+defined). It also takes an optional <tt class="docutils literal"><span class="pre">name</span></tt> argument. This may be left empty in case no
 name should be assigned to the torrent. In case it's not, the name is used for
 the torrent as long as it doesn't have metadata. See <tt class="docutils literal"><span class="pre">torrent_handle::name</span></tt>.</p>
 <p>If the torrent doesn't have a tracker, but relies on the DHT to find peers, the
-<tt class="docutils literal">trackers</tt> (or the deprecated <tt class="docutils literal">tracker_url</tt>) can specify tracker urls that
+<tt class="docutils literal"><span class="pre">trackers</span></tt> (or the deprecated <tt class="docutils literal"><span class="pre">tracker_url</span></tt>) can specify tracker urls that
 for the torrent.</p>
-<p>If you specify a <tt class="docutils literal">url</tt>, the torrent will be set in <tt class="docutils literal">downloading_metadata</tt> state
+<p>If you specify a <tt class="docutils literal"><span class="pre">url</span></tt>, the torrent will be set in <tt class="docutils literal"><span class="pre">downloading_metadata</span></tt> state
 until the .torrent file has been downloaded. If there's any error while downloading,
 the torrent will be stopped and the torrent error state (<tt class="docutils literal"><span class="pre">torrent_status::error</span></tt>)
-will indicate what went wrong. The <tt class="docutils literal">url</tt> may refer to a magnet link or a regular
+will indicate what went wrong. The <tt class="docutils literal"><span class="pre">url</span></tt> may refer to a magnet link or a regular
 http URL.</p>
-<p><tt class="docutils literal">dht_nodes</tt> is a list of hostname and port pairs, representing DHT nodes to be
+<p><tt class="docutils literal"><span class="pre">dht_nodes</span></tt> is a list of hostname and port pairs, representing DHT nodes to be
 added to the session (if DHT is enabled). The hostname may be an IP address.</p>
 <p>If the torrent you are trying to add already exists in the session (is either queued
-for checking, being checked or downloading) <tt class="docutils literal">add_torrent()</tt> will throw
-<a class="reference internal" href="#libtorrent-exception">libtorrent_exception</a> which derives from <tt class="docutils literal"><span class="pre">std::exception</span></tt> unless <tt class="docutils literal">duplicate_is_error</tt>
-is set to false. In that case, <tt class="docutils literal">add_torrent</tt> will return the handle to the existing
+for checking, being checked or downloading) <tt class="docutils literal"><span class="pre">add_torrent()</span></tt> will throw
+<a class="reference internal" href="#libtorrent-exception">libtorrent_exception</a> which derives from <tt class="docutils literal"><span class="pre">std::exception</span></tt> unless <tt class="docutils literal"><span class="pre">duplicate_is_error</span></tt>
+is set to false. In that case, <tt class="docutils literal"><span class="pre">add_torrent</span></tt> will return the handle to the existing
 torrent.</p>
-<p>The optional parameter, <tt class="docutils literal">resume_data</tt> can be given if up to date fast-resume data
+<p>The optional parameter, <tt class="docutils literal"><span class="pre">resume_data</span></tt> can be given if up to date fast-resume data
 is available. The fast-resume data can be acquired from a running torrent by calling
-<a class="reference internal" href="#save-resume-data">save_resume_data()</a> on <a class="reference internal" href="#torrent-handle">torrent_handle</a>. See <a class="reference internal" href="#fast-resume">fast resume</a>. The <tt class="docutils literal">vector</tt> that is
+<a class="reference internal" href="#save-resume-data">save_resume_data()</a> on <a class="reference internal" href="#torrent-handle">torrent_handle</a>. See <a class="reference internal" href="#fast-resume">fast resume</a>. The <tt class="docutils literal"><span class="pre">vector</span></tt> that is
 passed in will be swapped into the running torrent instance with <tt class="docutils literal"><span class="pre">std::vector::swap()</span></tt>.</p>
-<p>The <tt class="docutils literal">storage_mode</tt> parameter refers to the layout of the storage for this torrent.
+<p>The <tt class="docutils literal"><span class="pre">storage_mode</span></tt> parameter refers to the layout of the storage for this torrent.
 There are 3 different modes:</p>
 <dl class="docutils">
 <dt>storage_mode_sparse</dt>
@@ -542,7 +542,7 @@
 <dt>storage_mode_allocate</dt>
 <dd>All pieces will be written to their final position, all files will be
 allocated in full when the torrent is first started. This is done with
-<tt class="docutils literal">fallocate()</tt> and similar calls. This mode minimizes fragmentation.</dd>
+<tt class="docutils literal"><span class="pre">fallocate()</span></tt> and similar calls. This mode minimizes fragmentation.</dd>
 <dt>storage_mode_compact</dt>
 <dd><strong>this mode is deprecated and will be removed in future versions of libtorrent</strong>
 The storage will grow as more pieces are downloaded, and pieces
@@ -550,28 +550,28 @@
 downloaded.</dd>
 </dl>
 <p>For more information, see <a class="reference internal" href="#storage-allocation">storage allocation</a>.</p>
-<p><tt class="docutils literal">storage</tt> can be used to customize how the data is stored. The default
+<p><tt class="docutils literal"><span class="pre">storage</span></tt> can be used to customize how the data is stored. The default
 storage will simply write the data to the files it belongs to, but it could be
 overridden to save everything to a single file at a specific location or encrypt the
-content on disk for instance. For more information about the <tt class="docutils literal">storage_interface</tt>
+content on disk for instance. For more information about the <tt class="docutils literal"><span class="pre">storage_interface</span></tt>
 that needs to be implemented for a custom storage, see <a class="reference internal" href="#storage-interface">storage_interface</a>.</p>
-<p>The <tt class="docutils literal">userdata</tt> parameter is optional and will be passed on to the extension
+<p>The <tt class="docutils literal"><span class="pre">userdata</span></tt> parameter is optional and will be passed on to the extension
 constructor functions, if any (see <a class="reference internal" href="#add-extension">add_extension()</a>).</p>
-<p>The <a class="reference internal" href="#torrent-handle">torrent_handle</a> returned by <tt class="docutils literal">add_torrent()</tt> can be used to retrieve information
+<p>The <a class="reference internal" href="#torrent-handle">torrent_handle</a> returned by <tt class="docutils literal"><span class="pre">add_torrent()</span></tt> can be used to retrieve information
 about the torrent's progress, its peers etc. It is also used to abort a torrent.</p>
-<p><tt class="docutils literal">file_priorities</tt> can be set to control the initial file priorities when adding
+<p><tt class="docutils literal"><span class="pre">file_priorities</span></tt> can be set to control the initial file priorities when adding
 a torrent. The semantics are the same as for <tt class="docutils literal"><span class="pre">torrent_handle::prioritize_files()</span></tt>.</p>
-<p><tt class="docutils literal">version</tt> is filled in by the constructor and should be left untouched. It
+<p><tt class="docutils literal"><span class="pre">version</span></tt> is filled in by the constructor and should be left untouched. It
 is used for forward binary compatibility.</p>
-<p><tt class="docutils literal">trackerid</tt> is the default tracker id to be used when announcing to trackers. By default
+<p><tt class="docutils literal"><span class="pre">trackerid</span></tt> is the default tracker id to be used when announcing to trackers. By default
 this is empty, and no tracker ID is used, since this is an optional argument. If
 a tracker returns a tracker ID, that ID is used instead of this.</p>
-<p>if <tt class="docutils literal">uuid</tt> is specified, it is used to find duplicates. If another torrent is already
+<p>if <tt class="docutils literal"><span class="pre">uuid</span></tt> is specified, it is used to find duplicates. If another torrent is already
 running with the same UUID as the one being added, it will be considered a duplicate. This
 is mainly useful for RSS feed items which has UUIDs specified.</p>
-<p><tt class="docutils literal">source_feed_url</tt> should point to the URL of the RSS feed this torrent comes from,
+<p><tt class="docutils literal"><span class="pre">source_feed_url</span></tt> should point to the URL of the RSS feed this torrent comes from,
 if it comes from an RSS feed.</p>
-<p><tt class="docutils literal">flags</tt> is a 64 bit integer used for flags controlling aspects of this torrent
+<p><tt class="docutils literal"><span class="pre">flags</span></tt> is a 64 bit integer used for flags controlling aspects of this torrent
 and how it's added. These are the flags:</p>
 <pre class="literal-block">
 enum flags_t
@@ -588,48 +588,48 @@
         flag_update_subscribe = 0x200
 }
 </pre>
-<p><tt class="docutils literal">flag_apply_ip_filter</tt> determines if the IP filter should apply to this torrent or not. By
+<p><tt class="docutils literal"><span class="pre">flag_apply_ip_filter</span></tt> determines if the IP filter should apply to this torrent or not. By
 default all torrents are subject to filtering by the IP filter (i.e. this flag is set by
 default). This is useful if certain torrents needs to be excempt for some reason, being
 an auto-update torrent for instance.</p>
-<p><tt class="docutils literal">flag_merge_resume_trackers</tt> defaults to off and specifies whether tracker URLs loaded from
+<p><tt class="docutils literal"><span class="pre">flag_merge_resume_trackers</span></tt> defaults to off and specifies whether tracker URLs loaded from
 resume data should be added to the trackers in the torrent or replace the trackers.</p>
-<p><tt class="docutils literal">flag_update_subscribe</tt> is on by default and means that this torrent will be part of state
+<p><tt class="docutils literal"><span class="pre">flag_update_subscribe</span></tt> is on by default and means that this torrent will be part of state
 updates when calling <a class="reference internal" href="#post-torrent-updates">post_torrent_updates()</a>.</p>
-<p><tt class="docutils literal">flag_paused</tt> specifies whether or not the torrent is to be started in a paused
+<p><tt class="docutils literal"><span class="pre">flag_paused</span></tt> specifies whether or not the torrent is to be started in a paused
 state. I.e. it won't connect to the tracker or any of the peers until it's
 resumed. This is typically a good way of avoiding race conditions when setting
 configuration options on torrents before starting them.</p>
 <p>If you pass in resume data, the paused state of the torrent when the resume data
 was saved will override the paused state you pass in here. You can override this
-by setting <tt class="docutils literal">flag_override_resume_data</tt>.</p>
-<p>If <tt class="docutils literal">flag_auto_managed</tt> is set, the torrent will be queued, started and seeded
+by setting <tt class="docutils literal"><span class="pre">flag_override_resume_data</span></tt>.</p>
+<p>If <tt class="docutils literal"><span class="pre">flag_auto_managed</span></tt> is set, the torrent will be queued, started and seeded
 automatically by libtorrent. When this is set, the torrent should also be started
 as paused. The default queue order is the order the torrents were added. They
 are all downloaded in that order. For more details, see <a class="reference internal" href="#queuing">queuing</a>.</p>
 <p>If you pass in resume data, the auto_managed state of the torrent when the resume data
 was saved will override the auto_managed state you pass in here. You can override this
-by setting <tt class="docutils literal">override_resume_data</tt>.</p>
-<p>If <tt class="docutils literal">flag_seed_mode</tt> is set, libtorrent will assume that all files are present
+by setting <tt class="docutils literal"><span class="pre">override_resume_data</span></tt>.</p>
+<p>If <tt class="docutils literal"><span class="pre">flag_seed_mode</span></tt> is set, libtorrent will assume that all files are present
 for this torrent and that they all match the hashes in the torrent file. Each time
 a peer requests to download a block, the piece is verified against the hash, unless
 it has been verified already. If a hash fails, the torrent will automatically leave
 the seed mode and recheck all the files. The use case for this mode is if a torrent
 is created and seeded, or if the user already know that the files are complete, this
 is a way to avoid the initial file checks, and significantly reduce the startup time.</p>
-<p>Setting <tt class="docutils literal">flag_seed_mode</tt> on a torrent without metadata (a .torrent file) is a no-op
+<p>Setting <tt class="docutils literal"><span class="pre">flag_seed_mode</span></tt> on a torrent without metadata (a .torrent file) is a no-op
 and will be ignored.</p>
 <p>If resume data is passed in with this torrent, the seed mode saved in there will
 override the seed mode you set here.</p>
-<p>If <tt class="docutils literal">flag_override_resume_data</tt> is set, the <tt class="docutils literal">paused</tt> and <tt class="docutils literal">auto_managed</tt>
+<p>If <tt class="docutils literal"><span class="pre">flag_override_resume_data</span></tt> is set, the <tt class="docutils literal"><span class="pre">paused</span></tt> and <tt class="docutils literal"><span class="pre">auto_managed</span></tt>
 state of the torrent are not loaded from the resume data, but the states requested
-by the flags in <tt class="docutils literal">add_torrent_params</tt> will override them.</p>
-<p>If <tt class="docutils literal">flag_upload_mode</tt> is set, the torrent will be initialized in upload-mode,
+by the flags in <tt class="docutils literal"><span class="pre">add_torrent_params</span></tt> will override them.</p>
+<p>If <tt class="docutils literal"><span class="pre">flag_upload_mode</span></tt> is set, the torrent will be initialized in upload-mode,
 which means it will not make any piece requests. This state is typically entered
 on disk I/O errors, and if the torrent is also auto managed, it will be taken out
 of this state periodically. This mode can be used to avoid race conditions when
 adjusting priorities of pieces before allowing the torrent to start downloading.</p>
-<p><tt class="docutils literal">flag_share_mode</tt> determines if the torrent should be added in <em>share mode</em> or not.
+<p><tt class="docutils literal"><span class="pre">flag_share_mode</span></tt> determines if the torrent should be added in <em>share mode</em> or not.
 Share mode indicates that we are not interested in downloading the torrent, but
 merlely want to improve our share ratio (i.e. increase it). A torrent started in
 share mode will do its best to never download more than it uploads to the swarm.
@@ -650,9 +650,9 @@
 void remove_torrent(torrent_handle const&amp; h, int options = none);
 </pre>
 </blockquote>
-<p><tt class="docutils literal">remove_torrent()</tt> will close all peer connections associated with the torrent and tell
+<p><tt class="docutils literal"><span class="pre">remove_torrent()</span></tt> will close all peer connections associated with the torrent and tell
 the tracker that we've stopped participating in the swarm. The optional second argument
-<tt class="docutils literal">options</tt> can be used to delete all the files downloaded by this torrent. To do this, pass
+<tt class="docutils literal"><span class="pre">options</span></tt> can be used to delete all the files downloaded by this torrent. To do this, pass
 in the value <tt class="docutils literal"><span class="pre">session::delete_files</span></tt>. The removal of the torrent is asyncronous, there is
 no guarantee that adding the same torrent immediately after it was removed will not throw
 a <a class="reference internal" href="#libtorrent-exception">libtorrent_exception</a> exception. Once the torrent is deleted, a <a class="reference internal" href="#torrent-deleted-alert">torrent_deleted_alert</a>
@@ -666,11 +666,11 @@
 std::vector&lt;torrent_handle&gt; get_torrents() const;
 </pre>
 </blockquote>
-<p><tt class="docutils literal">find_torrent()</tt> looks for a torrent with the given info-hash. In case there
+<p><tt class="docutils literal"><span class="pre">find_torrent()</span></tt> looks for a torrent with the given info-hash. In case there
 is such a torrent in the session, a torrent_handle to that torrent is returned.
 In case the torrent cannot be found, an invalid torrent_handle is returned.</p>
 <p>See <tt class="docutils literal"><span class="pre">torrent_handle::is_valid()</span></tt> to know if the torrent was found or not.</p>
-<p><tt class="docutils literal">get_torrents()</tt> returns a vector of torrent_handles to all the torrents
+<p><tt class="docutils literal"><span class="pre">get_torrents()</span></tt> returns a vector of torrent_handles to all the torrents
 currently in the session.</p>
 </div>
 <div class="section" id="get-torrent-status-refresh-torrent-status">
@@ -688,23 +688,23 @@
 <p class="first admonition-title">Note</p>
 <p class="last">these calls are potentially expensive and won't scale well
 with lots of torrents. If you're concerned about performance, consider
-using <tt class="docutils literal">post_torrent_updates()</tt> instead.</p>
+using <tt class="docutils literal"><span class="pre">post_torrent_updates()</span></tt> instead.</p>
 </div>
-<p><tt class="docutils literal">get_torrent_status</tt> returns a vector of the <tt class="docutils literal">torrent_status</tt> for every
-torrent which satisfies <tt class="docutils literal">pred</tt>, which is a predicate function which determines
+<p><tt class="docutils literal"><span class="pre">get_torrent_status</span></tt> returns a vector of the <tt class="docutils literal"><span class="pre">torrent_status</span></tt> for every
+torrent which satisfies <tt class="docutils literal"><span class="pre">pred</span></tt>, which is a predicate function which determines
 if a torrent should be included in the returned set or not. Returning true means
-it should be included and false means excluded. The <tt class="docutils literal">flags</tt> argument is the same
-as to <tt class="docutils literal"><span class="pre">torrent_handle::status()</span></tt>. Since <tt class="docutils literal">pred</tt> is guaranteed to be called for
+it should be included and false means excluded. The <tt class="docutils literal"><span class="pre">flags</span></tt> argument is the same
+as to <tt class="docutils literal"><span class="pre">torrent_handle::status()</span></tt>. Since <tt class="docutils literal"><span class="pre">pred</span></tt> is guaranteed to be called for
 every torrent, it may be used to count the number of torrents of different categories
 as well.</p>
-<p><tt class="docutils literal">refresh_torrent_status</tt> takes a vector of <tt class="docutils literal">torrent_status</tt> structs (for instance
-the same vector that was returned by <tt class="docutils literal">get_torrent_status()</tt>) and refreshes the
-status based on the <tt class="docutils literal">handle</tt> member. It is possible to use this function by
-first setting up a vector of default constructed <tt class="docutils literal">torrent_status</tt> objects, only
-initializing the <tt class="docutils literal">handle</tt> member, in order to request the torrent status for
+<p><tt class="docutils literal"><span class="pre">refresh_torrent_status</span></tt> takes a vector of <tt class="docutils literal"><span class="pre">torrent_status</span></tt> structs (for instance
+the same vector that was returned by <tt class="docutils literal"><span class="pre">get_torrent_status()</span></tt>) and refreshes the
+status based on the <tt class="docutils literal"><span class="pre">handle</span></tt> member. It is possible to use this function by
+first setting up a vector of default constructed <tt class="docutils literal"><span class="pre">torrent_status</span></tt> objects, only
+initializing the <tt class="docutils literal"><span class="pre">handle</span></tt> member, in order to request the torrent status for
 multiple torrents in a single call. This can save a significant amount of time
 if you have a lot of torrents.</p>
-<p>Any <tt class="docutils literal">torrent_status</tt> object whose <tt class="docutils literal">handle</tt> member is not referring to a
+<p>Any <tt class="docutils literal"><span class="pre">torrent_status</span></tt> object whose <tt class="docutils literal"><span class="pre">handle</span></tt> member is not referring to a
 valid torrent are ignored.</p>
 </div>
 <div class="section" id="post-torrent-updates">
@@ -718,7 +718,7 @@
 the status of all torrents whose state changed since the last time this function
 was called.</p>
 <p>Only torrents who has the state subscription flag set will be included. This flag
-is on by default. See <tt class="docutils literal">add_torrent_params</tt> under <a class="reference internal" href="#async-add-torrent-add-torrent">async_add_torrent() add_torrent()</a>.</p>
+is on by default. See <tt class="docutils literal"><span class="pre">add_torrent_params</span></tt> under <a class="reference internal" href="#async-add-torrent-add-torrent">async_add_torrent() add_torrent()</a>.</p>
 </div>
 <div class="section" id="load-asnum-db-load-country-db-as-for-ip">
 <h2>load_asnum_db() load_country_db() as_for_ip()</h2>
@@ -731,12 +731,12 @@
 int as_for_ip(address const&amp; adr);
 </pre>
 </blockquote>
-<p>These functions are not available if <tt class="docutils literal">TORRENT_DISABLE_GEO_IP</tt> is defined. They
+<p>These functions are not available if <tt class="docutils literal"><span class="pre">TORRENT_DISABLE_GEO_IP</span></tt> is defined. They
 expects a path to the <a class="reference external" href="http://www.maxmind.com/app/asnum">MaxMind ASN database</a> and <a class="reference external" href="http://www.maxmind.com/app/geolitecountry">MaxMind GeoIP database</a>
 respectively. This will be used to look up which AS and country peers belong to.</p>
-<p><tt class="docutils literal">as_for_ip</tt> returns the AS number for the IP address specified. If the IP is not
+<p><tt class="docutils literal"><span class="pre">as_for_ip</span></tt> returns the AS number for the IP address specified. If the IP is not
 in the database or the ASN database is not loaded, 0 is returned.</p>
-<p>The <tt class="docutils literal">wchar_t</tt> overloads are for wide character paths.</p>
+<p>The <tt class="docutils literal"><span class="pre">wchar_t</span></tt> overloads are for wide character paths.</p>
 </div>
 <div class="section" id="set-ip-filter">
 <h2>set_ip_filter()</h2>
@@ -768,7 +768,7 @@
 session_status status() const;
 </pre>
 </blockquote>
-<p><tt class="docutils literal">status()</tt> returns session wide-statistics and status. The <tt class="docutils literal">session_status</tt>
+<p><tt class="docutils literal"><span class="pre">status()</span></tt> returns session wide-statistics and status. The <tt class="docutils literal"><span class="pre">session_status</span></tt>
 struct has the following members:</p>
 <pre class="literal-block">
 struct dht_lookup
@@ -858,64 +858,64 @@
         utp_status utp_stats;
 };
 </pre>
-<p><tt class="docutils literal">has_incoming_connections</tt> is false as long as no incoming connections have been
+<p><tt class="docutils literal"><span class="pre">has_incoming_connections</span></tt> is false as long as no incoming connections have been
 established on the listening socket. Every time you change the listen port, this will
 be reset to false.</p>
-<p><tt class="docutils literal">upload_rate</tt>, <tt class="docutils literal">download_rate</tt> are the total download and upload rates accumulated
+<p><tt class="docutils literal"><span class="pre">upload_rate</span></tt>, <tt class="docutils literal"><span class="pre">download_rate</span></tt> are the total download and upload rates accumulated
 from all torrents. This includes bittorrent protocol, DHT and an estimated TCP/IP
 protocol overhead.</p>
-<p><tt class="docutils literal">total_download</tt> and <tt class="docutils literal">total_upload</tt> are the total number of bytes downloaded and
+<p><tt class="docutils literal"><span class="pre">total_download</span></tt> and <tt class="docutils literal"><span class="pre">total_upload</span></tt> are the total number of bytes downloaded and
 uploaded to and from all torrents. This also includes all the protocol overhead.</p>
-<p><tt class="docutils literal">payload_download_rate</tt> and <tt class="docutils literal">payload_upload_rate</tt> is the rate of the payload
+<p><tt class="docutils literal"><span class="pre">payload_download_rate</span></tt> and <tt class="docutils literal"><span class="pre">payload_upload_rate</span></tt> is the rate of the payload
 down- and upload only.</p>
-<p><tt class="docutils literal">total_payload_download</tt> and <tt class="docutils literal">total_payload_upload</tt> is the total transfers of payload
+<p><tt class="docutils literal"><span class="pre">total_payload_download</span></tt> and <tt class="docutils literal"><span class="pre">total_payload_upload</span></tt> is the total transfers of payload
 only. The payload does not include the bittorrent protocol overhead, but only parts of the
 actual files to be downloaded.</p>
-<p><tt class="docutils literal">ip_overhead_upload_rate</tt>, <tt class="docutils literal">ip_overhead_download_rate</tt>, <tt class="docutils literal">total_ip_overhead_download</tt>
-and <tt class="docutils literal">total_ip_overhead_upload</tt> is the estimated TCP/IP overhead in each direction.</p>
-<p><tt class="docutils literal">dht_upload_rate</tt>, <tt class="docutils literal">dht_download_rate</tt>, <tt class="docutils literal">total_dht_download</tt> and <tt class="docutils literal">total_dht_upload</tt>
+<p><tt class="docutils literal"><span class="pre">ip_overhead_upload_rate</span></tt>, <tt class="docutils literal"><span class="pre">ip_overhead_download_rate</span></tt>, <tt class="docutils literal"><span class="pre">total_ip_overhead_download</span></tt>
+and <tt class="docutils literal"><span class="pre">total_ip_overhead_upload</span></tt> is the estimated TCP/IP overhead in each direction.</p>
+<p><tt class="docutils literal"><span class="pre">dht_upload_rate</span></tt>, <tt class="docutils literal"><span class="pre">dht_download_rate</span></tt>, <tt class="docutils literal"><span class="pre">total_dht_download</span></tt> and <tt class="docutils literal"><span class="pre">total_dht_upload</span></tt>
 is the DHT bandwidth usage.</p>
-<p><tt class="docutils literal">total_redundant_bytes</tt> is the number of bytes that has been received more than once.
+<p><tt class="docutils literal"><span class="pre">total_redundant_bytes</span></tt> is the number of bytes that has been received more than once.
 This can happen if a request from a peer times out and is requested from a different
 peer, and then received again from the first one. To make this lower, increase the
-<tt class="docutils literal">request_timeout</tt> and the <tt class="docutils literal">piece_timeout</tt> in the session settings.</p>
-<p><tt class="docutils literal">total_failed_bytes</tt> is the number of bytes that was downloaded which later failed
+<tt class="docutils literal"><span class="pre">request_timeout</span></tt> and the <tt class="docutils literal"><span class="pre">piece_timeout</span></tt> in the session settings.</p>
+<p><tt class="docutils literal"><span class="pre">total_failed_bytes</span></tt> is the number of bytes that was downloaded which later failed
 the hash-check.</p>
-<p><tt class="docutils literal">num_peers</tt> is the total number of peer connections this session has. This includes
+<p><tt class="docutils literal"><span class="pre">num_peers</span></tt> is the total number of peer connections this session has. This includes
 incoming connections that still hasn't sent their handshake or outgoing connections
 that still hasn't completed the TCP connection. This number may be slightly higher
 than the sum of all peers of all torrents because the incoming connections may not
 be assigned a torrent yet.</p>
-<p><tt class="docutils literal">num_unchoked</tt> is the current number of unchoked peers.
-<tt class="docutils literal">allowed_upload_slots</tt> is the current allowed number of unchoked peers.</p>
-<p><tt class="docutils literal">up_bandwidth_queue</tt> and <tt class="docutils literal">down_bandwidth_queue</tt> are the number of peers that are
+<p><tt class="docutils literal"><span class="pre">num_unchoked</span></tt> is the current number of unchoked peers.
+<tt class="docutils literal"><span class="pre">allowed_upload_slots</span></tt> is the current allowed number of unchoked peers.</p>
+<p><tt class="docutils literal"><span class="pre">up_bandwidth_queue</span></tt> and <tt class="docutils literal"><span class="pre">down_bandwidth_queue</span></tt> are the number of peers that are
 waiting for more bandwidth quota from the torrent rate limiter.
-<tt class="docutils literal">up_bandwidth_bytes_queue</tt> and <tt class="docutils literal">down_bandwidth_bytes_queue</tt> count the number of
+<tt class="docutils literal"><span class="pre">up_bandwidth_bytes_queue</span></tt> and <tt class="docutils literal"><span class="pre">down_bandwidth_bytes_queue</span></tt> count the number of
 bytes the connections are waiting for to be able to send and receive.</p>
-<p><tt class="docutils literal">optimistic_unchoke_counter</tt> and <tt class="docutils literal">unchoke_counter</tt> tells the number of
+<p><tt class="docutils literal"><span class="pre">optimistic_unchoke_counter</span></tt> and <tt class="docutils literal"><span class="pre">unchoke_counter</span></tt> tells the number of
 seconds until the next optimistic unchoke change and the start of the next
 unchoke interval. These numbers may be reset prematurely if a peer that is
 unchoked disconnects or becomes notinterested.</p>
-<p><tt class="docutils literal">disk_write_queue</tt> and <tt class="docutils literal">disk_read_queue</tt> are the number of peers currently
+<p><tt class="docutils literal"><span class="pre">disk_write_queue</span></tt> and <tt class="docutils literal"><span class="pre">disk_read_queue</span></tt> are the number of peers currently
 waiting on a disk write or disk read to complete before it receives or sends
 any more data on the socket. It'a a metric of how disk bound you are.</p>
-<p><tt class="docutils literal">dht_nodes</tt>, <tt class="docutils literal">dht_node_cache</tt> and <tt class="docutils literal">dht_torrents</tt> are only available when
+<p><tt class="docutils literal"><span class="pre">dht_nodes</span></tt>, <tt class="docutils literal"><span class="pre">dht_node_cache</span></tt> and <tt class="docutils literal"><span class="pre">dht_torrents</span></tt> are only available when
 built with DHT support. They are all set to 0 if the DHT isn't running. When
-the DHT is running, <tt class="docutils literal">dht_nodes</tt> is set to the number of nodes in the routing
+the DHT is running, <tt class="docutils literal"><span class="pre">dht_nodes</span></tt> is set to the number of nodes in the routing
 table. This number only includes <em>active</em> nodes, not cache nodes. The
-<tt class="docutils literal">dht_node_cache</tt> is set to the number of nodes in the node cache. These nodes
+<tt class="docutils literal"><span class="pre">dht_node_cache</span></tt> is set to the number of nodes in the node cache. These nodes
 are used to replace the regular nodes in the routing table in case any of them
 becomes unresponsive.</p>
-<p><tt class="docutils literal">dht_torrents</tt> are the number of torrents tracked by the DHT at the moment.</p>
-<p><tt class="docutils literal">dht_global_nodes</tt> is an estimation of the total number of nodes in the DHT
+<p><tt class="docutils literal"><span class="pre">dht_torrents</span></tt> are the number of torrents tracked by the DHT at the moment.</p>
+<p><tt class="docutils literal"><span class="pre">dht_global_nodes</span></tt> is an estimation of the total number of nodes in the DHT
 network.</p>
-<p><tt class="docutils literal">active_requests</tt> is a vector of the currently running DHT lookups.</p>
-<p><tt class="docutils literal">dht_routing_table</tt> contains information about every bucket in the DHT routing
+<p><tt class="docutils literal"><span class="pre">active_requests</span></tt> is a vector of the currently running DHT lookups.</p>
+<p><tt class="docutils literal"><span class="pre">dht_routing_table</span></tt> contains information about every bucket in the DHT routing
 table.</p>
-<p><tt class="docutils literal">dht_total_allocations</tt> is the number of nodes allocated dynamically for a
+<p><tt class="docutils literal"><span class="pre">dht_total_allocations</span></tt> is the number of nodes allocated dynamically for a
 particular DHT lookup. This represents roughly the amount of memory used
 by the DHT.</p>
-<p><tt class="docutils literal">utp_stats</tt> contains statistics on the uTP sockets.</p>
+<p><tt class="docutils literal"><span class="pre">utp_stats</span></tt> contains statistics on the uTP sockets.</p>
 </div>
 <div class="section" id="get-cache-status">
 <h2>get_cache_status()</h2>
@@ -946,39 +946,39 @@
 };
 </pre>
 </blockquote>
-<p><tt class="docutils literal">blocks_written</tt> is the total number of 16 KiB blocks written to disk
+<p><tt class="docutils literal"><span class="pre">blocks_written</span></tt> is the total number of 16 KiB blocks written to disk
 since this session was started.</p>
-<p><tt class="docutils literal">writes</tt> is the total number of write operations performed since this
+<p><tt class="docutils literal"><span class="pre">writes</span></tt> is the total number of write operations performed since this
 session was started.</p>
-<p>The ratio (<tt class="docutils literal">blocks_written</tt> - <tt class="docutils literal">writes</tt>) / <tt class="docutils literal">blocks_written</tt> represents
+<p>The ratio (<tt class="docutils literal"><span class="pre">blocks_written</span></tt> - <tt class="docutils literal"><span class="pre">writes</span></tt>) / <tt class="docutils literal"><span class="pre">blocks_written</span></tt> represents
 the number of saved write operations per total write operations. i.e. a kind
 of cache hit ratio for the write cahe.</p>
-<p><tt class="docutils literal">blocks_read</tt> is the number of blocks that were requested from the
+<p><tt class="docutils literal"><span class="pre">blocks_read</span></tt> is the number of blocks that were requested from the
 bittorrent engine (from peers), that were served from disk or cache.</p>
-<p><tt class="docutils literal">blocks_read_hit</tt> is the number of blocks that were served from cache.</p>
-<p>The ratio <tt class="docutils literal">blocks_read_hit</tt> / <tt class="docutils literal">blocks_read</tt> is the cache hit ratio
+<p><tt class="docutils literal"><span class="pre">blocks_read_hit</span></tt> is the number of blocks that were served from cache.</p>
+<p>The ratio <tt class="docutils literal"><span class="pre">blocks_read_hit</span></tt> / <tt class="docutils literal"><span class="pre">blocks_read</span></tt> is the cache hit ratio
 for the read cache.</p>
-<p><tt class="docutils literal">cache_size</tt> is the number of 16 KiB blocks currently in the disk cache.
+<p><tt class="docutils literal"><span class="pre">cache_size</span></tt> is the number of 16 KiB blocks currently in the disk cache.
 This includes both read and write cache.</p>
-<p><tt class="docutils literal">read_cache_size</tt> is the number of 16KiB blocks in the read cache.</p>
-<p><tt class="docutils literal">total_used_buffers</tt> is the total number of buffers currently in use.
+<p><tt class="docutils literal"><span class="pre">read_cache_size</span></tt> is the number of 16KiB blocks in the read cache.</p>
+<p><tt class="docutils literal"><span class="pre">total_used_buffers</span></tt> is the total number of buffers currently in use.
 This includes the read/write disk cache as well as send and receive buffers
 used in peer connections.</p>
-<p><tt class="docutils literal">average_queue_time</tt> is the number of microseconds an average disk I/O job
+<p><tt class="docutils literal"><span class="pre">average_queue_time</span></tt> is the number of microseconds an average disk I/O job
 has to wait in the job queue before it get processed.</p>
-<p><tt class="docutils literal">average_read_time</tt> is the time read jobs takes on average to complete
+<p><tt class="docutils literal"><span class="pre">average_read_time</span></tt> is the time read jobs takes on average to complete
 (not including the time in the queue), in microseconds. This only measures
 read cache misses.</p>
-<p><tt class="docutils literal">average_write_time</tt> is the time write jobs takes to complete, on average,
+<p><tt class="docutils literal"><span class="pre">average_write_time</span></tt> is the time write jobs takes to complete, on average,
 in microseconds. This does not include the time the job sits in the disk job
 queue or in the write cache, only blocks that are flushed to disk.</p>
-<p><tt class="docutils literal">average_hash_time</tt> is the time hash jobs takes to complete on average, in
+<p><tt class="docutils literal"><span class="pre">average_hash_time</span></tt> is the time hash jobs takes to complete on average, in
 microseconds. Hash jobs include running SHA-1 on the data (which for the most
 part is done incrementally) and sometimes reading back parts of the piece. It
 also includes checking files without valid resume data.</p>
-<p><tt class="docutils literal">average_cache_time</tt> is the average amuount of time spent evicting cached
+<p><tt class="docutils literal"><span class="pre">average_cache_time</span></tt> is the average amuount of time spent evicting cached
 blocks that have expired from the disk cache.</p>
-<p><tt class="docutils literal">job_queue_length</tt> is the number of jobs in the job queue.</p>
+<p><tt class="docutils literal"><span class="pre">job_queue_length</span></tt> is the number of jobs in the job queue.</p>
 </div>
 <div class="section" id="get-cache-info">
 <h2>get_cache_info()</h2>
@@ -988,9 +988,9 @@
         , std::vector&lt;cached_piece_info&gt;&amp; ret) const;
 </pre>
 </blockquote>
-<p><tt class="docutils literal">get_cache_info()</tt> fills out the supplied vector with information for
+<p><tt class="docutils literal"><span class="pre">get_cache_info()</span></tt> fills out the supplied vector with information for
 each piece that is currently in the disk cache for the torrent with the
-specified info-hash (<tt class="docutils literal">ih</tt>).</p>
+specified info-hash (<tt class="docutils literal"><span class="pre">ih</span></tt>).</p>
 <blockquote>
 <pre class="literal-block">
 struct cached_piece_info
@@ -1003,12 +1003,12 @@
 };
 </pre>
 </blockquote>
-<p><tt class="docutils literal">piece</tt> is the piece index for this cache entry.</p>
-<p><tt class="docutils literal">blocks</tt> has one entry for each block in this piece. <tt class="docutils literal">true</tt> represents
-the data for that block being in the disk cache and <tt class="docutils literal">false</tt> means it's not.</p>
-<p><tt class="docutils literal">last_use</tt> is the time when a block was last written to this piece. The older
+<p><tt class="docutils literal"><span class="pre">piece</span></tt> is the piece index for this cache entry.</p>
+<p><tt class="docutils literal"><span class="pre">blocks</span></tt> has one entry for each block in this piece. <tt class="docutils literal"><span class="pre">true</span></tt> represents
+the data for that block being in the disk cache and <tt class="docutils literal"><span class="pre">false</span></tt> means it's not.</p>
+<p><tt class="docutils literal"><span class="pre">last_use</span></tt> is the time when a block was last written to this piece. The older
 a piece is, the more likely it is to be flushed to disk.</p>
-<p><tt class="docutils literal">kind</tt> specifies if this piece is part of the read cache or the write cache.</p>
+<p><tt class="docutils literal"><span class="pre">kind</span></tt> specifies if this piece is part of the read cache or the write cache.</p>
 </div>
 <div class="section" id="is-listening-listen-port-listen-on">
 <h2>is_listening() listen_port() listen_on()</h2>
@@ -1029,20 +1029,20 @@
         , int flags = 0);
 </pre>
 </blockquote>
-<p><tt class="docutils literal">is_listening()</tt> will tell you whether or not the session has successfully
+<p><tt class="docutils literal"><span class="pre">is_listening()</span></tt> will tell you whether or not the session has successfully
 opened a listening port. If it hasn't, this function will return false, and
-then you can use <tt class="docutils literal">listen_on()</tt> to make another attempt.</p>
-<p><tt class="docutils literal">listen_port()</tt> returns the port we ended up listening on. Since you just pass
-a port-range to the constructor and to <tt class="docutils literal">listen_on()</tt>, to know which port it
+then you can use <tt class="docutils literal"><span class="pre">listen_on()</span></tt> to make another attempt.</p>
+<p><tt class="docutils literal"><span class="pre">listen_port()</span></tt> returns the port we ended up listening on. Since you just pass
+a port-range to the constructor and to <tt class="docutils literal"><span class="pre">listen_on()</span></tt>, to know which port it
 ended up using, you have to ask the session using this function.</p>
-<p><tt class="docutils literal">listen_on()</tt> will change the listen port and/or the listen interface. If the
+<p><tt class="docutils literal"><span class="pre">listen_on()</span></tt> will change the listen port and/or the listen interface. If the
 session is already listening on a port, this socket will be closed and a new socket
 will be opened with these new settings. The port range is the ports it will try
 to listen on, if the first port fails, it will continue trying the next port within
 the range and so on. The interface parameter can be left as 0, in that case the
 os will decide which interface to listen on, otherwise it should be the ip-address
-of the interface you want the listener socket bound to. <tt class="docutils literal">listen_on()</tt> returns the
-error code of the operation in <tt class="docutils literal">ec</tt>. If this indicates success, the session is
+of the interface you want the listener socket bound to. <tt class="docutils literal"><span class="pre">listen_on()</span></tt> returns the
+error code of the operation in <tt class="docutils literal"><span class="pre">ec</span></tt>. If this indicates success, the session is
 listening on a port within the specified range. If it fails, it will also
 generate an appropriate alert (<a class="reference internal" href="#listen-failed-alert">listen_failed_alert</a>).</p>
 <p>If all ports in the specified range fails to be opened for listening, libtorrent will
@@ -1050,22 +1050,22 @@
 that still fails you may see a <a class="reference internal" href="#listen-failed-alert">listen_failed_alert</a> with port 0 even if you didn't
 ask to listen on it.</p>
 <p>It is possible to prevent libtorrent from binding to port 0 by passing in the flag
-<tt class="docutils literal"><span class="pre">session::no_system_port</span></tt> in the <tt class="docutils literal">flags</tt> argument.</p>
+<tt class="docutils literal"><span class="pre">session::no_system_port</span></tt> in the <tt class="docutils literal"><span class="pre">flags</span></tt> argument.</p>
 <p>The interface parameter can also be a hostname that will resolve to the device you
 want to listen on. If you don't specify an interface, libtorrent may attempt to
 listen on multiple interfaces (typically 0.0.0.0 and ::). This means that if your
 IPv6 interface doesn't work, you may still see a <a class="reference internal" href="#listen-failed-alert">listen_failed_alert</a>, even though
 the IPv4 port succeeded.</p>
-<p>The <tt class="docutils literal">flags</tt> parameter can either be 0 or <tt class="docutils literal"><span class="pre">session::listen_reuse_address</span></tt>, which
+<p>The <tt class="docutils literal"><span class="pre">flags</span></tt> parameter can either be 0 or <tt class="docutils literal"><span class="pre">session::listen_reuse_address</span></tt>, which
 will set the reuse address socket option on the listen socket(s). By default, the
 listen socket does not use reuse address. If you're running a service that needs
 to run on a specific port no matter if it's in use, set this flag.</p>
 <p>If you're also starting the DHT, it is a good idea to do that after you've called
-<tt class="docutils literal">listen_on()</tt>, since the default listen port for the DHT is the same as the tcp
+<tt class="docutils literal"><span class="pre">listen_on()</span></tt>, since the default listen port for the DHT is the same as the tcp
 listen socket. If you start the DHT first, it will assume the tcp port is free and
-open the udp socket on that port, then later, when <tt class="docutils literal">listen_on()</tt> is called, it
+open the udp socket on that port, then later, when <tt class="docutils literal"><span class="pre">listen_on()</span></tt> is called, it
 may turn out that the tcp port is in use. That results in the DHT and the bittorrent
-socket listening on different ports. If the DHT is active when <tt class="docutils literal">listen_on</tt> is
+socket listening on different ports. If the DHT is active when <tt class="docutils literal"><span class="pre">listen_on</span></tt> is
 called, the udp port will be rebound to the new port, if it was configured to use
 the same port as the tcp socket, and if the listen_on call failed to bind to the
 same port that the udp uses.</p>
@@ -1085,7 +1085,7 @@
 </pre>
 </blockquote>
 <p>Changes the mask of which alerts to receive. By default only errors are reported.
-<tt class="docutils literal">m</tt> is a bitmask where each bit represents a category of alerts.</p>
+<tt class="docutils literal"><span class="pre">m</span></tt> is a bitmask where each bit represents a category of alerts.</p>
 <p>See <a class="reference internal" href="#alerts">alerts</a> for mor information on the alert categories.</p>
 </div>
 <div class="section" id="pop-alerts-pop-alert-wait-for-alert">
@@ -1097,34 +1097,34 @@
 alert const* wait_for_alert(time_duration max_wait);
 </pre>
 </blockquote>
-<p><tt class="docutils literal">pop_alert()</tt> is used to ask the session if any errors or events has occurred. With
-<a class="reference internal" href="#set-alert-mask">set_alert_mask()</a> you can filter which alerts to receive through <tt class="docutils literal">pop_alert()</tt>.
+<p><tt class="docutils literal"><span class="pre">pop_alert()</span></tt> is used to ask the session if any errors or events has occurred. With
+<a class="reference internal" href="#set-alert-mask">set_alert_mask()</a> you can filter which alerts to receive through <tt class="docutils literal"><span class="pre">pop_alert()</span></tt>.
 For information about the alert categories, see <a class="reference internal" href="#alerts">alerts</a>.</p>
-<p><tt class="docutils literal">pop_alerts()</tt> pops all pending alerts in a single call. In high performance environments
+<p><tt class="docutils literal"><span class="pre">pop_alerts()</span></tt> pops all pending alerts in a single call. In high performance environments
 with a very high alert churn rate, this can save significant amount of time compared to
 popping alerts one at a time. Each call requires one round-trip to the network thread. If
 alerts are produced in a higher rate than they can be popped (when popped one at a time)
 it's easy to get stuck in an infinite loop, trying to drain the alert queue. Popping the entire
 queue at once avoids this problem.</p>
-<p>However, the <tt class="docutils literal">pop_alerts</tt> function comes with significantly more responsibility. You pass
+<p>However, the <tt class="docutils literal"><span class="pre">pop_alerts</span></tt> function comes with significantly more responsibility. You pass
 in an <em>empty</em> <tt class="docutils literal"><span class="pre">std::dequeue&lt;alert*&gt;</span></tt> to it. If it's not empty, all elements in it will
 be deleted and then cleared. All currently pending alerts are returned by being swapped
 into the passed in container. The responsibility of deleting the alerts is transferred
 to the caller. This means you need to call delete for each item in the returned dequeue.
 It's probably a good idea to delete the alerts as you handle them, to save one extra
 pass over the dequeue.</p>
-<p>Alternatively, you can pass in the same container the next time you call <tt class="docutils literal">pop_alerts</tt>.</p>
-<p><tt class="docutils literal">wait_for_alert</tt> blocks until an alert is available, or for no more than <tt class="docutils literal">max_wait</tt>
-time. If <tt class="docutils literal">wait_for_alert</tt> returns because of the time-out, and no alerts are available,
+<p>Alternatively, you can pass in the same container the next time you call <tt class="docutils literal"><span class="pre">pop_alerts</span></tt>.</p>
+<p><tt class="docutils literal"><span class="pre">wait_for_alert</span></tt> blocks until an alert is available, or for no more than <tt class="docutils literal"><span class="pre">max_wait</span></tt>
+time. If <tt class="docutils literal"><span class="pre">wait_for_alert</span></tt> returns because of the time-out, and no alerts are available,
 it returns 0. If at least one alert was generated, a pointer to that alert is returned.
-The alert is not popped, any subsequent calls to <tt class="docutils literal">wait_for_alert</tt> will return the
-same pointer until the alert is popped by calling <tt class="docutils literal">pop_alert</tt>. This is useful for
+The alert is not popped, any subsequent calls to <tt class="docutils literal"><span class="pre">wait_for_alert</span></tt> will return the
+same pointer until the alert is popped by calling <tt class="docutils literal"><span class="pre">pop_alert</span></tt>. This is useful for
 leaving any alert dispatching mechanism independent of this blocking call, the dispatcher
 can be called and it can pop the alert independently.</p>
-<p>In the python binding, <tt class="docutils literal">wait_for_alert</tt> takes the number of milliseconds to wait as an integer.</p>
+<p>In the python binding, <tt class="docutils literal"><span class="pre">wait_for_alert</span></tt> takes the number of milliseconds to wait as an integer.</p>
 <p>To control the max number of alerts that's queued by the session, see
 <tt class="docutils literal"><span class="pre">session_settings::alert_queue_size</span></tt>.</p>
-<p><tt class="docutils literal">save_resume_data_alert</tt> and <tt class="docutils literal">save_resume_data_failed_alert</tt> are always posted, regardelss
+<p><tt class="docutils literal"><span class="pre">save_resume_data_alert</span></tt> and <tt class="docutils literal"><span class="pre">save_resume_data_failed_alert</span></tt> are always posted, regardelss
 of the alert mask.</p>
 </div>
 <div class="section" id="add-feed">
@@ -1136,7 +1136,7 @@
 </blockquote>
 <p>This adds an RSS feed to the session. The feed will be refreshed
 regularly and optionally add all torrents from the feed, as they
-appear. The feed is defined by the <tt class="docutils literal">feed_settings</tt> object:</p>
+appear. The feed is defined by the <tt class="docutils literal"><span class="pre">feed_settings</span></tt> object:</p>
 <pre class="literal-block">
 struct feed_settings
 {
@@ -1149,7 +1149,7 @@
         add_torrent_params add_args;
 };
 </pre>
-<p>By default <tt class="docutils literal">auto_download</tt> is true, which means all torrents in
+<p>By default <tt class="docutils literal"><span class="pre">auto_download</span></tt> is true, which means all torrents in
 the feed will be downloaded. Set this to false in order to manually
 add torrents to the session. You may react to the <a class="reference internal" href="#rss-alert">rss_alert</a> when
 a feed has been updated to poll it for the new items in the feed
@@ -1157,24 +1157,24 @@
 an <a class="reference internal" href="#add-torrent-alert">add_torrent_alert</a> is posted which includes the torrent handle
 as well as the error code if it failed to be added. You may also call
 <tt class="docutils literal"><span class="pre">session::get_torrents()</span></tt> to get the handles to the new torrents.</p>
-<p>Before adding the feed, you must set the <tt class="docutils literal">url</tt> field to the
+<p>Before adding the feed, you must set the <tt class="docutils literal"><span class="pre">url</span></tt> field to the
 feed's url. It may point to an RSS or an atom feed.</p>
-<p><tt class="docutils literal">auto_map_handles</tt> defaults to true and determines whether or
-not to set the <tt class="docutils literal">handle</tt> field in the <tt class="docutils literal">feed_item</tt>, returned
+<p><tt class="docutils literal"><span class="pre">auto_map_handles</span></tt> defaults to true and determines whether or
+not to set the <tt class="docutils literal"><span class="pre">handle</span></tt> field in the <tt class="docutils literal"><span class="pre">feed_item</span></tt>, returned
 as the feed status. If auto-download is enabled, this setting
 is ignored. If auto-download is not set, setting this to false
 will save one pass through all the feed items trying to find
 corresponding torrents in the session.</p>
-<p>The <tt class="docutils literal">default_ttl</tt> is the default interval for refreshing a feed.
-This may be overridden by the feed itself (by specifying the <tt class="docutils literal">&lt;ttl&gt;</tt>
+<p>The <tt class="docutils literal"><span class="pre">default_ttl</span></tt> is the default interval for refreshing a feed.
+This may be overridden by the feed itself (by specifying the <tt class="docutils literal"><span class="pre">&lt;ttl&gt;</span></tt>
 tag) and defaults to 30 minutes. The field specifies the number of
 minutes between refreshes.</p>
 <p>If torrents are added automatically, you may want to set the
-<tt class="docutils literal">add_args</tt> to appropriate values for download directory etc.
+<tt class="docutils literal"><span class="pre">add_args</span></tt> to appropriate values for download directory etc.
 This object is used as a template for adding torrents from feeds,
 but some torrent specific fields will be overridden by the
 individual torrent being added. For more information on the
-<tt class="docutils literal">add_torrent_params</tt>, see <a class="reference internal" href="#async-add-torrent-add-torrent">async_add_torrent() add_torrent()</a>.</p>
+<tt class="docutils literal"><span class="pre">add_torrent_params</span></tt>, see <a class="reference internal" href="#async-add-torrent-add-torrent">async_add_torrent() add_torrent()</a>.</p>
 <p>The returned <a class="reference internal" href="#feed-handle">feed_handle</a> is a handle which is used to interact
 with the feed, things like forcing a refresh or querying for
 information about the items in the feed. For more information,
@@ -1209,7 +1209,7 @@
 </pre>
 </blockquote>
 <p>This function adds an extension to this session. The argument is a function
-object that is called with a <tt class="docutils literal">torrent*</tt> and which should return a
+object that is called with a <tt class="docutils literal"><span class="pre">torrent*</span></tt> and which should return a
 <tt class="docutils literal"><span class="pre">boost::shared_ptr&lt;torrent_plugin&gt;</span></tt>. To write custom plugins, see
 <a class="reference external" href="libtorrent_plugins.html">libtorrent plugins</a>. For the typical bittorrent client all of these
 extensions should be added. The main plugins implemented in libtorrent are:</p>
@@ -1225,7 +1225,7 @@
 </pre>
 <dl class="docutils">
 <dt>uTorrent metadata</dt>
-<dd>Same as <tt class="docutils literal">metadata extension</tt> but compatible with uTorrent.</dd>
+<dd>Same as <tt class="docutils literal"><span class="pre">metadata</span> <span class="pre">extension</span></tt> but compatible with uTorrent.</dd>
 </dl>
 <pre class="literal-block">
 #include &lt;libtorrent/extensions/ut_metadata.hpp&gt;
@@ -1282,10 +1282,10 @@
 proxy_settings const&amp; i2p_proxy();
 </pre>
 </blockquote>
-<p><tt class="docutils literal">set_i2p_proxy</tt> sets the <a class="reference external" href="http://www.i2p2.de">i2p</a> proxy, and tries to open a persistant
+<p><tt class="docutils literal"><span class="pre">set_i2p_proxy</span></tt> sets the <a class="reference external" href="http://www.i2p2.de">i2p</a> proxy, and tries to open a persistant
 connection to it. The only used fields in the proxy settings structs
-are <tt class="docutils literal">hostname</tt> and <tt class="docutils literal">port</tt>.</p>
-<p><tt class="docutils literal">i2p_proxy</tt> returns the current i2p proxy in use.</p>
+are <tt class="docutils literal"><span class="pre">hostname</span></tt> and <tt class="docutils literal"><span class="pre">port</span></tt>.</p>
+<p><tt class="docutils literal"><span class="pre">i2p_proxy</span></tt> returns the current i2p proxy in use.</p>
 </div>
 <div class="section" id="start-dht-stop-dht-set-dht-settings-dht-state-is-dht-running">
 <h2>start_dht() stop_dht() set_dht_settings() dht_state() is_dht_running()</h2>
@@ -1298,13 +1298,13 @@
 bool is_dht_running() const;
 </pre>
 </blockquote>
-<p>These functions are not available in case <tt class="docutils literal">TORRENT_DISABLE_DHT</tt> is
-defined. <tt class="docutils literal">start_dht</tt> starts the dht node and makes the trackerless service
+<p>These functions are not available in case <tt class="docutils literal"><span class="pre">TORRENT_DISABLE_DHT</span></tt> is
+defined. <tt class="docutils literal"><span class="pre">start_dht</span></tt> starts the dht node and makes the trackerless service
 available to torrents. The startup state is optional and can contain nodes
 and the node id from the previous session. The dht node state is a bencoded
 dictionary with the following entries:</p>
 <dl class="docutils">
-<dt><tt class="docutils literal">nodes</tt></dt>
+<dt><tt class="docutils literal"><span class="pre">nodes</span></tt></dt>
 <dd>A list of strings, where each string is a node endpoint encoded in binary. If
 the string is 6 bytes long, it is an IPv4 address of 4 bytes, encoded in
 network byte order (big endian), followed by a 2 byte port number (also
@@ -1313,16 +1313,16 @@
 <dt><tt class="docutils literal"><span class="pre">node-id</span></tt></dt>
 <dd>The node id written as a readable string as a hexadecimal number.</dd>
 </dl>
-<p><tt class="docutils literal">dht_state</tt> will return the current state of the dht node, this can be used
-to start up the node again, passing this entry to <tt class="docutils literal">start_dht</tt>. It is a good
+<p><tt class="docutils literal"><span class="pre">dht_state</span></tt> will return the current state of the dht node, this can be used
+to start up the node again, passing this entry to <tt class="docutils literal"><span class="pre">start_dht</span></tt>. It is a good
 idea to save this to disk when the session is closed, and read it up again
 when starting.</p>
 <p>If the port the DHT is supposed to listen on is already in use, and exception
 is thrown, <tt class="docutils literal"><span class="pre">asio::error</span></tt>.</p>
-<p><tt class="docutils literal">stop_dht</tt> stops the dht node.</p>
-<p><tt class="docutils literal">add_dht_node</tt> adds a node to the routing table. This can be used if your
+<p><tt class="docutils literal"><span class="pre">stop_dht</span></tt> stops the dht node.</p>
+<p><tt class="docutils literal"><span class="pre">add_dht_node</span></tt> adds a node to the routing table. This can be used if your
 client has its own source of bootstrapping nodes.</p>
-<p><tt class="docutils literal">set_dht_settings</tt> sets some parameters availavle to the dht node. The
+<p><tt class="docutils literal"><span class="pre">set_dht_settings</span></tt> sets some parameters availavle to the dht node. The
 struct has the following members:</p>
 <pre class="literal-block">
 struct dht_settings
@@ -1335,34 +1335,34 @@
         bool restrict_search_ips;
 };
 </pre>
-<p><tt class="docutils literal">max_peers_reply</tt> is the maximum number of peers the node will send in
-response to a <tt class="docutils literal">get_peers</tt> message from another node.</p>
-<p><tt class="docutils literal">search_branching</tt> is the number of concurrent search request the node will
+<p><tt class="docutils literal"><span class="pre">max_peers_reply</span></tt> is the maximum number of peers the node will send in
+response to a <tt class="docutils literal"><span class="pre">get_peers</span></tt> message from another node.</p>
+<p><tt class="docutils literal"><span class="pre">search_branching</span></tt> is the number of concurrent search request the node will
 send when announcing and refreshing the routing table. This parameter is
 called alpha in the kademlia paper.</p>
-<p><tt class="docutils literal">max_fail_count</tt> is the maximum number of failed tries to contact a node
+<p><tt class="docutils literal"><span class="pre">max_fail_count</span></tt> is the maximum number of failed tries to contact a node
 before it is removed from the routing table. If there are known working nodes
 that are ready to replace a failing node, it will be replaced immediately,
 this limit is only used to clear out nodes that don't have any node that can
 replace them.</p>
-<p><tt class="docutils literal">max_torrents</tt> is the total number of torrents to track from the DHT. This
+<p><tt class="docutils literal"><span class="pre">max_torrents</span></tt> is the total number of torrents to track from the DHT. This
 is simply an upper limit to make sure malicious DHT nodes cannot make us allocate
 an unbounded amount of memory.</p>
-<p><tt class="docutils literal">max_feed_items</tt> is the total number of feed items to store from the DHT. This
+<p><tt class="docutils literal"><span class="pre">max_feed_items</span></tt> is the total number of feed items to store from the DHT. This
 is simply an upper limit to make sure malicious DHT nodes cannot make us allocate
 an unbounded amount of memory.</p>
-<p><tt class="docutils literal">restrict_routing_ips</tt> determines if the routing table entries should restrict
+<p><tt class="docutils literal"><span class="pre">restrict_routing_ips</span></tt> determines if the routing table entries should restrict
 entries to one per IP. This defaults to true, which helps mitigate some attacks
 on the DHT. It prevents adding multiple nodes with IPs with a very close CIDR
 distance.</p>
-<p><tt class="docutils literal">restrict_search_ips</tt> determines if DHT searches should prevent adding nodes
+<p><tt class="docutils literal"><span class="pre">restrict_search_ips</span></tt> determines if DHT searches should prevent adding nodes
 with IPs with very close CIDR distance. This also defaults to true and helps
 mitigate certain attacks on the DHT.</p>
-<p>The <tt class="docutils literal">dht_settings</tt> struct used to contain a <tt class="docutils literal">service_port</tt> member to control
+<p>The <tt class="docutils literal"><span class="pre">dht_settings</span></tt> struct used to contain a <tt class="docutils literal"><span class="pre">service_port</span></tt> member to control
 which port the DHT would listen on and send messages from. This field is deprecated
 and ignored. libtorrent always tries to open the UDP socket on the same port
 as the TCP socket.</p>
-<p><tt class="docutils literal">is_dht_running()</tt> returns true if the DHT support has been started and false
+<p><tt class="docutils literal"><span class="pre">is_dht_running()</span></tt> returns true if the DHT support has been started and false
 otherwise.</p>
 </div>
 <div class="section" id="add-dht-node-add-dht-router">
@@ -1373,16 +1373,16 @@
 void add_dht_router(std::pair&lt;std::string, int&gt; const&amp; node);
 </pre>
 </blockquote>
-<p><tt class="docutils literal">add_dht_node</tt> takes a host name and port pair. That endpoint will be
+<p><tt class="docutils literal"><span class="pre">add_dht_node</span></tt> takes a host name and port pair. That endpoint will be
 pinged, and if a valid DHT reply is received, the node will be added to
 the routing table.</p>
-<p><tt class="docutils literal">add_dht_router</tt> adds the given endpoint to a list of DHT router nodes.
+<p><tt class="docutils literal"><span class="pre">add_dht_router</span></tt> adds the given endpoint to a list of DHT router nodes.
 If a search is ever made while the routing table is empty, those nodes will
 be used as backups. Nodes in the router node list will also never be added
 to the regular routing table, which effectively means they are only used
 for bootstrapping, to keep the load off them.</p>
 <p>An example routing node that you could typically add is
-<tt class="docutils literal">router.bittorrent.com</tt>.</p>
+<tt class="docutils literal"><span class="pre">router.bittorrent.com</span></tt>.</p>
 </div>
 <div class="section" id="start-lsd-stop-lsd">
 <h2>start_lsd() stop_lsd()</h2>
@@ -1407,10 +1407,10 @@
 </blockquote>
 <p>Starts and stops the UPnP service. When started, the listen port and the DHT
 port are attempted to be forwarded on local UPnP router devices.</p>
-<p>The upnp object returned by <tt class="docutils literal">start_upnp()</tt> can be used to add and remove
+<p>The upnp object returned by <tt class="docutils literal"><span class="pre">start_upnp()</span></tt> can be used to add and remove
 arbitrary port mappings. Mapping status is returned through the
 <a class="reference internal" href="#portmap-alert">portmap_alert</a> and the <a class="reference internal" href="#portmap-error-alert">portmap_error_alert</a>. The object will be valid until
-<tt class="docutils literal">stop_upnp()</tt> is called. See <a class="reference internal" href="#upnp-and-nat-pmp">UPnP and NAT-PMP</a>.</p>
+<tt class="docutils literal"><span class="pre">stop_upnp()</span></tt> is called. See <a class="reference internal" href="#upnp-and-nat-pmp">UPnP and NAT-PMP</a>.</p>
 <p>It is off by default.</p>
 </div>
 <div class="section" id="start-natpmp-stop-natpmp">
@@ -1423,16 +1423,16 @@
 </blockquote>
 <p>Starts and stops the NAT-PMP service. When started, the listen port and the DHT
 port are attempted to be forwarded on the router through NAT-PMP.</p>
-<p>The natpmp object returned by <tt class="docutils literal">start_natpmp()</tt> can be used to add and remove
+<p>The natpmp object returned by <tt class="docutils literal"><span class="pre">start_natpmp()</span></tt> can be used to add and remove
 arbitrary port mappings. Mapping status is returned through the
 <a class="reference internal" href="#portmap-alert">portmap_alert</a> and the <a class="reference internal" href="#portmap-error-alert">portmap_error_alert</a>. The object will be valid until
-<tt class="docutils literal">stop_natpmp()</tt> is called. See <a class="reference internal" href="#upnp-and-nat-pmp">UPnP and NAT-PMP</a>.</p>
+<tt class="docutils literal"><span class="pre">stop_natpmp()</span></tt> is called. See <a class="reference internal" href="#upnp-and-nat-pmp">UPnP and NAT-PMP</a>.</p>
 <p>It is off by default.</p>
 </div>
 </div>
 <div class="section" id="entry">
 <h1>entry</h1>
-<p>The <tt class="docutils literal">entry</tt> class represents one node in a bencoded hierarchy. It works as a
+<p>The <tt class="docutils literal"><span class="pre">entry</span></tt> class represents one node in a bencoded hierarchy. It works as a
 variant type, it can be either a list, a dictionary (<tt class="docutils literal"><span class="pre">std::map</span></tt>), an integer
 or a string. This is its synopsis:</p>
 <pre class="literal-block">
@@ -1508,13 +1508,13 @@
 dictionary_type const&amp; dict() const;
 </pre>
 </blockquote>
-<p>The <tt class="docutils literal">integer()</tt>, <tt class="docutils literal">string()</tt>, <tt class="docutils literal">list()</tt> and <tt class="docutils literal">dict()</tt> functions
-are accessors that return the respective type. If the <tt class="docutils literal">entry</tt> object isn't of the
+<p>The <tt class="docutils literal"><span class="pre">integer()</span></tt>, <tt class="docutils literal"><span class="pre">string()</span></tt>, <tt class="docutils literal"><span class="pre">list()</span></tt> and <tt class="docutils literal"><span class="pre">dict()</span></tt> functions
+are accessors that return the respective type. If the <tt class="docutils literal"><span class="pre">entry</span></tt> object isn't of the
 type you request, the accessor will throw <a class="reference internal" href="#libtorrent-exception">libtorrent_exception</a> (which derives from
-<tt class="docutils literal"><span class="pre">std::runtime_error</span></tt>). You can ask an <tt class="docutils literal">entry</tt> for its type through the
-<tt class="docutils literal">type()</tt> function.</p>
-<p>The <tt class="docutils literal">print()</tt> function is there for debug purposes only.</p>
-<p>If you want to create an <tt class="docutils literal">entry</tt> you give it the type you want it to have in its
+<tt class="docutils literal"><span class="pre">std::runtime_error</span></tt>). You can ask an <tt class="docutils literal"><span class="pre">entry</span></tt> for its type through the
+<tt class="docutils literal"><span class="pre">type()</span></tt> function.</p>
+<p>The <tt class="docutils literal"><span class="pre">print()</span></tt> function is there for debug purposes only.</p>
+<p>If you want to create an <tt class="docutils literal"><span class="pre">entry</span></tt> you give it the type you want it to have in its
 constructor, and then use one of the non-const accessors to get a reference which you then
 can assign the value you want it to have.</p>
 <p>The typical code to get info from a torrent file will then look like this:</p>
@@ -1559,10 +1559,10 @@
 </blockquote>
 <p>All of these functions requires the entry to be a dictionary, if it isn't they
 will throw <tt class="docutils literal"><span class="pre">libtorrent::type_error</span></tt>.</p>
-<p>The non-const versions of the <tt class="docutils literal">operator[]</tt> will return a reference to either
+<p>The non-const versions of the <tt class="docutils literal"><span class="pre">operator[]</span></tt> will return a reference to either
 the existing element at the given key or, if there is no element with the
 given key, a reference to a newly inserted element at that key.</p>
-<p>The const version of <tt class="docutils literal">operator[]</tt> will only return a reference to an
+<p>The const version of <tt class="docutils literal"><span class="pre">operator[]</span></tt> will only return a reference to an
 existing element at the given key. If the key is not found, it will throw
 <tt class="docutils literal"><span class="pre">libtorrent::type_error</span></tt>.</p>
 </div>
@@ -1584,9 +1584,9 @@
 <div class="section" id="torrent-info">
 <h1>torrent_info</h1>
 <p>In previous versions of libtorrent, this class was also used for creating
-torrent files. This functionality has been moved to <tt class="docutils literal">create_torrent</tt>, see
+torrent files. This functionality has been moved to <tt class="docutils literal"><span class="pre">create_torrent</span></tt>, see
 <a class="reference external" href="make_torrent.html">make_torrent</a>.</p>
-<p>The <tt class="docutils literal">torrent_info</tt> has the following synopsis:</p>
+<p>The <tt class="docutils literal"><span class="pre">torrent_info</span></tt> has the following synopsis:</p>
 <pre class="literal-block">
 class torrent_info
 {
@@ -1684,21 +1684,21 @@
 but leave all other fields empty. This is used internally when downloading torrents without
 the metadata. The metadata will be created by libtorrent as soon as it has been downloaded
 from the swarm.</p>
-<p>The constructor that takes a <tt class="docutils literal">lazy_entry</tt> will create a <tt class="docutils literal">torrent_info</tt> object from the
-information found in the given torrent_file. The <tt class="docutils literal">lazy_entry</tt> represents a tree node in
+<p>The constructor that takes a <tt class="docutils literal"><span class="pre">lazy_entry</span></tt> will create a <tt class="docutils literal"><span class="pre">torrent_info</span></tt> object from the
+information found in the given torrent_file. The <tt class="docutils literal"><span class="pre">lazy_entry</span></tt> represents a tree node in
 an bencoded file. To load an ordinary .torrent file
-into a <tt class="docutils literal">lazy_entry</tt>, use <a class="reference internal" href="#lazy-bdecode">lazy_bdecode()</a>.</p>
+into a <tt class="docutils literal"><span class="pre">lazy_entry</span></tt>, use <a class="reference internal" href="#lazy-bdecode">lazy_bdecode()</a>.</p>
 <p>The version that takes a buffer pointer and a size will decode it as a .torrent file and
 initialize the torrent_info object for you.</p>
 <p>The version that takes a filename will simply load the torrent file and decode it inside
 the constructor, for convenience. This might not be the most suitable for applications that
 want to be able to report detailed errors on what might go wrong.</p>
-<p>The overloads that takes an <tt class="docutils literal">error_code const&amp;</tt> never throws if an error occur, they
+<p>The overloads that takes an <tt class="docutils literal"><span class="pre">error_code</span> <span class="pre">const&amp;</span></tt> never throws if an error occur, they
 will simply set the error code to describe what went wrong and not fully initialize the
 torrent_info object. The overloads that do not take the extra <a class="reference internal" href="#error-code">error_code</a> parameter will
 always throw if an error occurs. These overloads are not available when building without
 exception support.</p>
-<p>The <tt class="docutils literal">flags</tt> argument is currently unused.</p>
+<p>The <tt class="docutils literal"><span class="pre">flags</span></tt> argument is currently unused.</p>
 </div>
 <div class="section" id="add-tracker">
 <h2>add_tracker()</h2>
@@ -1707,7 +1707,7 @@
 void add_tracker(std::string const&amp; url, int tier = 0);
 </pre>
 </blockquote>
-<p><tt class="docutils literal">add_tracker()</tt> adds a tracker to the announce-list. The <tt class="docutils literal">tier</tt> determines the order in
+<p><tt class="docutils literal"><span class="pre">add_tracker()</span></tt> adds a tracker to the announce-list. The <tt class="docutils literal"><span class="pre">tier</span></tt> determines the order in
 which the trackers are to be tried. For more information see <a class="reference internal" href="#trackers">trackers()</a>.</p>
 </div>
 <div class="section" id="files-orig-files">
@@ -1718,15 +1718,15 @@
 file_storage const&amp; orig_files() const;
 </pre>
 </blockquote>
-<p>The <tt class="docutils literal">file_storage</tt> object contains the information on how to map the pieces to
-files. It is separated from the <tt class="docutils literal">torrent_info</tt> object because when creating torrents
+<p>The <tt class="docutils literal"><span class="pre">file_storage</span></tt> object contains the information on how to map the pieces to
+files. It is separated from the <tt class="docutils literal"><span class="pre">torrent_info</span></tt> object because when creating torrents
 a storage object needs to be created without having a torrent file. When renaming files
-in a storage, the storage needs to make its own copy of the <tt class="docutils literal">file_storage</tt> in order
+in a storage, the storage needs to make its own copy of the <tt class="docutils literal"><span class="pre">file_storage</span></tt> in order
 to make its mapping differ from the one in the torrent file.</p>
-<p><tt class="docutils literal">orig_files()</tt> returns the original (unmodified) file storage for this torrent. This
+<p><tt class="docutils literal"><span class="pre">orig_files()</span></tt> returns the original (unmodified) file storage for this torrent. This
 is used by the web server connection, which needs to request files with the original
 names. Filename may be chaged using <tt class="docutils literal"><span class="pre">torrent_info::rename_file()</span></tt>.</p>
-<p>For more information on the <tt class="docutils literal">file_storage</tt> object, see the separate document on how
+<p>For more information on the <tt class="docutils literal"><span class="pre">file_storage</span></tt> object, see the separate document on how
 to create torrents.</p>
 </div>
 <div class="section" id="remap-files">
@@ -1739,7 +1739,7 @@
 <p>Remaps the file storage to a new file layout. This can be used to, for instance,
 download all data in a torrent to a single file, or to a number of fixed size
 sector aligned files, regardless of the number and sizes of the files in the torrent.</p>
-<p>The new specified <tt class="docutils literal">file_storage</tt> must have the exact same size as the current one.</p>
+<p>The new specified <tt class="docutils literal"><span class="pre">file_storage</span></tt> must have the exact same size as the current one.</p>
 </div>
 <div class="section" id="rename-file">
 <h2>rename_file()</h2>
@@ -1750,10 +1750,10 @@
 </pre>
 </blockquote>
 <p>Renames a the file with the specified index to the new name. The new filename is
-reflected by the <tt class="docutils literal">file_storage</tt> returned by <tt class="docutils literal">files()</tt> but not by the one
-returned by <tt class="docutils literal">orig_files()</tt>.</p>
+reflected by the <tt class="docutils literal"><span class="pre">file_storage</span></tt> returned by <tt class="docutils literal"><span class="pre">files()</span></tt> but not by the one
+returned by <tt class="docutils literal"><span class="pre">orig_files()</span></tt>.</p>
 <p>If you want to rename the base name of the torrent (for a multifile torrent), you
-can copy the <tt class="docutils literal">file_storage</tt> (see <a class="reference internal" href="#files-orig-files">files() orig_files()</a>), change the name, and
+can copy the <tt class="docutils literal"><span class="pre">file_storage</span></tt> (see <a class="reference internal" href="#files-orig-files">files() orig_files()</a>), change the name, and
 then use <a class="reference internal" href="#remap-files">remap_files()</a>.</p>
 </div>
 <div class="section" id="begin-files-end-files-rbegin-files-rend-files">
@@ -1767,10 +1767,10 @@
 </pre>
 </blockquote>
 <p>This class will need some explanation. First of all, to get a list of all files
-in the torrent, you can use <tt class="docutils literal">begin_files()</tt>, <tt class="docutils literal">end_files()</tt>,
-<tt class="docutils literal">rbegin_files()</tt> and <tt class="docutils literal">rend_files()</tt>. These will give you standard vector
-iterators with the type <tt class="docutils literal">internal_file_entry</tt>, which is an internal type.</p>
-<p>You can resolve it into the public representation of a file (<tt class="docutils literal">file_entry</tt>)
+in the torrent, you can use <tt class="docutils literal"><span class="pre">begin_files()</span></tt>, <tt class="docutils literal"><span class="pre">end_files()</span></tt>,
+<tt class="docutils literal"><span class="pre">rbegin_files()</span></tt> and <tt class="docutils literal"><span class="pre">rend_files()</span></tt>. These will give you standard vector
+iterators with the type <tt class="docutils literal"><span class="pre">internal_file_entry</span></tt>, which is an internal type.</p>
+<p>You can resolve it into the public representation of a file (<tt class="docutils literal"><span class="pre">file_entry</span></tt>)
 using the <tt class="docutils literal"><span class="pre">file_storage::at</span></tt> function, which takes an index and an iterator;</p>
 <pre class="literal-block">
 struct file_entry
@@ -1787,31 +1787,31 @@
         bool symlink_attribute:1;
 };
 </pre>
-<p>The <tt class="docutils literal">path</tt> is the full path of this file. The paths are unicode strings
+<p>The <tt class="docutils literal"><span class="pre">path</span></tt> is the full path of this file. The paths are unicode strings
 encoded in UTF-8.</p>
-<p><tt class="docutils literal">size</tt> is the size of the file (in bytes) and <tt class="docutils literal">offset</tt> is the byte offset
+<p><tt class="docutils literal"><span class="pre">size</span></tt> is the size of the file (in bytes) and <tt class="docutils literal"><span class="pre">offset</span></tt> is the byte offset
 of the file within the torrent. i.e. the sum of all the sizes of the files
 before it in the list.</p>
-<p><tt class="docutils literal">file_base</tt> is the offset in the file where the storage should start. The normal
+<p><tt class="docutils literal"><span class="pre">file_base</span></tt> is the offset in the file where the storage should start. The normal
 case is to have this set to 0, so that the storage starts saving data at the start
 if the file. In cases where multiple files are mapped into the same file though,
-the <tt class="docutils literal">file_base</tt> should be set to an offset so that the different regions do
+the <tt class="docutils literal"><span class="pre">file_base</span></tt> should be set to an offset so that the different regions do
 not overlap. This is used when mapping &quot;unselected&quot; files into a so-called part
 file.</p>
-<p><tt class="docutils literal">mtime</tt> is the modification time of this file specified in posix time.</p>
-<p><tt class="docutils literal">symlink_path</tt> is the path which this is a symlink to, or empty if this is
-not a symlink. This field is only used if the <tt class="docutils literal">symlink_attribute</tt> is set.</p>
-<p><tt class="docutils literal">filehash</tt> is a sha-1 hash of the content of the file, or zeroes, if no
+<p><tt class="docutils literal"><span class="pre">mtime</span></tt> is the modification time of this file specified in posix time.</p>
+<p><tt class="docutils literal"><span class="pre">symlink_path</span></tt> is the path which this is a symlink to, or empty if this is
+not a symlink. This field is only used if the <tt class="docutils literal"><span class="pre">symlink_attribute</span></tt> is set.</p>
+<p><tt class="docutils literal"><span class="pre">filehash</span></tt> is a sha-1 hash of the content of the file, or zeroes, if no
 file hash was present in the torrent file. It can be used to potentially
 find alternative sources for the file.</p>
-<p><tt class="docutils literal">pad_file</tt> is set to true for files that are not part of the data of the torrent.
+<p><tt class="docutils literal"><span class="pre">pad_file</span></tt> is set to true for files that are not part of the data of the torrent.
 They are just there to make sure the next file is aligned to a particular byte offset
 or piece boundry. These files should typically be hidden from an end user. They are
 not written to disk.</p>
-<p><tt class="docutils literal">hidden_attribute</tt> is true if the file was marked as hidden (on windows).</p>
-<p><tt class="docutils literal">executable_attribute</tt> is true if the file was marked as executable (posix)</p>
-<p><tt class="docutils literal">symlink_attribute</tt> is true if the file was a symlink. If this is the case
-the <tt class="docutils literal">symlink_index</tt> refers to a string which specifies the original location
+<p><tt class="docutils literal"><span class="pre">hidden_attribute</span></tt> is true if the file was marked as hidden (on windows).</p>
+<p><tt class="docutils literal"><span class="pre">executable_attribute</span></tt> is true if the file was marked as executable (posix)</p>
+<p><tt class="docutils literal"><span class="pre">symlink_attribute</span></tt> is true if the file was a symlink. If this is the case
+the <tt class="docutils literal"><span class="pre">symlink_index</span></tt> refers to a string which specifies the original location
 where the data for this file was found.</p>
 </div>
 <div class="section" id="num-files-file-at">
@@ -1822,7 +1822,7 @@
 file_entry const&amp; file_at(int index) const;
 </pre>
 </blockquote>
-<p>If you need index-access to files you can use the <tt class="docutils literal">num_files()</tt> and <tt class="docutils literal">file_at()</tt>
+<p>If you need index-access to files you can use the <tt class="docutils literal"><span class="pre">num_files()</span></tt> and <tt class="docutils literal"><span class="pre">file_at()</span></tt>
 to access files using indices.</p>
 </div>
 <div class="section" id="map-block">
@@ -1845,10 +1845,10 @@
         size_type size;
 };
 </pre>
-<p>The <tt class="docutils literal">file_index</tt> refers to the index of the file (in the torrent_info).
-To get the path and filename, use <tt class="docutils literal">file_at()</tt> and give the <tt class="docutils literal">file_index</tt>
-as argument. The <tt class="docutils literal">offset</tt> is the byte offset in the file where the range
-starts, and <tt class="docutils literal">size</tt> is the number of bytes this range is. The size + offset
+<p>The <tt class="docutils literal"><span class="pre">file_index</span></tt> refers to the index of the file (in the torrent_info).
+To get the path and filename, use <tt class="docutils literal"><span class="pre">file_at()</span></tt> and give the <tt class="docutils literal"><span class="pre">file_index</span></tt>
+as argument. The <tt class="docutils literal"><span class="pre">offset</span></tt> is the byte offset in the file where the range
+starts, and <tt class="docutils literal"><span class="pre">size</span></tt> is the number of bytes this range is. The size + offset
 will never be greater than the file size.</p>
 </div>
 <div class="section" id="map-file">
@@ -1860,9 +1860,9 @@
 </pre>
 </blockquote>
 <p>This function will map a range in a specific file into a range in the torrent.
-The <tt class="docutils literal">file_offset</tt> parameter is the offset in the file, given in bytes, where
+The <tt class="docutils literal"><span class="pre">file_offset</span></tt> parameter is the offset in the file, given in bytes, where
 0 is the start of the file.

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.