Changeset 4027

Timestamp:

10/17/08 17:54:07 (3 months ago)

Author:

andar

Message:

lt sync 2823

Files:

• branches/1.0.0_RC/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/piece_picker.cpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/policy.cpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/torrent_info.cpp (modified) (1 diff)
• trunk/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• trunk/libtorrent/src/piece_picker.cpp (modified) (1 diff)
• trunk/libtorrent/src/policy.cpp (modified) (1 diff)
• trunk/libtorrent/src/torrent_info.cpp (modified) (1 diff)

branches/1.0.0_RC/libtorrent/src/peer_connection.cpp

@@ -305 +305 @@
                 boost::shared_ptr<torrent> t2 = rhs.associated_torrent().lock();
                 TORRENT_ASSERT(t2);
-                if (!is_choked()) c1 -= t1->torrent_file().piece_length();
-                if (!rhs.is_choked()) c2 -= t2->torrent_file().piece_length();
+                if (!is_choked()) c1 -= (std::max)(t1->torrent_file().piece_length(), 256 * 1024);
+                if (!rhs.is_choked()) c2 -= (std::max)(t2->torrent_file().piece_length(), 256 * 1024);
                 
                 return c1 < c2;

branches/1.0.0_RC/libtorrent/src/piece_picker.cpp

@@ -996 +996 @@
 #ifdef TORRENT_PICKER_LOG
                 print_pieces();
-#endif
-
-#ifndef NDEBUG
-                check_invariant();
 #endif
         }

branches/1.0.0_RC/libtorrent/src/policy.cpp

@@ -339 +339 @@
                 if (m_torrent->has_picker())
                         p = &m_torrent->picker();
-                for (iterator i = m_peers.begin()
-                        , end(m_peers.end()); i != end;)
+                for (iterator i = m_peers.begin(); i != m_peers.end();)
                 {
                         if ((ses.m_ip_filter.access(i->second.addr) & ip_filter::blocked) == 0)

branches/1.0.0_RC/libtorrent/src/torrent_info.cpp

@@ -310 +310 @@
                 if (ret < 0) return;
 
+                if (buf.empty())
+#ifndef BOOST_NO_EXCEPTIONS
+                        throw invalid_torrent_file();
+#else
+                        return;
+#endif
+
                 lazy_entry e;
                 lazy_bdecode(&buf[0], &buf[0] + buf.size(), e);

trunk/libtorrent/src/peer_connection.cpp

@@ -305 +305 @@
                 boost::shared_ptr<torrent> t2 = rhs.associated_torrent().lock();
                 TORRENT_ASSERT(t2);
-                if (!is_choked()) c1 -= t1->torrent_file().piece_length();
-                if (!rhs.is_choked()) c2 -= t2->torrent_file().piece_length();
+                if (!is_choked()) c1 -= (std::max)(t1->torrent_file().piece_length(), 256 * 1024);
+                if (!rhs.is_choked()) c2 -= (std::max)(t2->torrent_file().piece_length(), 256 * 1024);
                 
                 return c1 < c2;

trunk/libtorrent/src/piece_picker.cpp

@@ -996 +996 @@
 #ifdef TORRENT_PICKER_LOG
                 print_pieces();
-#endif
-
-#ifndef NDEBUG
-                check_invariant();
 #endif
         }

trunk/libtorrent/src/policy.cpp

@@ -339 +339 @@
                 if (m_torrent->has_picker())
                         p = &m_torrent->picker();
-                for (iterator i = m_peers.begin()
-                        , end(m_peers.end()); i != end;)
+                for (iterator i = m_peers.begin(); i != m_peers.end();)
                 {
                         if ((ses.m_ip_filter.access(i->second.addr) & ip_filter::blocked) == 0)

trunk/libtorrent/src/torrent_info.cpp

@@ -310 +310 @@
                 if (ret < 0) return;
 
+                if (buf.empty())
+#ifndef BOOST_NO_EXCEPTIONS
+                        throw invalid_torrent_file();
+#else
+                        return;
+#endif
+
                 lazy_entry e;
                 lazy_bdecode(&buf[0], &buf[0] + buf.size(), e);