fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-16 23:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Bump version to 0.11.0/0.7.0.

Browse Source 
* Shortened the encryption option name to just "encryption".

* Added handshake_encryption.* and moved various stuff from Handshake.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@791 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2006-10-15 08:40:29 +00:00
parent 1736c8eaf7
commit dda5d0783d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+2 -2
View File
@@ -1,4 +1,4 @@
AC_INIT(rtorrent, 0.6.3, jaris@ifi.uio.no)
AC_INIT(rtorrent, 0.7.0, jaris@ifi.uio.no)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
@@ -23,7 +23,7 @@ TORRENT_WITHOUT_NCURSESW()
TORRENT_WITHOUT_STATVFS()
TORRENT_WITHOUT_STATFS()
PKG_CHECK_MODULES(STUFF, sigc++-2.0 libtorrent >= 0.10.1,
PKG_CHECK_MODULES(STUFF, sigc++-2.0 libtorrent >= 0.11.0,
CXXFLAGS="$CXXFLAGS $STUFF_CFLAGS $CURL_CFLAGS";
LIBS="$LIBS $STUFF_LIBS $CURL_LIBS")
doc/rtorrent.1
+2 -2
View File
@@ -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" "14 October 2006" "BitTorrent client for ncurses" ""
.TH "RTORRENT" "1" "15 October 2006" "BitTorrent client for ncurses" ""
.SH NAME
rtorrent \- a BitTorrent client for ncurses
@@ -229,7 +229,7 @@ Add a preferred filename encoding to the list. The encodings are
attempted in the order they are inserted, if none match the torrent
default is used.
.TP
\fBencryption_options = \fIoption\fB,\fI\&...\fB\fR
\fBencryption = \fIoption\fB,\fI\&...\fB\fR
Set how rtorrent should deal with encrypted Bittorrent connections. By
default, encryption is disabled, equivalent to specifying the option
\fBnone\fR\&. Alternatively, any number of the following
doc/rtorrent.1.xml
+1 -1
View File
@@ -519,7 +519,7 @@ default is used.
</varlistentry>
<varlistentry>
<term>encryption_options = <replaceable>option</replaceable>,<replaceable>...</replaceable></term>
<term>encryption = <replaceable>option</replaceable>,<replaceable>...</replaceable></term>
<listitem><para>
Set how rtorrent should deal with encrypted Bittorrent connections. By
src/option_handler_rules.cc
+3 -3
View File
@@ -229,7 +229,7 @@ apply_encoding_list(__UNUSED Control* m, const std::string& arg) {
}
void
apply_encryption_options(const std::string& arg) {
apply_encryption(const std::string& arg) {
rak::split_iterator_t<std::string> sitr = rak::split_iterator(arg, ',');
uint32_t options_mask = torrent::ConnectionManager::encryption_none;
@@ -245,7 +245,7 @@ apply_encryption_options(const std::string& arg) {
options_mask |= torrent::ConnectionManager::encryption_try_outgoing;
else if (opt == "require")
options_mask |= torrent::ConnectionManager::encryption_require;
else if (opt == "require_RC4")
else if (opt == "require_RC4" || opt == "require_rc4")
options_mask |= torrent::ConnectionManager::encryption_require_RC4;
else if (opt == "enable_retry")
options_mask |= torrent::ConnectionManager::encryption_enable_retry;
@@ -534,6 +534,6 @@ initialize_option_handler(Control* c) {
variables->insert("enable_trackers", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::bind_ptr_fn(&apply_enable_trackers, c)));
variables->insert("encoding_list", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::bind_ptr_fn(&apply_encoding_list, c)));
variables->insert("encryption_options", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::ptr_fn(&apply_encryption_options)));
variables->insert("encryption", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::ptr_fn(&apply_encryption)));
variables->insert("handshake_log", new utils::VariableBool(false));
}