Changeset 3758

Timestamp:

08/26/08 01:03:39 (4 months ago)

Author:

andar

Message:

lt sync 2637

Files:

• branches/1.0.0_RC/libtorrent/include/libtorrent/alert_types.hpp (modified) (2 diffs)
• branches/1.0.0_RC/libtorrent/include/libtorrent/piece_picker.hpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/piece_picker.cpp (modified) (3 diffs)
• branches/1.0.0_RC/libtorrent/src/session_impl.cpp (modified) (3 diffs)
• branches/1.0.0_RC/libtorrent/src/torrent.cpp (modified) (1 diff)
• trunk/libtorrent/include/libtorrent/alert_types.hpp (modified) (2 diffs)
• trunk/libtorrent/include/libtorrent/piece_picker.hpp (modified) (1 diff)
• trunk/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• trunk/libtorrent/src/piece_picker.cpp (modified) (3 diffs)
• trunk/libtorrent/src/session_impl.cpp (modified) (3 diffs)
• trunk/libtorrent/src/torrent.cpp (modified) (1 diff)

branches/1.0.0_RC/libtorrent/include/libtorrent/alert_types.hpp

@@ -1010 +1010 @@
                 {
                         error_code ec;
-                        return "listening on " + endpoint.address().to_string(ec) + ":"
-                                + boost::lexical_cast<std::string>(endpoint.port()) + " failed: "
-                                + error.message();
+                        return "listening on " + boost::lexical_cast<std::string>(endpoint)
+                                + " failed: " + error.message();
                 }
         };
@@ -1032 +1031 @@
                 {
                         error_code ec;
-                        return "successfully listening on " + endpoint.address().to_string(ec)
-                                + ":" + boost::lexical_cast<std::string>(endpoint.port());
+                        return "successfully listening on " + boost::lexical_cast<std::string>(endpoint);
                 }
         };

branches/1.0.0_RC/libtorrent/include/libtorrent/piece_picker.hpp

@@ -162 +162 @@
                 void we_dont_have(int index);
 
+                // sets all pieces to dont-have
                 void init(int blocks_per_piece, int total_num_blocks);
                 int num_pieces() const { return int(m_piece_map.size()); }

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

@@ -1589 +1589 @@
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
                         (*m_logger) << time_now_string()
-                                << " *** SKIPPED_PIECE [ piece: " << eq.block.piece_index << " | "
-                                "b: " << eq.block.block_index << " ] ***\n";
+                                << " *** SKIPPED_PIECE [ piece: " << qe.block.piece_index << " | "
+                                "b: " << qe.block.block_index << " ] ***\n";
 #endif
 

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

@@ -82 +82 @@
                 m_piece_map.resize((total_num_blocks + blocks_per_piece-1) / blocks_per_piece
                         , piece_pos(0, 0));
+
+                m_num_filtered += m_num_have_filtered;
+                m_num_have_filtered = 0;
+                m_num_have = 0;
+                m_dirty = true;
+                for (std::vector<piece_pos>::iterator i = m_piece_map.begin()
+                        , end(m_piece_map.end()); i != end; ++i)
+                {
+                        i->peer_count = 0;
+                        i->downloading = 0;
+                        i->index = 0;
+                }
 
                 // the piece index is stored in 20 bits, which limits the allowed
@@ -1075 +1087 @@
                 
                 int prev_priority = p.priority(this);
-                TORRENT_ASSERT(prev_priority < int(m_priority_boundries.size()));
+                TORRENT_ASSERT(m_dirty | prev_priority < int(m_priority_boundries.size()));
 
                 bool ret = false;
@@ -1101 +1113 @@
 
                 if (prev_priority == new_priority) return ret;
-
-                TORRENT_ASSERT(prev_priority < int(m_priority_boundries.size()));
 
                 if (m_dirty) return ret;

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

@@ -602 +602 @@
                 }
                 s.external_port = s.sock->local_endpoint(ec).port();
-                s.sock->listen(0, ec);
+                s.sock->listen(5, ec);
                 if (ec)
                 {
@@ -725 +725 @@
                         }
                 }
+
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+                m_logger = create_log("main_session", listen_port(), false);
+#endif
         }
 
@@ -2373 +2377 @@
                 TORRENT_ASSERT(ip != address());
 
+                if (is_local(ip)) return;
+                if (is_loopback(ip)) return;
                 if (m_external_address == ip) return;
 

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

@@ -668 +668 @@
                         , m_storage_mode);
                 m_storage = m_owning_storage.get();
-                m_picker.reset(new piece_picker);
                 m_picker->init(m_torrent_file->piece_length() / m_block_size
                         , int((m_torrent_file->total_size()+m_block_size-1)/m_block_size));

trunk/libtorrent/include/libtorrent/alert_types.hpp

@@ -1010 +1010 @@
                 {
                         error_code ec;
-                        return "listening on " + endpoint.address().to_string(ec) + ":"
-                                + boost::lexical_cast<std::string>(endpoint.port()) + " failed: "
-                                + error.message();
+                        return "listening on " + boost::lexical_cast<std::string>(endpoint)
+                                + " failed: " + error.message();
                 }
         };
@@ -1032 +1031 @@
                 {
                         error_code ec;
-                        return "successfully listening on " + endpoint.address().to_string(ec)
-                                + ":" + boost::lexical_cast<std::string>(endpoint.port());
+                        return "successfully listening on " + boost::lexical_cast<std::string>(endpoint);
                 }
         };

trunk/libtorrent/include/libtorrent/piece_picker.hpp

@@ -162 +162 @@
                 void we_dont_have(int index);
 
+                // sets all pieces to dont-have
                 void init(int blocks_per_piece, int total_num_blocks);
                 int num_pieces() const { return int(m_piece_map.size()); }

trunk/libtorrent/src/peer_connection.cpp

@@ -1589 +1589 @@
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
                         (*m_logger) << time_now_string()
-                                << " *** SKIPPED_PIECE [ piece: " << eq.block.piece_index << " | "
-                                "b: " << eq.block.block_index << " ] ***\n";
+                                << " *** SKIPPED_PIECE [ piece: " << qe.block.piece_index << " | "
+                                "b: " << qe.block.block_index << " ] ***\n";
 #endif
 

trunk/libtorrent/src/piece_picker.cpp

@@ -82 +82 @@
                 m_piece_map.resize((total_num_blocks + blocks_per_piece-1) / blocks_per_piece
                         , piece_pos(0, 0));
+
+                m_num_filtered += m_num_have_filtered;
+                m_num_have_filtered = 0;
+                m_num_have = 0;
+                m_dirty = true;
+                for (std::vector<piece_pos>::iterator i = m_piece_map.begin()
+                        , end(m_piece_map.end()); i != end; ++i)
+                {
+                        i->peer_count = 0;
+                        i->downloading = 0;
+                        i->index = 0;
+                }
 
                 // the piece index is stored in 20 bits, which limits the allowed
@@ -1075 +1087 @@
                 
                 int prev_priority = p.priority(this);
-                TORRENT_ASSERT(prev_priority < int(m_priority_boundries.size()));
+                TORRENT_ASSERT(m_dirty | prev_priority < int(m_priority_boundries.size()));
 
                 bool ret = false;
@@ -1101 +1113 @@
 
                 if (prev_priority == new_priority) return ret;
-
-                TORRENT_ASSERT(prev_priority < int(m_priority_boundries.size()));
 
                 if (m_dirty) return ret;

trunk/libtorrent/src/session_impl.cpp

@@ -602 +602 @@
                 }
                 s.external_port = s.sock->local_endpoint(ec).port();
-                s.sock->listen(0, ec);
+                s.sock->listen(5, ec);
                 if (ec)
                 {
@@ -725 +725 @@
                         }
                 }
+
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+                m_logger = create_log("main_session", listen_port(), false);
+#endif
         }
 
@@ -2373 +2377 @@
                 TORRENT_ASSERT(ip != address());
 
+                if (is_local(ip)) return;
+                if (is_loopback(ip)) return;
                 if (m_external_address == ip) return;
 

trunk/libtorrent/src/torrent.cpp

@@ -668 +668 @@
                         , m_storage_mode);
                 m_storage = m_owning_storage.get();
-                m_picker.reset(new piece_picker);
                 m_picker->init(m_torrent_file->piece_length() / m_block_size
                         , int((m_torrent_file->total_size()+m_block_size-1)/m_block_size));