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

Removed old handshake logging functions.

Browse Source
This commit is contained in:
rakshasa
2012-04-26 21:22:35 +09:00
parent 22acdd87c3
commit f373b20c1b
3 changed files with 0 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_network.cc
-2
View File
@@ -239,8 +239,6 @@ initialize_command_network() {
CMD2_ANY ("strings.connection_type", tr1::bind(&torrent::option_list_strings, torrent::OPTION_CONNECTION_TYPE));
CMD2_ANY ("strings.encryption", tr1::bind(&torrent::option_list_strings, torrent::OPTION_ENCRYPTION));
CMD2_VAR_BOOL ("log.handshake", false);
// CMD2_ANY_STRING ("encoding_list", tr1::bind(&apply_encoding_list, tr1::placeholders::_2));
CMD2_ANY_STRING ("encoding.add", tr1::bind(&apply_encoding_list, tr1::placeholders::_2));
src/core/manager.cc
-61
View File
@@ -76,65 +76,6 @@
namespace core {
void
Manager::handshake_log(const sockaddr* sa, int msg, int err, const torrent::HashString* hash) {
if (!rpc::call_command_value("log.handshake"))
return;
std::string peer;
std::string download;
const rak::socket_address* socketAddress = rak::socket_address::cast_from(sa);
if (socketAddress->is_valid()) {
char port[6];
snprintf(port, sizeof(port), "%d", socketAddress->port());
peer = socketAddress->address_str() + ":" + port;
} else {
peer = "(unknown)";
}
// torrent::Download d = torrent::download_find(hash);
// if (d.is_valid())
// download = ": " + d.name();
// else
download = "";
switch (msg) {
case torrent::ConnectionManager::handshake_incoming:
push_log_complete("Incoming connection from " + peer + download);
break;
case torrent::ConnectionManager::handshake_outgoing:
push_log_complete("Outgoing connection to " + peer + download);
break;
case torrent::ConnectionManager::handshake_outgoing_encrypted:
push_log_complete("Outgoing encrypted connection to " + peer + download);
break;
case torrent::ConnectionManager::handshake_outgoing_proxy:
push_log_complete("Outgoing proxy connection to " + peer + download);
break;
case torrent::ConnectionManager::handshake_success:
push_log_complete("Successful handshake: " + peer + download);
break;
case torrent::ConnectionManager::handshake_dropped:
push_log_complete("Dropped handshake: " + peer + " - " + torrent::strerror(err) + download);
break;
case torrent::ConnectionManager::handshake_failed:
push_log_complete("Handshake failed: " + peer + " - " + torrent::strerror(err) + download);
break;
case torrent::ConnectionManager::handshake_retry_plaintext:
push_log_complete("Trying again without encryption: " + peer + download);
break;
case torrent::ConnectionManager::handshake_retry_encrypted:
push_log_complete("Trying again encrypted: " + peer + download);
break;
default:
push_log_complete("Unknown handshake message for " + peer + download);
break;
}
}
void
Manager::push_log(const char* msg) {
m_log_important->lock_and_push_log(msg, strlen(msg), 0);
@@ -209,8 +150,6 @@ Manager::initialize_second() {
m_httpQueue->slot_factory(sigc::mem_fun(m_httpStack, &CurlStack::new_object));
CurlStack::global_init();
torrent::connection_manager()->set_signal_handshake_log(sigc::mem_fun(this, &Manager::handshake_log));
}
void
src/main.cc
-3
View File
@@ -448,9 +448,6 @@ main(int argc, char** argv) {
CMD2_REDIRECT ("session_save", "session.save");
CMD2_REDIRECT ("get_handshake_log", "log.handshake");
CMD2_REDIRECT_GENERIC("set_handshake_log", "log.handshake.set");
CMD2_REDIRECT ("get_name", "session.name");
CMD2_REDIRECT_GENERIC("set_name", "session.name.set");