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

Merge branch 'master' into xirvik

Browse Source
This commit is contained in:
rakshasa
2012-02-14 13:38:47 +09:00
parent 0cbc11b536 7fe2fb1584
commit 26581c74c1
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_ip.cc
-1
View File
@@ -78,7 +78,6 @@ ipv4_filter_parse(const char* address, int value) {
lt_log_print(torrent::LOG_CONNECTION_DEBUG, "Adding ip filter for %u.%u.%u.%u/%u.",
ip_values[0], ip_values[1], ip_values[2], ip_values[3], block);
torrent::PeerList::ipv4_filter()->insert((ip_values[0] << 24) + (ip_values[1] << 16) + (ip_values[2] << 8) + ip_values[3],
rpc::ipv4_table::mask_bits - block, value);
}
src/core/download_list.cc
+1 -1
View File
@@ -334,7 +334,7 @@ void
DownloadList::resume(Download* download, int flags) {
check_contains(download);
lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "->download_list: Resuming download: flags%0x.", flags);
lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "->download_list: Resuming download: flags:%0x.", flags);
try {
src/main.cc
+1 -2
View File
@@ -206,9 +206,8 @@ main(int argc, char** argv) {
SignalHandler::set_handler(SIGUSR1, sigc::ptr_fun(&do_nothing));
torrent::Poll::slot_create_poll() = std::tr1::bind(&core::create_poll);
torrent::initialize();
torrent::main_thread()->init_thread();
torrent::initialize();
torrent::main_thread()->slot_do_work() = tr1::bind(&client_perform);
torrent::main_thread()->slot_next_timeout() = tr1::bind(&client_next_timeout, control);