diff --git a/docs/index.html b/docs/index.html index e69de29bb..3dd0017e4 100755 --- a/docs/index.html +++ b/docs/index.html @@ -0,0 +1,70 @@ + + + + + + +libtorrent + + + +
+

libtorrent

+ +++++++ + + + + + + + + +
sourceforge pagedocumentationreport bugsscreenshotmailing list
+

libtorrent is a C++ library that aims to be a good alternative to all the +other bittorrent implementations around. It is a +library and not a full featured client, although it comes with a working +example client.

+

The main goals of libtorrent are:

+
+ +
+ +
+

Feedback

+

There's a mailing list, general libtorrent discussion.

+

You can usually find me as hydri in #btports @ irc.freenode.net.

+
+
+

Acknowledgements

+

Written by Arvid Norberg. Copyright (c) 2003

+

Contributions by Magnus Jonsson and Daniel Wallin

+

Thanks to Reimond Retz for bugfixes, suggestions and testing

+

Project is hosted by sourceforge.

+

sf_logo

+
+
+ + diff --git a/docs/manual.html b/docs/manual.html index 4c030da15..7e8d5dc9e 100755 --- a/docs/manual.html +++ b/docs/manual.html @@ -1849,7 +1849,7 @@ struct peer_error_alert: alert

invalid_request_alert

This is a debug alert that is generated by an incoming invalid piece request. The handle -is a handle to the torrent the peer is a member of. Ïp is the address of the peer and the +is a handle to the torrent the peer is a member of. ìp is the address of the peer and the request is the actual incoming request from the peer. The alert is generated as severity level debug.

@@ -2416,7 +2416,7 @@ boost::filesystem::path::default_name_check(boost::filesystem::native);
 
Written by Arvid Norberg. Copyright (c) 2003

 
Contributions by Magnus Jonsson and Daniel Wallin

 
Thanks to Reimond Retz for bugfixes, suggestions and testing

-
Thanks to University of Ume for providing development and
+
Thanks to University of Umeå for providing development and
 test hardware.

 
Project is hosted by sourceforge.

 
sf_logo

diff --git a/docs/udp_tracker_protocol.html b/docs/udp_tracker_protocol.html
index e69de29bb..1ea495d5b 100644
--- a/docs/udp_tracker_protocol.html
+++ b/docs/udp_tracker_protocol.html
@@ -0,0 +1,526 @@
+
+
+
+
+
+
+Bittorrent udp-tracker protocol extension
+
+
+
+

+
Bittorrent udp-tracker protocol extension

+
+

+
introduction

+
A tracker with the protocol "udp://" in its URI
+is supposed to be contacted using this protocol.

+
This protocol is supported by
+xbt-tracker.

+
For additional information and descritptions of
+the terminology used in this document, see
+the protocol specification

+
All values are sent in network byte order (big endian). The sizes
+are specified with ANSI-C standard types.

+
If no response to a request is received within 15 seconds, resend
+the request. If no reply has been received after 60 seconds, stop
+retrying.

+

+

+
connecting

+

+
Client sends packet:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int64_tconnection_idMust be initialized to 0x41727101980
+in network byte order. This will
+identify the protocol.
int32_taction0 for a connection request
int32_ttransaction_idRandomized by client.

+

+

+
Server replies with packet:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int32_tactionDescribes the type of packet, in this
+case it should be 0, for connect.
+If 3 (for error) see errors.
int32_ttransaction_idMust match the transaction_id sent
+from the client.
int64_tconnection_idA connection id, this is used when
+further information is exchanged with
+the tracker, to identify you.
+This connection id can be reused for
+multiple requests, but if it's cached
+for too long, it will not be valid
+anymore.

+

+

+

+
announcing

+

+
Client sends packet:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int64_tconnection_idThe connection id acquired from
+establishing the connection.
int32_tactionAction. in this case, 1 for announce.
+See actions.
int32_ttransaction_idRandomized by client.
int8_t[20]info_hashThe info-hash of the torrent you want
+announce yourself in.
int8_t[20]peer_idYour peer id.
int64_tdownloadedThe number of byte you've downloaded
+in this session.
int64_tleftThe number of bytes you have left to
+download until you're finished.
int64_tuploadedThe number of bytes you have uploaded
+in this session.
int32_tevent
The event, one of

+

+
    
+
  • none = 0
    • 
+
  • completed = 1
    • 
+
  • started = 2
    • 
+
  • stopped = 3
    • 
+

+

+
uint32_tipYour ip address. Set to 0 if you want
+the tracker to use the sender of
+this udp packet.
uint32_tkeyA unique key that is randomized by the
+client.
int32_tnum_wantThe maximum number of peers you want
+in the reply. Use -1 for default.
uint16_tportThe port you're listening on.
uint16_textensionsSee extensions

+

+

+
Server replies with packet:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int32_tactionThe action this is a reply to. Should
+in this case be 1 for announce.
+If 3 (for error) see errors.
+See actions.
int32_ttransaction_idMust match the transaction_id sent
+in the announce request.
int32_tintervalthe number of seconds you should wait
+until reannouncing yourself.
int32_tleechersThe number of peers in the swarm that
+has not finished downloading.
int32_tseedersThe number of peers in the swarm that
+has finished downloading and are
+seeding.

+
The rest of the server reply is a variable number of the following structure:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int32_tipThe ip of a peer in the swarm.
uint16_tportThe peer's listen port.

+

+

+

+
scraping

+

+
Client sends packet:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int64_tconnection_idThe connection id retreived from the
+establishing of the connection.
int32_tactionThe action, in this case, 2 for
+scrape. See actions.
int32_ttransaction_idRandomized by client.
int16_tnum_info_hashesThe number of info-hashes that will
+follow.
uint16_textensionsOptional field. See extensions.

+
The following structure is repeated num_info_hashes times:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int8_t[20]info_hashThe info hash that is to be scraped.

+

+

+
Server replies with packet:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int32_tactionThe action, should in this case be
+2 for scrape.
+If 3 (for error) see errors.
int32_ttransaction_idMust match the sent transaction id.

+
The rest of the packet contains the following structures once for each info-hash
+you asked in the scrape request.

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int32_tcompleteThe total number of completed
+downloads.
int32_tdownloadedThe current number of connected seeds.
int32_tincompleteThe current number of connected
+leechers.

+

+

+

+
errors

+
In case of a tracker error,

+

+
server replies packet:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int32_tactionThe action, in this case 3, for error.
+See actions.
int32_ttransaction_idMust match the transaction_id sent
+from the client.
int8_t[]error_stringThe rest of the packet is a string
+describing the error.

+

+

+

+
actions

+
The action fields has the following encoding:

+

+
    
+
  • connect = 0
    • 
+
  • announce = 1
    • 
+
  • scrape = 2
    • 
+
  • error = 3 (only in server replies)
    • 
+

+

+

+

+
extensions

+
The extensions field is a bitmask. The following
+bits are assigned:

+

+
+

+

+
authentication

+
The packet will have an authentication part
+appended to it. It has the following format:

+
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





sizenamedescription
int8_tusername_lengthThe number of characters in the
+username.
int8_t[]usernameThe username, the number of characters
+as specified in the previous field.
uint8_t[8]passwd_hashsha1(packet + sha1(password))
+The packet in this case means the
+entire packet except these 8 bytes
+that are the password hash. These are
+the 8 first bytes (most significant)
+from the 20 bytes hash calculated.

+

+

+

+
credits

+
Protocol designed by Olaf van der Spek

+

+

+
+
diff --git a/docs/udp_tracker_protocol.rst b/docs/udp_tracker_protocol.rst
index 8eefb29eb..f1682799d 100755
--- a/docs/udp_tracker_protocol.rst
+++ b/docs/udp_tracker_protocol.rst
@@ -183,7 +183,7 @@ Client sends packet:
 | int16_t     | num_info_hashes     | The number of info-hashes that will    |
 |             |                     | follow.                                |
 +-------------+---------------------+----------------------------------------+
-| uint16_t    | extensions          | See extensions_.                       |
+| uint16_t    | extensions          | Optional field. See extensions_.       |
 +-------------+---------------------+----------------------------------------+
 
 The following structure is repeated ``num_info_hashes`` times:
diff --git a/src/udp_tracker_connection.cpp b/src/udp_tracker_connection.cpp
index 788852064..9f505e6cf 100755
--- a/src/udp_tracker_connection.cpp
+++ b/src/udp_tracker_connection.cpp
@@ -363,7 +363,7 @@ namespace libtorrent
 			return false;
 		}
 		int complete = detail::read_int32(buf);
-		int completed = detail::read_int32(buf);
+		/*int downloaded = */detail::read_int32(buf);
 		int incomplete = detail::read_int32(buf);
 
 		if (!has_requester()) return true;