From dda5d0783dd7472a2b385025f77f1b51ebc58f15 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Sun, 15 Oct 2006 08:40:29 +0000 Subject: [PATCH] * Bump version to 0.11.0/0.7.0. * 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 --- configure.ac | 4 ++-- doc/rtorrent.1 | 4 ++-- doc/rtorrent.1.xml | 2 +- src/option_handler_rules.cc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 381e42ac..4534b5fc 100644 --- a/configure.ac +++ b/configure.ac @@ -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") diff --git a/doc/rtorrent.1 b/doc/rtorrent.1 index e14d7eb2..9f6ebfd4 100644 --- a/doc/rtorrent.1 +++ b/doc/rtorrent.1 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.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 diff --git a/doc/rtorrent.1.xml b/doc/rtorrent.1.xml index 95550b87..5c9aed55 100644 --- a/doc/rtorrent.1.xml +++ b/doc/rtorrent.1.xml @@ -519,7 +519,7 @@ default is used. - encryption_options = option,... + encryption = option,... Set how rtorrent should deal with encrypted Bittorrent connections. By diff --git a/src/option_handler_rules.cc b/src/option_handler_rules.cc index 39a8bf4e..7aa68f82 100644 --- a/src/option_handler_rules.cc +++ b/src/option_handler_rules.cc @@ -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 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)); }