disabled lsd for private torrents

src/session_impl.cpp

@@ -1600,6 +1600,8 @@ namespace detail
 
 		boost::shared_ptr<torrent> t = find_torrent(ih).lock();
 		if (!t) return;
+		// don't add peers from lsd to private torrents
+		if (t->torrent_file().priv()) return;
 
 #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
 		(*m_logger) << time_now_string()

src/torrent.cpp

@@ -395,13 +395,22 @@ namespace libtorrent
 	{
 		boost::weak_ptr<torrent> self(shared_from_this());
 
-		// announce on local network every 5 minutes
-		m_announce_timer.expires_from_now(minutes(5));
-		m_announce_timer.async_wait(m_ses.m_strand.wrap(
-			bind(&torrent::on_announce_disp, self, _1)));
+		if (!m_torrent_file.priv())
+		{
+			// announce on local network every 5 minutes
+			m_announce_timer.expires_from_now(minutes(5));
+			m_announce_timer.async_wait(m_ses.m_strand.wrap(
+				bind(&torrent::on_announce_disp, self, _1)));
 
-		// announce with the local discovery service
-		m_ses.announce_lsd(m_torrent_file.info_hash());
+			// announce with the local discovery service
+			m_ses.announce_lsd(m_torrent_file.info_hash());
+		}
+		else
+		{
+			m_announce_timer.expires_from_now(minutes(15));
+			m_announce_timer.async_wait(m_ses.m_strand.wrap(
+				bind(&torrent::on_announce_disp, self, _1)));
+		}
 
 #ifndef TORRENT_DISABLE_DHT
 		if (!m_ses.m_dht) return;

test/test_swarm.cpp

@@ -54,7 +54,7 @@ void test_swarm()
 	int count_dl_rates2 = 0;
 	int count_dl_rates3 = 0;
 
-	for (int i = 0; i < 60; ++i)
+	for (int i = 0; i < 65; ++i)
 	{
 		std::auto_ptr<alert> a;
 		a = ses1.pop_alert();