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

* Handshake was setting wrong bitfield size.

Browse Source 
* Cleanup of Block classes.

* Added brackets to error message from the OpenSSL test.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@713 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2006-06-06 21:16:55 +00:00
parent d0f6719e50
commit beeea9fd3e
6 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/rtorrent.1.xml
+2
View File
@@ -614,7 +614,9 @@ Use with <emphasis>schedule</emphasis>.
<varlistentry>
<term>load = <replaceable>file</replaceable></term>
<term>load_verbose = <replaceable>file</replaceable></term>
<term>load_start = <replaceable>file</replaceable></term>
<term>load_start_verbose = <replaceable>file</replaceable></term>
<listitem><para>
Load and possibly start a file, or possibly multiple files by using the
scripts/checks.m4
+2 -2
View File
@@ -47,7 +47,7 @@ AC_DEFUN([TORRENT_CHECK_OPENSSL], [
PKG_CHECK_MODULES(OPENSSL, openssl,
CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`";
LIBS="$LIBS -lcrypto `pkg-config --libs-only-L openssl`",
AC_MSG_ERROR(Could not find openssl's crypto library, try --with-openssl=PATH))
AC_MSG_ERROR([Could not find openssl's crypto library], [try --with-openssl=PATH]))
else
CXXFLAGS="$CXXFLAGS -I$withval/include"
@@ -57,7 +57,7 @@ AC_DEFUN([TORRENT_CHECK_OPENSSL], [
PKG_CHECK_MODULES(OPENSSL, openssl,
CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`";
LIBS="$LIBS -lcrypto `pkg-config --libs-only-L openssl`",
AC_MSG_ERROR(Could not find openssl's crypto library, try --with-openssl=PATH))
AC_MSG_ERROR([Could not find openssl's crypto library], [try --with-openssl=PATH]))
])
])
src/core/download_factory.cc
+5 -4
View File
@@ -112,9 +112,10 @@ DownloadFactory::receive_load() {
m_variables.set("tied_to_file", (int64_t)false);
} else {
m_stream = new std::fstream(rak::path_expand(m_uri).c_str(), std::ios::in | std::ios::binary);
std::fstream* stream = new std::fstream(rak::path_expand(m_uri).c_str(), std::ios::in | std::ios::binary);
m_stream = stream;
if (m_stream->good())
if (stream->is_open())
receive_loaded();
else
receive_failed("Could not open file");
@@ -201,7 +202,7 @@ DownloadFactory::receive_success() {
// This torrent was queued for hashing or hashing when the session
// file was saved. Or it was in a started state.
if (download->variable()->get_value("hashing") != Download::variable_hashing_stopped ||
download->variable()->get_value("state") != 0)
download->variable()->get_value("state") != 0)
m_manager->download_list()->resume(download);
} else {
@@ -236,7 +237,7 @@ DownloadFactory::initialize_rtorrent(Download* download, torrent::Object* rtorre
rtorrent->insert_key("state_changed", cachedTime.seconds());
} else if (!rtorrent->has_key_value("state_changed") ||
rtorrent->get_key("state_changed").as_value() > cachedTime.seconds() || rtorrent->get_key("state_changed").as_value() == 0) {
rtorrent->get_key("state_changed").as_value() > cachedTime.seconds() || rtorrent->get_key("state_changed").as_value() == 0) {
rtorrent->insert_key("state_changed", cachedTime.seconds());
}
src/core/manager.cc
+10 -7
View File
@@ -316,6 +316,9 @@ path_expand(std::vector<std::string>* paths, const std::string& pattern) {
if ((*first).empty()) {
currentCache.push_back(utils::Directory("/"));
++first;
} else if (rak::trim(*first) == "~") {
currentCache.push_back(utils::Directory("~/"));
++first;
} else {
currentCache.push_back(utils::Directory("./"));
}
@@ -349,17 +352,17 @@ path_expand(std::vector<std::string>* paths, const std::string& pattern) {
void
Manager::try_create_download_expand(const std::string& uri, bool start, bool printLog, bool tied) {
std::vector<std::string> paths;
paths.reserve(32);
paths.reserve(256);
path_expand(&paths, uri);
if (tied)
for (std::vector<std::string>::iterator itr = paths.begin(); itr != paths.end(); )
if (std::find_if(m_downloadList->begin(), m_downloadList->end(),
rak::equal(*itr, rak::bind2nd(std::mem_fun(&Download::variable_string), "tied_to_file"))) != m_downloadList->end())
itr = paths.erase(itr);
if (std::find_if(m_downloadList->begin(), m_downloadList->end(), rak::equal(*itr, rak::bind2nd(std::mem_fun(&Download::variable_string), "tied_to_file")))
!= m_downloadList->end())
itr = paths.erase(itr);
else
itr++;
itr++;
if (!paths.empty())
for (std::vector<std::string>::iterator itr = paths.begin(); itr != paths.end(); ++itr)
@@ -383,10 +386,10 @@ Manager::receive_hashing_changed() {
try {
if ((*itr)->is_hash_checked())
throw torrent::client_error("core::Manager::receive_hashing_changed() hash already checked.");
throw torrent::client_error("core::Manager::receive_hashing_changed() hash already checked.");
if ((*itr)->is_hash_failed())
continue;
continue;
m_downloadList->open_throw(*itr);
(*itr)->download()->hash_check();
src/option_handler_rules.cc
+40 -33
View File
@@ -96,19 +96,28 @@ apply_load(Control* m, const std::string& arg) {
m->core()->try_create_download_expand(arg, false, false, true);
}
void
apply_load_verbose(Control* m, const std::string& arg) {
m->core()->try_create_download_expand(arg, false, true, true);
}
void
apply_load_start(Control* m, const std::string& arg) {
m->core()->try_create_download_expand(arg, true, false, true);
}
void
apply_load_start_verbose(Control* m, const std::string& arg) {
m->core()->try_create_download_expand(arg, true, true, true);
}
void
apply_stop_untied(Control* m) {
core::Manager::DListItr itr = m->core()->download_list()->begin();
while ((itr = std::find_if(itr, m->core()->download_list()->end(),
rak::on(rak::bind2nd(std::mem_fun(&core::Download::variable_string), "tied_to_file"),
std::not1(std::mem_fun_ref(&std::string::empty)))))
!= m->core()->download_list()->end()) {
while ((itr = std::find_if(itr, m->core()->download_list()->end(), rak::on(rak::bind2nd(std::mem_fun(&core::Download::variable_string), "tied_to_file"),
std::not1(std::mem_fun_ref(&std::string::empty)))))
!= m->core()->download_list()->end()) {
rak::file_stat fs;
if (!fs.update(rak::path_expand((*itr)->variable_string("tied_to_file")))) {
@@ -124,10 +133,9 @@ void
apply_close_untied(Control* m) {
core::Manager::DListItr itr = m->core()->download_list()->begin();
while ((itr = std::find_if(itr, m->core()->download_list()->end(),
rak::on(rak::bind2nd(std::mem_fun(&core::Download::variable_string), "tied_to_file"),
std::not1(std::mem_fun_ref(&std::string::empty)))))
!= m->core()->download_list()->end()) {
while ((itr = std::find_if(itr, m->core()->download_list()->end(), rak::on(rak::bind2nd(std::mem_fun(&core::Download::variable_string), "tied_to_file"),
std::not1(std::mem_fun_ref(&std::string::empty)))))
!= m->core()->download_list()->end()) {
rak::file_stat fs;
if (!fs.update(rak::path_expand((*itr)->variable_string("tied_to_file")))) {
@@ -143,10 +151,9 @@ void
apply_remove_untied(Control* m) {
core::Manager::DListItr itr = m->core()->download_list()->begin();
while ((itr = std::find_if(itr, m->core()->download_list()->end(),
rak::on(rak::bind2nd(std::mem_fun(&core::Download::variable_string), "tied_to_file"),
std::not1(std::mem_fun_ref(&std::string::empty)))))
!= m->core()->download_list()->end()) {
while ((itr = std::find_if(itr, m->core()->download_list()->end(), rak::on(rak::bind2nd(std::mem_fun(&core::Download::variable_string), "tied_to_file"),
std::not1(std::mem_fun_ref(&std::string::empty)))))
!= m->core()->download_list()->end()) {
rak::file_stat fs;
if (!fs.update(rak::path_expand((*itr)->variable_string("tied_to_file")))) {
@@ -164,9 +171,8 @@ void
apply_close_low_diskspace(Control* m, int64_t arg) {
core::Manager::DListItr itr = m->core()->download_list()->begin();
while ((itr = std::find_if(itr, m->core()->download_list()->end(),
rak::equal(true, std::mem_fun(&core::Download::is_downloading))))
!= m->core()->download_list()->end()) {
while ((itr = std::find_if(itr, m->core()->download_list()->end(), rak::equal(true, std::mem_fun(&core::Download::is_downloading))))
!= m->core()->download_list()->end()) {
rak::fs_stat stat;
std::string path = (*itr)->file_list()->root_dir() + (*itr)->file_list()->get(0).path()->as_string();
@@ -184,9 +190,9 @@ apply_close_low_diskspace(Control* m, int64_t arg) {
void
apply_stop_on_ratio(Control* m, const std::string& arg) {
int64_t min_Ratio = 0; // first argument: minimum ratio to reach
int64_t min_Upload = 0; // second argument: minimum upload amount to reach [optional]
int64_t max_Ratio = 0; // third argument: maximum ratio to reach [optional]
int64_t min_Ratio = 0; // first argument: minimum ratio to reach
int64_t min_Upload = 0; // second argument: minimum upload amount to reach [optional]
int64_t max_Ratio = 0; // third argument: maximum ratio to reach [optional]
rak::split_iterator_t<std::string> sitr = rak::split_iterator(arg, ',');
@@ -200,9 +206,8 @@ apply_stop_on_ratio(Control* m, const std::string& arg) {
core::Manager::DListItr itr = m->core()->download_list()->begin();
while ((itr = std::find_if(itr, m->core()->download_list()->end(),
rak::equal(true, std::mem_fun(&core::Download::is_seeding))))
!= m->core()->download_list()->end()) {
while ((itr = std::find_if(itr, m->core()->download_list()->end(), rak::equal(true, std::mem_fun(&core::Download::is_seeding))))
!= m->core()->download_list()->end()) {
int64_t totalUpload = (*itr)->download()->up_rate()->total();
int64_t totalDone = (*itr)->download()->bytes_done();
@@ -231,9 +236,9 @@ apply_enable_trackers(Control* m, __UNUSED const std::string& arg) {
for (int i = 0, last = tl.size(); i < last; ++i)
if (state)
tl.get(i).enable();
tl.get(i).enable();
else
tl.get(i).disable();
tl.get(i).disable();
if (state && !control->variable()->get_value("use_udp_trackers"))
(*itr)->enable_udp_trackers(false);
@@ -396,7 +401,7 @@ initialize_option_handler(Control* c) {
variables->insert("tracker_dump", new utils::VariableAny(std::string()));
variables->insert("session", new utils::VariableStringSlot(rak::mem_fn(control->core()->download_store(), &core::DownloadStore::path),
rak::mem_fn(control->core()->download_store(), &core::DownloadStore::set_path)));
rak::mem_fn(control->core()->download_store(), &core::DownloadStore::set_path)));
variables->insert("session_lock", new utils::VariableBool(true));
variables->insert("session_on_completion", new utils::VariableBool(true));
variables->insert("session_save", new utils::VariableVoidSlot(rak::mem_fn(c->core()->download_list(), &core::DownloadList::session_save)));
@@ -409,21 +414,21 @@ initialize_option_handler(Control* c) {
variables->insert("tos", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::ptr_fn(&apply_tos)));
variables->insert("bind", new utils::VariableStringSlot(rak::mem_fn(control->core(), &core::Manager::bind_address),
rak::mem_fn(control->core(), &core::Manager::set_bind_address)));
rak::mem_fn(control->core(), &core::Manager::set_bind_address)));
variables->insert("ip", new utils::VariableStringSlot(rak::mem_fn(control->core(), &core::Manager::local_address),
rak::mem_fn(control->core(), &core::Manager::set_local_address)));
rak::mem_fn(control->core(), &core::Manager::set_local_address)));
variables->insert("http_proxy", new utils::VariableStringSlot(rak::mem_fn(c->core()->get_poll_manager()->get_http_stack(), &core::CurlStack::http_proxy),
rak::mem_fn(c->core()->get_poll_manager()->get_http_stack(), &core::CurlStack::set_http_proxy)));
rak::mem_fn(c->core()->get_poll_manager()->get_http_stack(), &core::CurlStack::set_http_proxy)));
variables->insert("min_peers", new utils::VariableValue(40));
variables->insert("max_peers", new utils::VariableValue(100));
variables->insert("max_uploads", new utils::VariableValue(15));
variables->insert("download_rate", new utils::VariableValueSlot(rak::ptr_fn(&torrent::down_throttle), rak::mem_fn(control->ui(), &ui::Root::set_down_throttle_i64),
0, (1 << 10)));
0, (1 << 10)));
variables->insert("upload_rate", new utils::VariableValueSlot(rak::ptr_fn(&torrent::up_throttle), rak::mem_fn(control->ui(), &ui::Root::set_up_throttle_i64),
0, (1 << 10)));
0, (1 << 10)));
variables->insert("hash_max_tries", new utils::VariableValueSlot(rak::ptr_fn(&torrent::hash_max_tries), rak::ptr_fn(&torrent::set_hash_max_tries)));
variables->insert("max_open_files", new utils::VariableValueSlot(rak::ptr_fn(&torrent::max_open_files), rak::ptr_fn(&torrent::set_max_open_files)));
@@ -443,15 +448,15 @@ initialize_option_handler(Control* c) {
variables->insert("schedule", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::mem_fn(c->command_scheduler(), &CommandScheduler::parse)));
variables->insert("schedule_remove", new utils::VariableStringSlot(rak::value_fn(std::string()),
rak::mem_fn<const std::string&>(c->command_scheduler(), &CommandScheduler::erase)));
rak::mem_fn<const std::string&>(c->command_scheduler(), &CommandScheduler::erase)));
variables->insert("download_scheduler", new utils::VariableVoidSlot(rak::mem_fn(control->scheduler(), &core::Scheduler::update)));
variables->insert("send_buffer_size", new utils::VariableValueSlot(rak::mem_fn(torrent::connection_manager(), &torrent::ConnectionManager::send_buffer_size),
rak::mem_fn(torrent::connection_manager(), &torrent::ConnectionManager::set_send_buffer_size)));
rak::mem_fn(torrent::connection_manager(), &torrent::ConnectionManager::set_send_buffer_size)));
variables->insert("receive_buffer_size", new utils::VariableValueSlot(rak::mem_fn(torrent::connection_manager(), &torrent::ConnectionManager::receive_buffer_size),
rak::mem_fn(torrent::connection_manager(), &torrent::ConnectionManager::set_receive_buffer_size)));
rak::mem_fn(torrent::connection_manager(), &torrent::ConnectionManager::set_receive_buffer_size)));
variables->insert("port_range", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::bind_ptr_fn(&apply_port_range, c)));
@@ -460,10 +465,12 @@ initialize_option_handler(Control* c) {
variables->insert("umask", new utils::VariableValueSlot(rak::mem_fn(control, &Control::umask), rak::mem_fn(control, &Control::set_umask), 8));
variables->insert("working_directory", new utils::VariableStringSlot(rak::mem_fn(control, &Control::working_directory),
rak::mem_fn(control, &Control::set_working_directory)));
rak::mem_fn(control, &Control::set_working_directory)));
variables->insert("load", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::bind_ptr_fn(&apply_load, c)));
variables->insert("load_verbose", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::bind_ptr_fn(&apply_load_verbose, c)));
variables->insert("load_start", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::bind_ptr_fn(&apply_load_start, c)));
variables->insert("load_start_verbose", new utils::VariableStringSlot(rak::value_fn(std::string()), rak::bind_ptr_fn(&apply_load_start_verbose, c)));
variables->insert("stop_untied", new utils::VariableVoidSlot(rak::bind_ptr_fn(&apply_stop_untied, c)));
variables->insert("close_untied", new utils::VariableVoidSlot(rak::bind_ptr_fn(&apply_close_untied, c)));
variables->insert("remove_untied", new utils::VariableVoidSlot(rak::bind_ptr_fn(&apply_remove_untied, c)));
src/option_parser.cc
-3
View File
@@ -77,9 +77,6 @@ OptionParser::process(int argc, char** argv) {
int c;
std::string optString = create_optstring();
optind = 0;
opterr = 0;
while ((c = getopt(argc, argv, optString.c_str())) != -1)
if (c == '?')
throw std::runtime_error("Invalid/unknown option flag \"-" + std::string(1, (char)optopt) + "\". See rtorrent -h for more information.");