merged back encryption branch to trunk

2007-06-06 00:41:20 +00:00
parent 41cf912501
commit 273f8bd921
35 changed files with 2323 additions and 537 deletions
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -1755,6 +1755,14 @@ namespace libtorrent { namespace detail

 #endif

+#ifndef TORRENT_DISABLE_ENCRYPTION
+	void session_impl::set_pe_settings(pe_settings const& settings)
+	{
+		mutex_t::scoped_lock l(m_mutex);
+		m_pe_settings = settings;
+	}
+#endif
+
 	void session_impl::set_download_rate_limit(int bytes_per_second)
 	{
 		assert(bytes_per_second > 0 || bytes_per_second == -1);