From 7d751b80da15915d44c8a2f12bf6fe3e3020ccca Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Tue, 26 Aug 2014 03:14:32 +0000 Subject: [PATCH] merged fixes from RC_1_0 --- ChangeLog | 1 + Makefile.am | 13 +++- docs/base.css | 6 +- docs/building.html | 11 +-- docs/client_test.html | 77 ++++++++++++++++++++ docs/contributing.html | 11 +-- docs/dht_extensions.html | 11 +-- docs/dht_rss.html | 11 +-- docs/dht_sec.html | 11 +-- docs/dht_store.html | 17 ++--- docs/examples.html | 11 +-- docs/extension_protocol.html | 11 +-- docs/features.html | 11 +-- docs/img/bg.png | Bin 0 -> 2773 bytes docs/img/blue_bottom.png | Bin 0 -> 13137 bytes docs/img/blue_top.png | Bin 0 -> 2953 bytes docs/img/dotline.gif | Bin 0 -> 181 bytes docs/img/logo.png | Bin 0 -> 12163 bytes docs/img/minus.gif | Bin 0 -> 262 bytes docs/img/orange.png | Bin 0 -> 24833 bytes docs/index.html | 11 +-- docs/makefile | 4 +- docs/projects.html | 11 +-- docs/python_binding.html | 11 +-- docs/reference-Session.html | 11 +-- docs/rst.css | 8 +-- docs/style.css | 6 +- docs/template.txt | 11 +-- docs/todo.html | 96 ++++++++++++------------- docs/troubleshooting.html | 11 +-- docs/tuning.html | 11 +-- docs/udp_tracker_protocol.html | 11 +-- docs/utp.html | 11 +-- include/libtorrent/peer_connection.hpp | 10 +-- m4/ax_python_devel.m4 | 2 +- src/peer_connection.cpp | 2 +- 36 files changed, 195 insertions(+), 234 deletions(-) create mode 100644 docs/img/bg.png create mode 100644 docs/img/blue_bottom.png create mode 100644 docs/img/blue_top.png create mode 100644 docs/img/dotline.gif create mode 100644 docs/img/logo.png create mode 100644 docs/img/minus.gif create mode 100644 docs/img/orange.png diff --git a/ChangeLog b/ChangeLog index 4299f0524..c5b9f8bb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * fix uTP edge case where udp socket buffer fills up * fix nagle implementation in uTP + * fixed overflow and download performance issue when downloading at high rates * fixed bug in add_torrent_alert::message for magnet links * disable optimistic disconnects when connection limit is low * improved error handling of session::listen_on diff --git a/Makefile.am b/Makefile.am index 7543ca3da..0036399a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,6 @@ DOCS_IMAGES = \ docs/read_disk_buffers.png \ docs/session_stats_peers.png \ docs/storage.png \ - docs/style.css \ docs/todo.html \ docs/write_disk_buffers.png \ docs/ziptorrent_thumb.gif \ @@ -34,7 +33,17 @@ DOCS_IMAGES = \ docs/hash_distribution.png \ docs/complete_bit_prefixes.png \ docs/troubleshooting.png \ - docs/troubleshooting_thumb.png + docs/troubleshooting_thumb.png \ + docs/style.css \ + docs/base.css \ + docs/rst.css \ + docs/img/bg.png \ + docs/img/blue_bottom.png \ + docs/img/blue_top.png \ + docs/img/dotline.gif \ + docs/img/logo.png \ + docs/img/minus.gif \ + docs/img/orange.png DOCS_PAGES = \ docs/building.html \ diff --git a/docs/base.css b/docs/base.css index 3a4ca847e..0baf4fe7b 100644 --- a/docs/base.css +++ b/docs/base.css @@ -47,7 +47,7 @@ body { text-align: center; } #header { height: 116px; width: 695px; - background: url(../img/orange.png) #FDA72A no-repeat top left; + background: url('img/orange.png') #FDA72A no-repeat top left; } #header h1 { @@ -56,7 +56,7 @@ body { text-align: center; } float: right; width: 536px; height: 116px; - background: url(../img/logo.png); + background: url('img/logo.png'); } #header h1 span, #header h2 { display: none; } @@ -65,7 +65,7 @@ body { text-align: center; } clear: both; width: 695px; height: 49px; - background: #D3D3D3 url(../img/footer.png) no-repeat left top; + background: #D3D3D3 url('img/footer.png') no-repeat left top; text-align: center; margin-bottom: 1em; } diff --git a/docs/building.html b/docs/building.html index e83276a3c..ea8007779 100644 --- a/docs/building.html +++ b/docs/building.html @@ -6,8 +6,8 @@ libtorrent manual - - + + + + + + +
+
+ +
+

client_test example program

+ +

Client test is a, more or less, complete bittorrent client. It lacks most +settings and you can't start or stop torrents once you've started it. All +the settings are hardcoded. The commandline arguments are:

+
+client_test <filename1.torrent> <filename2.torrent> ...
+
+

You can start any number of torrent downloads/seeds via the commandline. +If one argument starts with http:// it is interpreted as a tracker +announce url, and it expects an info-hash as the next argument. The info-hash +has to be hex-encoded. For example: 2410d4554d5ed856d69f426c38791673c59f4418. +If you pass an announce url and info-hash, a torrent-less download is started. +It relies on that at least one peer on the tracker is running a libtorrent based +client and has the metadata (.torrent file). The metadata extension in +libtorrent will then download it from that peer (or from those peers if more +than one).

+

While running, the client_test sample will look something like this:

+client_test.png +

The commands available in the client are:

+
    +
  • q quits the client (there will be a delay while the client waits +for tracker responses)
    • +
  • l toggle log. Will display the log at the bottom, informing about +tracker and peer events.
    • +
  • i toggles torrent info. Will show the peer list for each torrent.
    • +
  • d toggle download info. Will show the block list for each torrent, +showing downloaded and requested blocks.
    • +
  • p pause all torrents.
    • +
  • u unpause all torrents.
    • +
  • r force tracker reannounce for all torrents.
    • +
  • f toggle show file progress. Displays a list of all files and the +download progress for each file.
    • +
+

The list at the bottom (shown if you press d) shows which blocks has +been requested from which peer. The green background means that it has been +downloaded. It shows that fast peers will prefer to request whole pieces +instead of dowloading parts of pieces. It may make it easier to determine +which peer that sent the corrupt data if a piece fails the hash test.

+
+ + diff --git a/docs/contributing.html b/docs/contributing.html index ee43cd1dd..0416874f4 100644 --- a/docs/contributing.html +++ b/docs/contributing.html @@ -6,8 +6,8 @@ libtorrent manual - - + +