fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-14 14:12: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
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));
}