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/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -586,7 +586,9 @@ void print_peer_info(std::string& out, std::vector<libtorrent::peer_info> const&
 		if (print_ip)
 		{
 			snprintf(str, sizeof(str), "%-30s %-22s", (::print_endpoint(i->ip) +
-				(i->connection_type == peer_info::bittorrent_utp ? " [uTP]" : "")).c_str()
+				(i->flags & peer_info::utp_socket ? " [uTP]" : "") +
+				(i->flags & peer_info::i2p_socket ? " [i2p]" : "")
+				).c_str()
 				, ::print_endpoint(i->local_endpoint).c_str());
 			out += str;
 		}