merged i2p fix from RC_0_16

2013-10-27 19:56:37 +00:00
parent 1d55894bef
commit cbe3a72a6e
12 changed files with 136 additions and 35 deletions
--- a/src/bt_peer_connection.cpp
+++ b/src/bt_peer_connection.cpp
@@ -354,6 +354,10 @@ namespace libtorrent
 		if (has_peer_choked()) p.flags |= peer_info::remote_choked;
 		if (support_extensions()) p.flags |= peer_info::supports_extensions;
 		if (is_outgoing()) p.flags |= peer_info::local_connection;
+#if TORRENT_USE_I2P
+		if (is_i2p(*get_socket())) p.flags |= peer_info::i2p_socket;
+#endif
+		if (is_utp(*get_socket())) p.flags |= peer_info::utp_socket;

 #ifndef TORRENT_DISABLE_ENCRYPTION
 		if (m_encrypted)