jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verify that torrent names matches the DNS name in its certificate (RFC 2818-style). Fix issues that was breaking SSL support and tidy up a bit

Browse Source
This commit is contained in:
Arvid Norberg
2012-01-15 23:34:43 +00:00
parent 4a40e68a82
commit ae90a8f85e
10 changed files with 230 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/peer_connection.cpp
View File

@@ -235,16 +235,12 @@ namespace libtorrent
error_code ec;
m_logger = m_ses.create_log(m_remote.address().to_string(ec) + "_"
+ to_string(m_remote.port()).elems, m_ses.listen_port());
peer_log(">>> %s [ ep: %s transport: %s seed: %d p: %p ]"
, outgoing ? "OUTGOING_CONNECTION" : "INCOMING CONNECTION"
peer_log("%s [ ep: %s type: %s seed: %d p: %p local: %s]"
, outgoing ? ">>> OUTGOING_CONNECTION" : "<<< INCOMING CONNECTION"
, print_endpoint(m_remote).c_str()
,
#ifdef TORRENT_USE_OPENSSL
m_socket->get<ssl_stream<stream_socket> >() ? "SSL/TCP" :
m_socket->get<ssl_stream<utp_stream> >() ? "SSL/uTP" :
#endif
m_socket->get<utp_stream>() ? "uTP" : "TCP"
, m_peer_info ? m_peer_info->seed : 0, m_peer_info);
, m_socket->type_name()
, m_peer_info ? m_peer_info->seed : 0, m_peer_info
, print_endpoint(m_socket->local_endpoint(ec)).c_str());
#endif
#ifdef TORRENT_DEBUG
piece_failed = false;
@@ -387,10 +383,11 @@ namespace libtorrent
TORRENT_ASSERT(m_socket->remote_endpoint(ec) == m_remote || ec);
m_logger = m_ses.create_log(remote().address().to_string(ec) + "_"
+ to_string(remote().port()).elems, m_ses.listen_port());
peer_log("<<< %s [ ep: %s transport: %s ]"
, outgoing ? "OUTGOING_CONNECTION" : "INCOMING CONNECTION"
peer_log("%s [ ep: %s type: %s local: %s]"
, outgoing ? ">>> OUTGOING_CONNECTION" : "<<< INCOMING CONNECTION"
, print_endpoint(m_remote).c_str()
, (m_socket->get<utp_stream>()) ? "uTP connection" : "TCP connection");
, m_socket->type_name()
, print_endpoint(m_socket->local_endpoint(ec)).c_str());
#endif
#ifndef TORRENT_DISABLE_GEO_IP
@@ -5379,7 +5376,7 @@ namespace libtorrent
#endif
m_socket->async_connect(m_remote
, boost::bind(&peer_connection::on_connection_complete, self(), _1));
m_connect = time_now();
m_connect = time_now_hires();
m_statistics.sent_syn(m_remote.address().is_v6());
if (t->alerts().should_post<peer_connect_alert>())
@@ -5387,6 +5384,9 @@ namespace libtorrent
t->alerts().post_alert(peer_connect_alert(
t->get_handle(), remote(), pid()));
}
#if defined TORRENT_VERBOSE_LOGGING
peer_log("*** LOCAL ENDPOINT[ e: %s ]", print_endpoint(m_socket->local_endpoint(ec)).c_str());
#endif
}
void peer_connection::on_connection_complete(error_code const& e)
@@ -5394,13 +5394,20 @@ namespace libtorrent
#if defined TORRENT_ASIO_DEBUGGING
complete_async("peer_connection::on_connection_complete");
#endif
ptime completed = time_now();
ptime completed = time_now_hires();
TORRENT_ASSERT(m_ses.is_network_thread());
INVARIANT_CHECK;
m_rtt = total_milliseconds(completed - m_connect);
#ifdef TORRENT_USE_OPENSSL
// add this RTT to the PRNG seed, to add more unpredictability
boost::uint64_t now = total_microseconds(completed - m_connect);
// assume 12 bits of entropy (i.e. about 8 milliseconds)
RAND_add(&now, 8, 1.5);
#endif
if (m_disconnecting) return;