Changeset 1062 for trunk/libtorrent/src/net/data_buffer.h

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.

Files:

• trunk/libtorrent/src/net/data_buffer.h (modified) (3 diffs)

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;
 }