* Removed reset from ProtocolBuffer::consume.

* Added Download::skip_rate that tells us how many downloaded bytes
were skipped.

* Append '&' instead of '?' to the tracker url when the url already
has '?'.

* Added 'tracker_numwant' to the man page and moved tracker related
options to a seperate section.

* Removed Handshake::generate_hash and replaced it with sha1_salt
function in utils/sha1.h.

* Changed various encryption keys to use c_str.

* Set the handshake buffer size to the minimum required and moved them
to the end of Handshake.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@795 e378c898-3ddf-0310-93e7-cc216c733640

doc/rtorrent.1

@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "RTORRENT" "1" "15 October 2006" "BitTorrent client for ncurses" ""
+.TH "RTORRENT" "1" "21 October 2006" "BitTorrent client for ncurses" ""
 
 .SH NAME
 rtorrent \- a BitTorrent client for ncurses
@@ -188,10 +188,6 @@ Set the maximum global download rate.
 \fBupload_rate = \fIKB\fB\fR
 Set the maximum global upload rate.
 .TP
-\fBtracker_numwant = \fInumber\fB\fR
-Set the numwant field sent to the tracker, which indicates how many
-peers we want. A negative value disables this feature.
-.TP
 \fBbind = \fIa.b.c.d\fB\fR
 Bind listening socket and outgoing connections to this network
 interface address.
@@ -308,6 +304,27 @@ to the filename provided.
 \fBtry_import = \fIfile\fB\fR
 Load a resource file. \fBtry_import\fR does not throw
 torrent::input_error exception on bad input.
+.SH "TRACKER RELATED SETTINGS"
+.PP
+Tracker related settings.
+.TP
+\fBenable_trackers = \fIyes\fB\fR
+Set to \fBno\fR to disable all tracker requests. Useful
+for disabling rtorrent with the \fBschedule\fR command.
+.TP
+\fBtracker_dump = \fIfilename\fB\fR
+Dump tracker requests to \fBfilename\fR, disable by
+supplying an empty string. Only torrents loaded while
+\fBtracker_dump\fR contains a non-empty string will be
+logged at the moment, although disabling it will work as expected.
+.TP
+\fBtracker_numwant = \fInumber\fB\fR
+Set the numwant field sent to the tracker, which indicates how many
+peers we want. A negative value disables this feature.
+.TP
+\fBuse_udp_trackers = \fIyes\fB\fR
+Use UDP trackers. Disable if you are behind a firewall, etc, that does
+not allow connections to UDP trackers.
 .SH "USER-INTERFACE SETTINGS"
 .PP
 Display related settings.
@@ -407,19 +424,6 @@ Controls if a lock file is created in the session directory on startup.
 \fBsession_save = \fR
 Save the session files for all downloads.
 .TP
-\fBuse_udp_trackers = \fIyes\fB\fR
-Use UDP trackers. Disable if you are behind a firewall etc that does
-not allow connections to UDP trackers.
-.TP
-\fBenable_trackers = \fIyes\fB\fR
-Set to \fBno\fR to disable tracker requests.
-.TP
-\fBtracker_dump = \fIfilename\fB\fR
-Dump tracker requests to \fBfilename\fR, disable by
-supplying an empty string. Only torrents loaded while
-\fBtracker_dump\fR contains a non-empty string will be
-logged at the moment, although disabling it will work as expected.
-.TP
 \fBtos = \fIdefault|lowdelay|throughput|reliability|mincost\fB\fR
 Change the TOS of peer connections, by default set to
 \fBthroughput\fR\&. If the option is set to

doc/rtorrent.1.xml

@@ -438,14 +438,6 @@ Set the maximum global upload rate.
         </para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>tracker_numwant = <replaceable>number</replaceable></term>
-        <listitem><para>
-Set the numwant field sent to the tracker, which indicates how many
-peers we want. A negative value disables this feature.
-        </para></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>bind = <replaceable>a.b.c.d</replaceable></term>
         <listitem><para>
@@ -635,6 +627,52 @@ torrent::input_error exception on bad input.
 
   </refsect1>
 
+  <refsect1>
+    <title>TRACKER RELATED SETTINGS</title>
+    <para>
+Tracker related settings.
+    </para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>enable_trackers = <replaceable>yes</replaceable></term>
+        <listitem><para>
+Set to <emphasis>no</emphasis> to disable all tracker requests. Useful
+for disabling rtorrent with the <emphasis>schedule</emphasis> command.
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>tracker_dump = <replaceable>filename</replaceable></term>
+        <listitem><para>
+Dump tracker requests to <emphasis>filename</emphasis>, disable by
+supplying an empty string. Only torrents loaded while
+<emphasis>tracker_dump</emphasis> contains a non-empty string will be
+logged at the moment, although disabling it will work as expected.
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>tracker_numwant = <replaceable>number</replaceable></term>
+        <listitem><para>
+Set the numwant field sent to the tracker, which indicates how many
+peers we want. A negative value disables this feature.
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>use_udp_trackers = <replaceable>yes</replaceable></term>
+        <listitem><para>
+Use UDP trackers. Disable if you are behind a firewall, etc, that does
+not allow connections to UDP trackers.
+        </para></listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
 
   <refsect1>
     <title>USER-INTERFACE SETTINGS</title>
@@ -857,37 +895,6 @@ Save the session files for all downloads.
         </para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>use_udp_trackers = <replaceable>yes</replaceable></term>
-        <listitem><para>
-
-Use UDP trackers. Disable if you are behind a firewall etc that does
-not allow connections to UDP trackers.
-
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>enable_trackers = <replaceable>yes</replaceable></term>
-        <listitem><para>
-
-Set to <emphasis>no</emphasis> to disable tracker requests.
-
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>tracker_dump = <replaceable>filename</replaceable></term>
-        <listitem><para>
-
-Dump tracker requests to <emphasis>filename</emphasis>, disable by
-supplying an empty string. Only torrents loaded while
-<emphasis>tracker_dump</emphasis> contains a non-empty string will be
-logged at the moment, although disabling it will work as expected.
-
-        </para></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>tos = <replaceable>default|lowdelay|throughput|reliability|mincost</replaceable></term>
         <listitem><para>

src/core/download.cc

@@ -102,6 +102,8 @@ Download::Download(download_type d) :
   m_variables.insert("up_total",           new utils::VariableValueSlot(rak::mem_fn(m_download.up_rate(), &torrent::Rate::total), NULL));
   m_variables.insert("down_rate",          new utils::VariableValueSlot(rak::mem_fn(m_download.down_rate(), &torrent::Rate::rate), NULL));
   m_variables.insert("down_total",         new utils::VariableValueSlot(rak::mem_fn(m_download.down_rate(), &torrent::Rate::total), NULL));
+  m_variables.insert("skip_rate",          new utils::VariableValueSlot(rak::mem_fn(m_download.skip_rate(), &torrent::Rate::rate), NULL));
+  m_variables.insert("skip_total",         new utils::VariableValueSlot(rak::mem_fn(m_download.skip_rate(), &torrent::Rate::total), NULL));
 
   m_variables.insert("priority",           new utils::VariableValueSlot(rak::mem_fn(this, &Download::priority), rak::mem_fn(this, &Download::set_priority)));
 

src/ui/download.cc

@@ -175,6 +175,7 @@ Download::create_info() {
   element->push_back("");
   element->push_column("Upload:",           te_variable_value("up_rate", value_base::flag_kb), " KB / ", te_variable_value("up_total", value_base::flag_xb));
   element->push_column("Download:",         te_variable_value("down_rate", value_base::flag_kb), " KB / ", te_variable_value("down_total", value_base::flag_xb));
+  element->push_column("Skipped:",          te_variable_value("skip_rate", value_base::flag_kb), " KB / ", te_variable_value("skip_total", value_base::flag_xb));
 
   element->set_column_width(element->column_width() + 1);