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

* Properly handle NULL ptr in target_any commands.

Browse Source 
* Enable PEX by default.

* Renamed Download::start2/stop2.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1006 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-11-10 16:34:37 +00:00
parent 04e6575e5d
commit 3f644aed8f
6 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/command_map.cc
+19 -7
View File
@@ -74,7 +74,7 @@ void
CommandMap::insert_any(key_type key, Command* variable, any_slot targetSlot, int flags, const char* parm, const char* doc) {
iterator itr = insert(key, variable, flags, parm, doc);
itr->second.m_target = target_any;
itr->second.m_target = target_any;
itr->second.m_anySlot = targetSlot;
}
@@ -149,10 +149,14 @@ CommandMap::call_command(key_type key, const mapped_type& arg, target_type targe
if (itr == base_type::end())
throw torrent::input_error("Command \"" + std::string(key) + "\" does not exist.");
if (target.second == NULL &&
itr->second.m_target != target_generic &&
!(itr->second.m_target == target_any && target.first == target_generic))
throw torrent::input_error("Command type mis-match.");
if (target.first != target_generic && target.second == NULL) {
// We received a target that is NULL, so throw an exception unless
// we can convert it to a void target.
if (itr->second.m_target > target_any)
throw torrent::input_error("Command type mis-match.");
target.first = target_generic;
}
if (itr->second.m_target != target.first && itr->second.m_target > target_any) {
// Mismatch between the target and command type. If it is not
@@ -178,8 +182,16 @@ CommandMap::call_command(key_type key, const mapped_type& arg, target_type targe
const CommandMap::mapped_type
CommandMap::call_command(const_iterator itr, const mapped_type& arg, target_type target) {
if ((itr->second.m_target != target.first && itr->second.m_target > target_any) ||
(target.second == NULL && itr->second.m_target != target_generic && !(itr->second.m_target == target_any && target.first == target_generic)))
if (target.first != target_generic && target.second == NULL) {
// We received a target that is NULL, so throw an exception unless
// we can convert it to a void target.
if (itr->second.m_target > target_any)
throw torrent::input_error("Command type mis-match.");
target.first = target_generic;
}
if (itr->second.m_target != target.first && itr->second.m_target > target_any)
throw torrent::input_error("Command type mis-match.");
// This _should_ be optimized int just two calls.