diff --git a/doc/Makefile.am b/doc/Makefile.am index faa9719d..fc85ac11 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -man_MANS = rtorrent.1 +#man_MANS = rtorrent.1 EXTRA_DIST= \ faq.xml \ diff --git a/src/command_events.cc b/src/command_events.cc index 3e3d8013..1fb8f6a3 100644 --- a/src/command_events.cc +++ b/src/command_events.cc @@ -315,9 +315,6 @@ initialize_command_events() { CMD2_VAR_BOOL ("check_hash", true); // Rename - CMD2_VAR_BOOL ("system.session.use_lock", true); - CMD2_VAR_BOOL ("system.session.on_completion", true); - CMD2_ANY_STRING ("on_ratio", std::tr1::bind(&apply_on_ratio, std::tr1::placeholders::_2)); CMD2_ANY ("start_tied", std::tr1::bind(&apply_start_tied)); diff --git a/src/command_local.cc b/src/command_local.cc index b9a32175..7d5c2ff4 100644 --- a/src/command_local.cc +++ b/src/command_local.cc @@ -178,13 +178,15 @@ initialize_command_local() { CMD2_ANY ("system.hostname", std::tr1::bind(&system_hostname)); CMD2_ANY ("system.pid", std::tr1::bind(&getpid)); - CMD2_VAR_C_STRING("system.client_version", PACKAGE_VERSION); - CMD2_VAR_C_STRING("system.library_version", torrent::version()); - CMD2_VAR_VALUE ("system.file.allocate", (int64_t)0); - CMD2_VAR_VALUE ("system.file.max_size", -1); - CMD2_VAR_VALUE ("system.file.split_size", -1); - CMD2_VAR_STRING ("system.file.split_suffix", ".part"); - CMD2_VAR_STRING ("system.session_name", ""); + CMD2_VAR_C_STRING("system.client_version", PACKAGE_VERSION); + CMD2_VAR_C_STRING("system.library_version", torrent::version()); + CMD2_VAR_VALUE ("system.file.allocate", (int64_t)0); + CMD2_VAR_VALUE ("system.file.max_size", -1); + CMD2_VAR_VALUE ("system.file.split_size", -1); + CMD2_VAR_STRING ("system.file.split_suffix", ".part"); + CMD2_VAR_STRING ("system.session_name", ""); + CMD2_VAR_BOOL ("system.session.use_lock", true); + CMD2_VAR_BOOL ("system.session.on_completion", true); CMD2_ANY ("system.file_status_cache.size", std::tr1::bind(&utils::FileStatusCache::size, (utils::FileStatusCache::base_type*)control->core()->file_status_cache())); diff --git a/src/command_network.cc b/src/command_network.cc index df30d487..c9528249 100644 --- a/src/command_network.cc +++ b/src/command_network.cc @@ -414,9 +414,9 @@ initialize_command_network() { CMD2_ANY_STRING ("encoding_list", std::tr1::bind(&apply_encoding_list, std::tr1::placeholders::_2)); // Isn't port_open used? - CMD2_VAR_BOOL("port_open", true); - CMD2_VAR_BOOL("port_random", true); - CMD2_VAR_STRING("port_range", "6881-6999"); + CMD2_VAR_BOOL ("network.port_open", true); + CMD2_VAR_BOOL ("network.port_random", true); + CMD2_VAR_STRING("network.port_range", "6881-6999"); CMD2_VAR_STRING("connection_leech", "leech"); CMD2_VAR_STRING("connection_seed", "seed"); diff --git a/src/core/manager.cc b/src/core/manager.cc index 4b9a9e1a..706bca37 100644 --- a/src/core/manager.cc +++ b/src/core/manager.cc @@ -257,11 +257,11 @@ void Manager::listen_open() { // This stuff really should be moved outside of manager, make it // part of the init script. - if (!rpc::call_command_value("port_open")) + if (!rpc::call_command_value("network.port_open")) return; int portFirst, portLast; - torrent::Object portRange = rpc::call_command_void("port_range"); + torrent::Object portRange = rpc::call_command_void("network.port_range"); if (portRange.is_string()) { if (std::sscanf(portRange.as_string().c_str(), "%i-%i", &portFirst, &portLast) != 2) @@ -276,7 +276,7 @@ Manager::listen_open() { if (portFirst > portLast || portLast >= (1 << 16)) throw torrent::input_error("Invalid port range."); - if (rpc::call_command_value("port_random")) { + if (rpc::call_command_value("network.port_random")) { int boundary = portFirst + random() % (portLast - portFirst + 1); if (torrent::connection_manager()->listen_open(boundary, portLast) || diff --git a/src/main.cc b/src/main.cc index 207b85ca..6ef5b88b 100644 --- a/src/main.cc +++ b/src/main.cc @@ -91,7 +91,7 @@ parse_options(Control* c, int argc, char** argv) { optionParser.insert_option('b', sigc::bind<0>(sigc::ptr_fun(&rpc::call_command_set_string), "network.bind_address.set")); optionParser.insert_option('d', sigc::bind<0>(sigc::ptr_fun(&rpc::call_command_set_string), "directory.default.set")); optionParser.insert_option('i', sigc::bind<0>(sigc::ptr_fun(&rpc::call_command_set_string), "ip")); - optionParser.insert_option('p', sigc::bind<0>(sigc::ptr_fun(&rpc::call_command_set_string), "port_range.set")); + optionParser.insert_option('p', sigc::bind<0>(sigc::ptr_fun(&rpc::call_command_set_string), "network.port_range.set")); optionParser.insert_option('s', sigc::bind<0>(sigc::ptr_fun(&rpc::call_command_set_string), "session")); optionParser.insert_option('O', sigc::ptr_fun(&rpc::parse_command_single_std)); @@ -328,7 +328,11 @@ main(int argc, char** argv) { rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_public_xmlrpc | rpc::CommandMap::flag_no_target); CMD2_REDIRECT_GENERIC("system.method.insert", "method.insert"); + CMD2_REDIRECT_GENERIC("system.method.erase", "method.erase"); + CMD2_REDIRECT_GENERIC("system.method.get", "method.get"); CMD2_REDIRECT_GENERIC("system.method.set", "method.set"); + CMD2_REDIRECT_GENERIC("system.method.list_keys", "method.list_keys"); + CMD2_REDIRECT_GENERIC("system.method.has_key", "method.has_key"); CMD2_REDIRECT_GENERIC("system.method.set_key", "method.set_key"); CMD2_REDIRECT ("get_handshake_log", "log.handshake"); @@ -338,21 +342,36 @@ main(int argc, char** argv) { CMD2_REDIRECT ("get_name", "system.session_name"); CMD2_REDIRECT ("set_name", "system.session_name.set"); + CMD2_REDIRECT ("system.file_allocate", "system.file.allocate"); CMD2_REDIRECT ("system.file_allocate.set", "system.file.allocate.set"); + CMD2_REDIRECT ("get_max_file_size", "system.file.max_size"); + CMD2_REDIRECT ("set_max_file_size", "system.file.max_size.set"); + CMD2_REDIRECT ("get_split_file_size", "system.file.split_size"); + CMD2_REDIRECT ("set_split_file_size", "system.file.split_size.set"); + CMD2_REDIRECT ("get_split_suffix", "system.file.split_suffix"); + CMD2_REDIRECT ("set_split_suffix", "system.file.split_suffix.set"); - CMD2_REDIRECT ("get_preload_type", "pieces.preload.type"); - CMD2_REDIRECT ("get_preload_min_size", "pieces.preload.min_size"); - CMD2_REDIRECT ("get_preload_required_rate", "pieces.preload.min_rate"); - CMD2_REDIRECT ("set_preload_type", "pieces.preload.type.set"); - CMD2_REDIRECT ("set_preload_min_size", "pieces.preload.min_size.set"); - CMD2_REDIRECT ("set_preload_required_rate", "pieces.preload.min_rate.set"); - CMD2_REDIRECT ("get_stats_preloaded", "pieces.stats_preloaded"); - CMD2_REDIRECT ("get_stats_not_preloaded", "pieces.stats_not_preloaded"); + CMD2_REDIRECT ("get_timeout_sync", "pieces.sync.timeout"); + CMD2_REDIRECT ("set_timeout_sync", "pieces.sync.timeout.set"); + CMD2_REDIRECT ("get_timeout_safe_sync", "pieces.sync.timeout_safe"); + CMD2_REDIRECT ("set_timeout_safe_sync", "pieces.sync.timeout_safe.set"); + + CMD2_REDIRECT_GENERIC("get_preload_type", "pieces.preload.type"); + CMD2_REDIRECT_GENERIC("get_preload_min_size", "pieces.preload.min_size"); + CMD2_REDIRECT_GENERIC("get_preload_required_rate", "pieces.preload.min_rate"); + CMD2_REDIRECT_GENERIC("set_preload_type", "pieces.preload.type.set"); + CMD2_REDIRECT_GENERIC("set_preload_min_size", "pieces.preload.min_size.set"); + CMD2_REDIRECT_GENERIC("set_preload_required_rate", "pieces.preload.min_rate.set"); + CMD2_REDIRECT_GENERIC("get_stats_preloaded", "pieces.stats_preloaded"); + CMD2_REDIRECT_GENERIC("get_stats_not_preloaded", "pieces.stats_not_preloaded"); + + CMD2_REDIRECT_GENERIC("get_safe_sync", "pieces.sync.always_safe"); + CMD2_REDIRECT_GENERIC("set_safe_sync", "pieces.sync.always_safe.set"); CMD2_REDIRECT ("get_memory_usage", "pieces.memory.current"); - CMD2_REDIRECT ("get_max_memory_usage", "pieces.memory.max"); - CMD2_REDIRECT ("set_max_memory_usage", "pieces.memory.max.set"); + CMD2_REDIRECT_GENERIC("get_max_memory_usage", "pieces.memory.max"); + CMD2_REDIRECT_GENERIC("set_max_memory_usage", "pieces.memory.max.set"); CMD2_REDIRECT ("get_send_buffer_size", "network.send_buffer.size"); CMD2_REDIRECT ("set_send_buffer_size", "network.send_buffer.size.set"); @@ -376,6 +395,18 @@ main(int argc, char** argv) { CMD2_REDIRECT ("set_ip", "network.local_address.set"); CMD2_REDIRECT ("get_ip", "network.local_address"); + CMD2_REDIRECT ("port_range", "network.port_range.set"); + CMD2_REDIRECT ("get_port_range", "network.port_range"); + CMD2_REDIRECT ("set_port_range", "network.port_range.set"); + + CMD2_REDIRECT ("port_random", "network.port_random.set"); + CMD2_REDIRECT ("get_port_random", "network.port_random"); + CMD2_REDIRECT ("set_port_random", "network.port_random.set"); + + CMD2_REDIRECT ("port_open", "network.port_open.set"); + CMD2_REDIRECT ("get_port_open", "network.port_open"); + CMD2_REDIRECT ("set_port_open", "network.port_open.set"); + CMD2_REDIRECT ("proxy_address", "network.proxy_address.set"); CMD2_REDIRECT ("set_proxy_address", "network.proxy_address.set"); CMD2_REDIRECT ("get_proxy_address", "network.proxy_address"); @@ -394,6 +425,10 @@ main(int argc, char** argv) { CMD2_REDIRECT ("get_connection_seed", "connection_seed"); CMD2_REDIRECT ("set_connection_seed", "connection_seed.set"); + CMD2_REDIRECT ("peer_exchange", "protocol.pex.set"); + CMD2_REDIRECT ("get_peer_exchange", "protocol.pex"); + CMD2_REDIRECT ("set_peer_exchange", "protocol.pex.set"); + CMD2_REDIRECT ("dht", "dht.mode.set"); CMD2_REDIRECT ("dht_add_node", "dht.add_node"); CMD2_REDIRECT ("dht_statistics", "dht.statistics"); @@ -406,6 +441,11 @@ main(int argc, char** argv) { CMD2_REDIRECT ("get_directory", "directory.default"); CMD2_REDIRECT ("set_directory", "directory.default.set"); + CMD2_REDIRECT ("get_session_lock", "system.session.use_lock"); + CMD2_REDIRECT ("set_session_lock", "system.session.use_lock.set"); + CMD2_REDIRECT ("get_session_on_completion", "system.session.on_completion"); + CMD2_REDIRECT ("set_session_on_completion", "system.session.on_completion.set"); + // // Download: // @@ -415,6 +455,7 @@ main(int argc, char** argv) { CMD2_REDIRECT ("d.get_local_id_html", "d.local_id_html"); CMD2_REDIRECT ("d.get_bitfield", "d.bitfield"); CMD2_REDIRECT ("d.get_base_path", "d.base_path"); + CMD2_REDIRECT ("d.get_base_filename", "d.base_filename"); CMD2_REDIRECT ("d.get_name", "d.name"); CMD2_REDIRECT ("d.get_creation_date", "d.creation_date"); @@ -517,7 +558,7 @@ main(int argc, char** argv) { CMD2_REDIRECT ("t.get_url", "t.url"); // - // Tracker: + // File: // CMD2_REDIRECT ("f.get_completed_chunks", "f.completed_chunks");