Changeset 1062

Timestamp:

07/05/08 08:13:12 (4 years ago)

Author:

rakshasa

Message:

* Fix a slight memory leak in peer exchanges. Patch by Josef Drexler.

* Fixed mix-up in version numbers causing an incompatibility for .so
libraries. Patch by Josef Drexler for ticket #1333.

* Fix excessive HAVE messages being sent after handshake when download
has been active for a while. Patch by Josef Drexler for ticket #1372.

* Make --enable-ipv6 not break DHT on Mac OS X. Patch by Josef Drexler
for ticket #1359.

* Fix crash when contacting tracker. Patch by Josef Drexler for ticket
#1272.

* Fix stopping downloads not working properly. Patch by Josef Drexler
for ticket #1335.

Location:

trunk

Files:

• libtorrent/configure.ac (modified) (1 diff)
• libtorrent/src/download/download_main.h (modified) (1 diff)
• libtorrent/src/net/data_buffer.h (modified) (3 diffs)
• libtorrent/src/net/socket_datagram.cc (modified) (1 diff)
• libtorrent/src/protocol/handshake.cc (modified) (2 diffs)
• libtorrent/src/protocol/handshake_manager.cc (modified) (2 diffs)
• libtorrent/src/protocol/peer_connection_base.cc (modified) (3 diffs)
• libtorrent/src/tracker/tracker_manager.cc (modified) (1 diff)
• rtorrent/src/main.cc (modified) (1 diff)

trunk/libtorrent/configure.ac

@@ -6 +6 @@
 
 LIBTORRENT_CURRENT=11
-LIBTORRENT_REVISION=0
-LIBTORRENT_AGE=2
+LIBTORRENT_REVISION=2
+LIBTORRENT_AGE=0
 
 LIBTORRENT_INTERFACE_VERSION_INFO=$LIBTORRENT_CURRENT:$LIBTORRENT_REVISION:$LIBTORRENT_AGE

trunk/libtorrent/src/download/download_main.h

@@ -111 +111 @@
   void                set_download_throttle(ThrottleList* t)     { m_downloadThrottle = t; }
 
-  DataBuffer          get_ut_pex(bool initial)                   { return initial ? m_ut_pex_initial : m_ut_pex_delta; }
+  DataBuffer          get_ut_pex(bool initial)                   { return (initial ? m_ut_pex_initial : m_ut_pex_delta).clone(); }
 
   bool                want_pex_msg()                             { return m_info->is_pex_active() && m_peerList.available_list()->want_more(); }; 

trunk/libtorrent/src/net/data_buffer.h

@@ -45 +45 @@
 // Recipient must call clear() when done with the buffer.
 struct DataBuffer {
-  DataBuffer()                        : m_data(NULL), m_end(NULL), m_copied(false) {}
-  DataBuffer(char* data, char* end)   : m_data(data), m_end(end),  m_copied(false) {}
+  DataBuffer()                        : m_data(NULL), m_end(NULL), m_owned(true) {}
+  DataBuffer(char* data, char* end)   : m_data(data), m_end(end),  m_owned(true) {}
+
+  DataBuffer          clone() const        { DataBuffer d = *this; d.m_owned = false; return d; }
 
   char*               data() const         { return m_data; }
   char*               end() const          { return m_end; }
 
-  bool                copied() const       { return m_copied; }
+  bool                owned() const        { return m_owned; }
   bool                empty() const        { return m_data == NULL; }
   size_t              length() const       { return m_end - m_data; }
 
   void                clear();
-  void                set(char* data, char* end, bool copied);
+  void                set(char* data, char* end, bool owned);
 
 private:
@@ -62 +64 @@
   char*               m_end;
 
-  // Used to indicate if buffer held by PCB is copied and needs to be
-  // deleted after transmission.
-  bool                m_copied;
+  // Used to indicate if buffer held by PCB is its own and needs to be
+  // deleted after transmission (false if shared with other connections).
+  bool                m_owned;
 };
 
@@ -73 +75 @@
 
   m_data = m_end = NULL;
-  m_copied = false;
+  m_owned = false;
 }
 
 inline void
-DataBuffer::set(char* data, char* end, bool copied) {
+DataBuffer::set(char* data, char* end, bool owned) {
   m_data = data;
   m_end = end;
-  m_copied = copied;
+  m_owned = owned;
 }
 

trunk/libtorrent/src/net/socket_datagram.cc

@@ -74 +74 @@
 
   if (sa != NULL) {
-    r = ::sendto(m_fileDesc, buffer, length, 0, sa->c_sockaddr(), sizeof(rak::socket_address));
+    r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet()->c_sockaddr(), sizeof(rak::socket_address_inet));
   } else {
     r = ::send(m_fileDesc, buffer, length, 0);

trunk/libtorrent/src/protocol/handshake.cc

@@ -87 +87 @@
   m_downloadThrottle(manager->download_throttle()->throttle_list()),
 
-  m_initializedTime(cachedTime),
-
   m_readDone(false),
   m_writeDone(false),
@@ -525 +523 @@
     write_extension_handshake();
 
+  // Replay HAVE messages we receive after starting to send the bitfield.
+  // This avoids replaying HAVEs for pieces received between starting the
+  // handshake and now (e.g. when connecting takes longer). Ideally we
+  // should make a snapshot of the bitfield here in case it changes while
+  // we're sending it (if it can't be sent in one write() call).
+  m_initializedTime = cachedTime;
+
   // The download is just starting so we're not sending any
   // bitfield. Pretend we wrote it already.

trunk/libtorrent/src/protocol/handshake_manager.cc

@@ -209 +209 @@
                                                                &download->info()->hash());
 
+    pcb->peer_chunks()->set_have_timer(handshake->initialized_time());
+
     if (handshake->unread_size() != 0) {
       if (handshake->unread_size() > PeerConnectionBase::ProtocolRead::buffer_size)
@@ -214 +216 @@
 
       pcb->push_unread(handshake->unread_data(), handshake->unread_size());
-      pcb->peer_chunks()->set_have_timer(handshake->initialized_time());
-
       pcb->event_read();
     }

trunk/libtorrent/src/protocol/peer_connection_base.cc

@@ -93 +93 @@
     delete m_extensions;
 
-  if (m_extensionMessage.copied())
+  if (m_extensionMessage.owned())
     m_extensionMessage.clear();
 }
@@ -666 +666 @@
 PeerConnectionBase::up_extension() {
   if (m_extensionOffset == extension_must_encrypt) {
-    if (m_extensionMessage.copied()) {
+    if (m_extensionMessage.owned()) {
       m_encryption.encrypt(m_extensionMessage.data(), m_extensionMessage.length());
 
@@ -691 +691 @@
   // clear() deletes the buffer, only do that if we made a copy,
   // otherwise the buffer is shared among all connections.
-  if (m_extensionMessage.copied())
+  if (m_extensionMessage.owned())
     m_extensionMessage.clear();
   else 

trunk/libtorrent/src/tracker/tracker_manager.cc

@@ -115 +115 @@
     throw internal_error("TrackerManager::send_later() m_control->set() == DownloadInfo::STOPPED.");
 
+  rak::timer t(std::max(cachedTime + rak::timer::from_seconds(2),
+                        rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval())));
+
   priority_queue_erase(&taskScheduler, &m_taskTimeout);
-  priority_queue_insert(&taskScheduler, &m_taskTimeout, rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval()));
+  priority_queue_insert(&taskScheduler, &m_taskTimeout, t);
 }
 

trunk/rtorrent/src/main.cc

@@ -188 +188 @@
 
        "view_add = started\n"
-       "view_filter = started,false=\n"
+       "view_filter = started,d.get_state=\n"
        "view.event_added = started,scheduler.simple.added=\n"
        "view.event_removed = started,scheduler.simple.removed=\n"
 
        "view_add = stopped\n"
-       "view_filter = stopped,false=\n"
+       "view_filter = stopped,not=$d.get_state=\n"
 
        "view_add = complete\n"