removed connecting_to_tracker state

This commit is contained in:
Arvid Norberg 2008-08-03 15:32:15 +00:00
parent cbf8e6f3b1
commit 7d47ed54eb
5 changed files with 3 additions and 16 deletions

View File

@ -1,4 +1,5 @@
* Removed 'connecting_to_tracker' torrent state
* Fix bug where FAST pieces were cancelled on choke
* Fixed problems with restoring piece states when hash failed.
* Minimum peer reconnect time fix. Peers with no failures would

View File

@ -2286,7 +2286,6 @@ struct torrent_status
{
queued_for_checking,
checking_files,
connecting_to_tracker,
downloading_metadata,
downloading,
finished,
@ -2382,10 +2381,6 @@ This torrent will wait for its turn.</td>
<td>The torrent has not started its download yet, and is
currently checking existing files.</td>
</tr>
<tr><td><tt class="docutils literal"><span class="pre">connecting_to_tracker</span></tt></td>
<td>The torrent has sent a request to the tracker and is
currently waiting for a response</td>
</tr>
<tr><td><tt class="docutils literal"><span class="pre">downloading_metadata</span></tt></td>
<td>The torrent is trying to download metadata from peers.
This assumes the metadata_transfer extension is in use.</td>

View File

@ -2241,7 +2241,6 @@ It contains the following fields::
{
queued_for_checking,
checking_files,
connecting_to_tracker,
downloading_metadata,
downloading,
finished,
@ -2331,9 +2330,6 @@ current task is in the ``state`` member, it will be one of the following:
|``checking_files`` |The torrent has not started its download yet, and is |
| |currently checking existing files. |
+--------------------------+----------------------------------------------------------+
|``connecting_to_tracker`` |The torrent has sent a request to the tracker and is |
| |currently waiting for a response |
+--------------------------+----------------------------------------------------------+
|``downloading_metadata`` |The torrent is trying to download metadata from peers. |
| |This assumes the metadata_transfer extension is in use. |
+--------------------------+----------------------------------------------------------+

View File

@ -126,7 +126,6 @@ namespace libtorrent
{
queued_for_checking,
checking_files,
connecting_to_tracker,
downloading_metadata,
downloading,
finished,

View File

@ -3272,7 +3272,7 @@ namespace libtorrent
TORRENT_ASSERT(m_torrent_file->is_valid());
INVARIANT_CHECK;
set_state(torrent_status::connecting_to_tracker);
set_state(torrent_status::downloading);
if (!is_seed())
{
@ -4368,11 +4368,7 @@ namespace libtorrent
if (!valid_metadata())
{
if (m_got_tracker_response == false && m_connections.empty())
st.state = torrent_status::connecting_to_tracker;
else
st.state = torrent_status::downloading_metadata;
st.state = torrent_status::downloading_metadata;
st.progress = m_progress;
st.block_size = 0;
return st;